2 files changed, 7 insertions, 2 deletions
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 90c6be5bc..deaef6984 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -47,7 +47,8 @@ namespace Ea
 
 ChatHandler::ChatHandler() :
     mSentWhispers(),
-    mShowAllLang(serverConfig.getValue("showAllLang", 0))
+    mShowAllLang(serverConfig.getValue("showAllLang", 0)),
+    mShowMotd(config.getBoolValue("showmotd"))
 {
 }
 
@@ -355,7 +356,10 @@ void ChatHandler::processChat(Net::MessageIn &msg, const bool normalChat,
         trim(chatMsg);
 
         if (player_node)
-            player_node->setSpeech(chatMsg, channel);
+        {
+            if (chatWindow || mShowMotd)
+                player_node->setSpeech(chatMsg, channel);
+        }
     }
     else if (localChatTab)
     {
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 124cc41fb..3f0e054a5 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -59,6 +59,7 @@ class ChatHandler : public Net::ChatHandler
         typedef std::queue<std::string> WhisperQueue;
         WhisperQueue mSentWhispers;
         bool mShowAllLang;
+        bool mShowMotd;
 };
 
 }  // namespace Ea