Index: src/map/map.cpp
===================================================================
--- src/map/map.cpp	(revision 4079)
+++ src/map/map.cpp	(working copy)
@@ -841,6 +841,11 @@
     map_config.newstyle_skillups    = 7;
     map_config.max_merit_points    = 30;
 	map_config.audit_chat = 0;
+	map_config.audit_say = 0;
+	map_config.audit_shout = 0;
+	map_config.audit_tell = 0;
+	map_config.audit_yell = 0;
+	map_config.audit_linkshell = 0;
 	return 0;
 }
 
@@ -1026,6 +1031,30 @@
 		{
 			map_config.audit_chat = atoi(w2);
 		}
+		else if (strcmp(w1,"audit_say") == 0)
+		{
+			map_config.audit_say = atoi(w2);
+		}
+		else if (strcmp(w1,"audit_shout") == 0)
+		{
+			map_config.audit_shout = atoi(w2);
+		}
+		else if (strcmp(w1,"audit_tell") == 0)
+		{
+			map_config.audit_tell = atoi(w2);
+		}
+		else if (strcmp(w1,"audit_yell") == 0)
+		{
+			map_config.audit_yell = atoi(w2);
+		}
+		else if (strcmp(w1,"audit_linkshell") == 0)
+		{
+			map_config.audit_linkshell = atoi(w2);
+		}
+		else if (strcmp(w1,"audit_party") == 0)
+		{
+			map_config.audit_party = atoi(w2);
+		}
 		else
 		{
 			ShowWarning(CL_YELLOW"Unknown setting '%s' in file %s\n" CL_RESET, w1, cfgName);
Index: src/map/map.h
===================================================================
--- src/map/map.h	(revision 4079)
+++ src/map/map.h	(working copy)
@@ -90,6 +90,12 @@
     uint8  newstyle_skillups;       // Allows failed parries and blocks to trigger skill up chance.
 	uint8  max_merit_points;		// global variable, amount of merit points players are allowed
 	bool   audit_chat;
+	bool   audit_say;
+	bool   audit_shout;
+	bool   audit_tell;
+	bool   audit_yell;
+	bool   audit_linkshell;
+	bool   audit_party;
 };
 
 /************************************************************************
Index: src/map/packet_system.cpp
===================================================================
--- src/map/packet_system.cpp	(revision 4079)
+++ src/map/packet_system.cpp	(working copy)
@@ -3234,7 +3234,7 @@
             {
                 case MESSAGE_SAY:
 					{
-						if (map_config.audit_chat == 1)
+						if (map_config.audit_chat == 1 && map_config.audit_say == 1)
 						{
 							std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 							qStr +=PChar->GetName();
@@ -3250,7 +3250,7 @@
                 case MESSAGE_EMOTION:	PChar->loc.zone->PushPacket(PChar, CHAR_INRANGE, new CChatMessagePacket(PChar, MESSAGE_EMOTION, data+6)); break;
                 case MESSAGE_SHOUT:
 					{
-						if (map_config.audit_chat == 1)
+						if (map_config.audit_chat == 1 && map_config.audit_shout == 1)
 						{
 							std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 							qStr +=PChar->GetName();
@@ -3268,7 +3268,7 @@
                 {
                     if (PChar->PLinkshell != NULL)
                     {
-						if (map_config.audit_chat == 1)
+						if (map_config.audit_chat == 1 && map_config.audit_linkshell == 1)
 						{
 							std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 							qStr +=PChar->GetName();
@@ -3288,7 +3288,7 @@
                     {
 						if (PChar->PParty->m_PAlliance == NULL)
 						{
-							if (map_config.audit_chat == 1)
+							if (map_config.audit_chat == 1 && map_config.audit_party == 1)
 							{
 								std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 								qStr +=PChar->GetName();
@@ -3305,7 +3305,7 @@
 								{
 									PChar->PParty->m_PAlliance->partyList.at(i)->PushPacket(PChar, 0, new CChatMessagePacket(PChar, MESSAGE_PARTY, data+6));
 								}
-								if (map_config.audit_chat == 1)
+								if (map_config.audit_chat == 1 && map_config.audit_party == 1)
 								{
 									std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 									qStr +=PChar->GetName();
@@ -3321,7 +3321,7 @@
                 break;
                 case MESSAGE_YELL:
 					{
-						if (map_config.audit_chat == 1)
+						if (map_config.audit_chat == 1 && map_config.audit_yell == 1)
 						{
 							std::string qStr = ("INSERT into audit_chat (speaker,type,message,datetime) VALUES('");
 							qStr +=PChar->GetName();
@@ -3394,7 +3394,7 @@
 				PChar->pushPacket(new CMessageStandardPacket(PChar, 0, 0, 181));
 				return;
 			}
-			if (map_config.audit_chat == 1)
+			if (map_config.audit_chat == 1 && map_config.audit_tell == 1)
 			{
 				std::string qStr = ("INSERT into audit_chat (speaker,type,recipient,message,datetime) VALUES('");
 				qStr +=PChar->GetName();