2 files changed, 5 insertions, 3 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 0118e5071..36c79af77 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -42,7 +42,8 @@
 namespace Ea
 {
 
-ChatHandler::ChatHandler()
+ChatHandler::ChatHandler() :
+    mShowAllLang(serverConfig.getValue("showAllLang", 0))
 {
 }
 
@@ -314,7 +315,7 @@ void ChatHandler::processBeingChat(Net::MessageIn &msg, const bool channels)
     if (player_relations.hasPermission(sender_name,
         PlayerRelation::SPEECH_FLOAT))
     {
-        being->setSpeech(chatMsg);
+        being->setSpeech(chatMsg, channel);
     }
 }
 
@@ -360,7 +361,7 @@ void ChatHandler::processChat(Net::MessageIn &msg, bool normalChat,
         trim(chatMsg);
 
         if (player_node)
-            player_node->setSpeech(chatMsg);
+            player_node->setSpeech(chatMsg, channel);
     }
     else if (localChatTab)
     {
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index c9bdd3029..d46b10057 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -88,6 +88,7 @@ class ChatHandler : public Net::ChatHandler
     protected:
         typedef std::queue<std::string> WhisperQueue;
         WhisperQueue mSentWhispers;
+        bool mShowAllLang;
 };
 
 } // namespace Ea