Move receive code from chathandler into separate file.

14 files changed, 1611 insertions, 1340 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85aca5225..51c5b7323 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1357,6 +1357,8 @@ SET(SRCS_EVOL
     net/ea/charserverrecv.h
     net/ea/chathandler.cpp
     net/ea/chathandler.h
+    net/ea/chatrecv.cpp
+    net/ea/chatrecv.h
     net/ea/eaprotocol.h
     net/ea/equipbackend.h
     net/ea/gamehandler.cpp
@@ -1405,6 +1407,8 @@ SET(SRCS_TMWA
     net/tmwa/charserverrecv.h
     net/tmwa/chathandler.cpp
     net/tmwa/chathandler.h
+    net/tmwa/chatrecv.cpp
+    net/tmwa/chatrecv.h
     net/tmwa/gamehandler.cpp
     net/tmwa/gamehandler.h
     net/tmwa/generalhandler.cpp
@@ -1565,6 +1569,8 @@ SET(SRCS_EATHENA
     net/eathena/charserverrecv.h
     net/eathena/chathandler.cpp
     net/eathena/chathandler.h
+    net/eathena/chatrecv.cpp
+    net/eathena/chatrecv.h
     net/eathena/elementalhandler.cpp
     net/eathena/elementalhandler.h
     net/eathena/familyhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index b206fa8f8..cbc595bf5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1199,6 +1199,8 @@ manaplus_SOURCES += main.cpp \
 	      net/ea/charserverrecv.h \
 	      net/ea/chathandler.cpp \
 	      net/ea/chathandler.h \
+	      net/ea/chatrecv.cpp \
+	      net/ea/chatrecv.h \
 	      net/ea/eaprotocol.h \
 	      net/ea/equipbackend.h \
 	      net/ea/gamehandler.cpp \
@@ -1248,6 +1250,8 @@ manaplus_SOURCES += \
 	      net/tmwa/charserverrecv.h \
 	      net/tmwa/chathandler.cpp \
 	      net/tmwa/chathandler.h \
+	      net/tmwa/chatrecv.cpp \
+	      net/tmwa/chatrecv.h \
 	      net/tmwa/gamehandler.cpp \
 	      net/tmwa/gamehandler.h \
 	      net/tmwa/generalhandler.cpp \
@@ -1411,6 +1415,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
 	      net/eathena/charserverrecv.h \
 	      net/eathena/chathandler.cpp \
 	      net/eathena/chathandler.h \
+	      net/eathena/chatrecv.cpp \
+	      net/eathena/chatrecv.h \
 	      net/eathena/elementalhandler.cpp \
 	      net/eathena/elementalhandler.h \
 	      net/eathena/familyhandler.cpp \
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index fc489a18a..fd47bc48f 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -36,6 +36,8 @@
 
 #include "net/messagein.h"
 
+#include "net/ea/chatrecv.h"
+
 #include "utils/gettext.h"
 
 #include "debug.h"
@@ -43,26 +45,20 @@
 namespace Ea
 {
 
-WhisperQueue ChatHandler::mSentWhispers;
-int ChatHandler::mMotdTime = -1;
-bool ChatHandler::mShowAllLang = false;
-bool ChatHandler::mShowMotd = false;
-bool ChatHandler::mSkipping = true;
-
 ChatHandler::ChatHandler()
 {
-    if (!mSentWhispers.empty())
-        mSentWhispers.pop();
-    mMotdTime = -1;
-    mShowAllLang = serverConfig.getValue("showAllLang", 0);
-    mShowMotd = config.getBoolValue("showmotd");
-    mSkipping = true;
+    if (!ChatRecv::mSentWhispers.empty())
+        ChatRecv::mSentWhispers.pop();
+    ChatRecv::mMotdTime = -1;
+    ChatRecv::mShowAllLang = serverConfig.getValue("showAllLang", 0);
+    ChatRecv::mShowMotd = config.getBoolValue("showmotd");
+    ChatRecv::mSkipping = true;
 }
 
 void ChatHandler::clear()
 {
-    mShowMotd = config.getBoolValue("showmotd");
-    mSkipping = true;
+    ChatRecv::mShowMotd = config.getBoolValue("showmotd");
+    ChatRecv::mSkipping = true;
 }
 
 void ChatHandler::me(const std::string &restrict text,
@@ -73,139 +69,4 @@ void ChatHandler::me(const std::string &restrict text,
     talk(action, channel);
 }
 
-std::string ChatHandler::getPopLastWhisperNick()
-{
-    std::string nick;
-    if (mSentWhispers.empty())
-    {
-        nick = "user";
-    }
-    else
-    {
-        nick = mSentWhispers.front();
-        mSentWhispers.pop();
-    }
-    return nick;
-}
-
-std::string ChatHandler::getLastWhisperNick()
-{
-    std::string nick;
-    if (mSentWhispers.empty())
-        nick = "user";
-    else
-        nick = mSentWhispers.front();
-    return nick;
-}
-
-void ChatHandler::processWhisperResponseContinue(Net::MessageIn &msg,
-                                                 const uint8_t type)
-{
-    const std::string nick = getPopLastWhisperNick();
-    switch (type)
-    {
-        case 0x00:
-            // Success (don't need to report)
-            break;
-        case 0x01:
-            if (chatWindow)
-            {
-                chatWindow->addWhisper(nick,
-                    // TRANSLATORS: chat message
-                    strprintf(_("Whisper could not be sent, %s is offline."),
-                        nick.c_str()),
-                        ChatMsgType::BY_SERVER);
-            }
-            break;
-        case 0x02:
-            if (chatWindow)
-            {
-                chatWindow->addWhisper(nick,
-                    // TRANSLATORS: chat message
-                    strprintf(_("Whisper could not "
-                    "be sent, ignored by %s."), nick.c_str()),
-                    ChatMsgType::BY_SERVER);
-            }
-            break;
-        case 0x03:
-            if (chatWindow)
-            {
-                chatWindow->addWhisper(nick,
-                    // TRANSLATORS: chat message
-                    strprintf(_("Whisper could not "
-                    "be sent, you ignored by all players.")),
-                    ChatMsgType::BY_SERVER);
-            }
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-    BLOCK_END("ChatHandler::processWhisperResponse")
-}
-
-void ChatHandler::processMVPEffect(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processMVPEffect")
-    // Display MVP player
-    const BeingId id = msg.readBeingId("being id");
-    if (localChatTab && actorManager && config.getBoolValue("showMVP"))
-    {
-        const Being *const being = actorManager->findBeing(id);
-        if (!being)
-            NotifyManager::notify(NotifyTypes::MVP_PLAYER, "");
-        else
-            NotifyManager::notify(NotifyTypes::MVP_PLAYER, being->getName());
-    }
-    BLOCK_END("ChatHandler::processMVPEffect")
-}
-
-void ChatHandler::processIgnoreAllResponse(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processIgnoreAllResponse")
-    const uint8_t action = msg.readUInt8("action");
-    const uint8_t fail = msg.readUInt8("result");
-    if (!localChatTab)
-    {
-        BLOCK_END("ChatHandler::processIgnoreAllResponse")
-        return;
-    }
-
-    switch (action)
-    {
-        case 0:
-        {
-            switch (fail)
-            {
-                case 0:
-                    NotifyManager::notify(NotifyTypes::WHISPERS_IGNORED);
-                    break;
-                default:
-                    NotifyManager::notify(NotifyTypes::
-                        WHISPERS_IGNORE_FAILED);
-                    break;
-            }
-            break;
-        }
-        case 1:
-        {
-            switch (fail)
-            {
-                case 0:
-                    NotifyManager::notify(NotifyTypes::WHISPERS_UNIGNORED);
-                    break;
-                default:
-                    NotifyManager::notify(NotifyTypes::
-                        WHISPERS_UNIGNORE_FAILED);
-                    break;
-            }
-            break;
-        }
-        default:
-            // unknown result
-            break;
-    }
-    BLOCK_END("ChatHandler::processIgnoreAllResponse")
-}
-
 }  // namespace Ea
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index d5a0e86f6..a71f63e83 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -48,24 +48,6 @@ class ChatHandler notfinal : public Net::ChatHandler
                 const std::string &restrict channel) const override final;
 
         void clear() override final;
-
-    protected:
-        static void processMVPEffect(Net::MessageIn &msg);
-
-        static void processIgnoreAllResponse(Net::MessageIn &msg);
-
-        static void processWhisperResponseContinue(Net::MessageIn &msg,
-                                                   const uint8_t type);
-
-        static std::string getPopLastWhisperNick();
-
-        static std::string getLastWhisperNick();
-
-        static WhisperQueue mSentWhispers;
-        static int mMotdTime;
-        static bool mShowAllLang;
-        static bool mShowMotd;
-        static bool mSkipping;
 };
 
 }  // namespace Ea
diff --git a/src/net/ea/chatrecv.cpp b/src/net/ea/chatrecv.cpp
new file mode 100644
index 000000000..3f11ab0e1
--- /dev/null
+++ b/src/net/ea/chatrecv.cpp
@@ -0,0 +1,190 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/ea/chatrecv.h"
+
+#include "actormanager.h"
+#include "configuration.h"
+#include "notifymanager.h"
+
+#include "being/being.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/windows/chatwindow.h"
+
+#include "gui/widgets/tabs/chat/chattab.h"
+
+#include "net/messagein.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+namespace Ea
+{
+
+namespace ChatRecv
+{
+    WhisperQueue mSentWhispers;
+    int mMotdTime = -1;
+    bool mShowAllLang = false;
+    bool mShowMotd = false;
+    bool mSkipping = true;
+}  // namespace ChatRecv
+
+std::string ChatRecv::getPopLastWhisperNick()
+{
+    std::string nick;
+    if (mSentWhispers.empty())
+    {
+        nick = "user";
+    }
+    else
+    {
+        nick = mSentWhispers.front();
+        mSentWhispers.pop();
+    }
+    return nick;
+}
+
+std::string ChatRecv::getLastWhisperNick()
+{
+    std::string nick;
+    if (mSentWhispers.empty())
+        nick = "user";
+    else
+        nick = mSentWhispers.front();
+    return nick;
+}
+
+void ChatRecv::processWhisperResponseContinue(Net::MessageIn &msg,
+                                                 const uint8_t type)
+{
+    const std::string nick = getPopLastWhisperNick();
+    switch (type)
+    {
+        case 0x00:
+            // Success (don't need to report)
+            break;
+        case 0x01:
+            if (chatWindow)
+            {
+                chatWindow->addWhisper(nick,
+                    // TRANSLATORS: chat message
+                    strprintf(_("Whisper could not be sent, %s is offline."),
+                        nick.c_str()),
+                        ChatMsgType::BY_SERVER);
+            }
+            break;
+        case 0x02:
+            if (chatWindow)
+            {
+                chatWindow->addWhisper(nick,
+                    // TRANSLATORS: chat message
+                    strprintf(_("Whisper could not "
+                    "be sent, ignored by %s."), nick.c_str()),
+                    ChatMsgType::BY_SERVER);
+            }
+            break;
+        case 0x03:
+            if (chatWindow)
+            {
+                chatWindow->addWhisper(nick,
+                    // TRANSLATORS: chat message
+                    strprintf(_("Whisper could not "
+                    "be sent, you ignored by all players.")),
+                    ChatMsgType::BY_SERVER);
+            }
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+    BLOCK_END("ChatRecv::processWhisperResponse")
+}
+
+void ChatRecv::processMVPEffect(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processMVPEffect")
+    // Display MVP player
+    const BeingId id = msg.readBeingId("being id");
+    if (localChatTab && actorManager && config.getBoolValue("showMVP"))
+    {
+        const Being *const being = actorManager->findBeing(id);
+        if (!being)
+            NotifyManager::notify(NotifyTypes::MVP_PLAYER, "");
+        else
+            NotifyManager::notify(NotifyTypes::MVP_PLAYER, being->getName());
+    }
+    BLOCK_END("ChatRecv::processMVPEffect")
+}
+
+void ChatRecv::processIgnoreAllResponse(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processIgnoreAllResponse")
+    const uint8_t action = msg.readUInt8("action");
+    const uint8_t fail = msg.readUInt8("result");
+    if (!localChatTab)
+    {
+        BLOCK_END("ChatRecv::processIgnoreAllResponse")
+        return;
+    }
+
+    switch (action)
+    {
+        case 0:
+        {
+            switch (fail)
+            {
+                case 0:
+                    NotifyManager::notify(NotifyTypes::WHISPERS_IGNORED);
+                    break;
+                default:
+                    NotifyManager::notify(NotifyTypes::
+                        WHISPERS_IGNORE_FAILED);
+                    break;
+            }
+            break;
+        }
+        case 1:
+        {
+            switch (fail)
+            {
+                case 0:
+                    NotifyManager::notify(NotifyTypes::WHISPERS_UNIGNORED);
+                    break;
+                default:
+                    NotifyManager::notify(NotifyTypes::
+                        WHISPERS_UNIGNORE_FAILED);
+                    break;
+            }
+            break;
+        }
+        default:
+            // unknown result
+            break;
+    }
+    BLOCK_END("ChatRecv::processIgnoreAllResponse")
+}
+
+}  // namespace Ea
diff --git a/src/net/ea/chatrecv.h b/src/net/ea/chatrecv.h
new file mode 100644
index 000000000..c84f38b62
--- /dev/null
+++ b/src/net/ea/chatrecv.h
@@ -0,0 +1,56 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EA_CHATRECV_H
+#define NET_EA_CHATRECV_H
+
+#include "net/chathandler.h"
+
+#include <queue>
+
+namespace Net
+{
+    class MessageIn;
+}
+
+namespace Ea
+{
+    typedef std::queue<std::string> WhisperQueue;
+
+    namespace ChatRecv
+    {
+        void processMVPEffect(Net::MessageIn &msg);
+        void processIgnoreAllResponse(Net::MessageIn &msg);
+        void processWhisperResponseContinue(Net::MessageIn &msg,
+                                            const uint8_t type);
+        std::string getPopLastWhisperNick();
+        std::string getLastWhisperNick();
+
+        extern WhisperQueue mSentWhispers;
+        extern int mMotdTime;
+        extern bool mShowAllLang;
+        extern bool mShowMotd;
+        extern bool mSkipping;
+    }  // namespace ChatRecv
+}  // namespace Ea
+
+#endif  // NET_EA_CHATRECV_H
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index c37e18f90..5501f25ab 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -41,6 +41,9 @@
 #include "net/mercenaryhandler.h"
 #include "net/serverfeatures.h"
 
+#include "net/ea/chatrecv.h"
+
+#include "net/eathena/chatrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
@@ -55,8 +58,6 @@ extern Net::ChatHandler *chatHandler;
 namespace EAthena
 {
 
-std::string ChatHandler::mChatRoom;
-
 ChatHandler::ChatHandler() :
     MessageHandler(),
     Ea::ChatHandler()
@@ -106,133 +107,133 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_WHISPER_RESPONSE:
-            processWhisperResponse(msg);
+            ChatRecv::processWhisperResponse(msg);
             break;
 
         // Received whisper
         case SMSG_WHISPER:
-            processWhisper(msg);
+            ChatRecv::processWhisper(msg);
             break;
 
         // Received speech from being
         case SMSG_BEING_CHAT:
-            processBeingChat(msg);
+            ChatRecv::processBeingChat(msg);
             break;
 
         case SMSG_PLAYER_CHAT:
-            processChat(msg);
+            ChatRecv::processChat(msg);
             break;
 
         case SMSG_FORMAT_MESSAGE:
-            processFormatMessage(msg);
+            ChatRecv::processFormatMessage(msg);
             break;
 
         case SMSG_FORMAT_MESSAGE_NUMBER:
-            processFormatMessageNumber(msg);
+            ChatRecv::processFormatMessageNumber(msg);
             break;
 
         case SMSG_FORMAT_MESSAGE_SKILL:
-            processFormatMessageSkill(msg);
+            ChatRecv::processFormatMessageSkill(msg);
             break;
 
         case SMSG_COLOR_MESSAGE:
-            processColorChat(msg);
+            ChatRecv::processColorChat(msg);
             break;
 
         case SMSG_GM_CHAT:
-            processGmChat(msg);
+            ChatRecv::processGmChat(msg);
             break;
 
         case SMSG_GM_CHAT2:
-            processGmChat2(msg);
+            ChatRecv::processGmChat2(msg);
             break;
 
         case SMSG_MVP_EFFECT:
-            processMVPEffect(msg);
+            Ea::ChatRecv::processMVPEffect(msg);
             break;
 
         case SMSG_MVP_ITEM:
-            processMVPItem(msg);
+            ChatRecv::processMVPItem(msg);
             break;
 
         case SMSG_MVP_EXP:
-            processMVPExp(msg);
+            ChatRecv::processMVPExp(msg);
             break;
 
         case SMSG_MVP_NO_ITEM:
-            processMVPNoItem(msg);
+            ChatRecv::processMVPNoItem(msg);
             break;
 
         case SMSG_IGNORE_ALL_RESPONSE:
-            processIgnoreAllResponse(msg);
+            Ea::ChatRecv::processIgnoreAllResponse(msg);
             break;
 
         case SMSG_CHAT_IGNORE_LIST:
-            processChatIgnoreList(msg);
+            ChatRecv::processChatIgnoreList(msg);
             break;
 
         case SMSG_CHAT_DISPLAY:
-            processChatDisplay(msg);
+            ChatRecv::processChatDisplay(msg);
             break;
 
         case SMSG_CHAT_ROOM_JOIN_ACK:
-            processChatRoomJoinAck(msg);
+            ChatRecv::processChatRoomJoinAck(msg);
             break;
 
         case SMSG_CHAT_ROOM_LEAVE:
-            processChatRoomLeave(msg);
+            ChatRecv::processChatRoomLeave(msg);
             break;
 
         case SMSG_CHAT_JOIN_CHANNEL:
-            processJoinChannel(msg);
+            ChatRecv::processJoinChannel(msg);
             break;
 
         case SMSG_IGNORE_NICK_ACK:
-            processIgnoreNickAck(msg);
+            ChatRecv::processIgnoreNickAck(msg);
             break;
 
         case SMSG_CHAT_ROOM_CREATE_ACK:
-            processChatRoomCreateAck(msg);
+            ChatRecv::processChatRoomCreateAck(msg);
             break;
 
         case SMSG_CHAT_ROOM_DESTROY:
-            processChatRoomDestroy(msg);
+            ChatRecv::processChatRoomDestroy(msg);
             break;
 
         case SMSG_CHAT_ROOM_JOIN_FAILED:
-            processChatRoomJoinFailed(msg);
+            ChatRecv::processChatRoomJoinFailed(msg);
             break;
 
         case SMSG_CHAT_ROOM_ADD_MEMBER:
-            processChatRoomAddMember(msg);
+            ChatRecv::processChatRoomAddMember(msg);
             break;
 
         case SMSG_CHAT_ROOM_SETTINGS:
-            processChatRoomSettings(msg);
+            ChatRecv::processChatRoomSettings(msg);
             break;
 
         case SMSG_CHAT_ROOM_ROLE_CHANGE:
-            processChatRoomRoleChange(msg);
+            ChatRecv::processChatRoomRoleChange(msg);
             break;
 
         case SMSG_MANNER_MESSAGE:
-            processMannerMessage(msg);
+            ChatRecv::processMannerMessage(msg);
             break;
 
         case SMSG_CHAT_SILENCE:
-            processChatSilence(msg);
+            ChatRecv::processChatSilence(msg);
             break;
 
         case SMSG_CHAT_TALKIE_BOX:
-            processChatTalkieBox(msg);
+            ChatRecv::processChatTalkieBox(msg);
             break;
 
         case SMSG_BATTLE_CHAT_MESSAGE:
-            processBattleChatMessage(msg);
+            ChatRecv::processBattleChatMessage(msg);
             break;
 
         case SMSG_SCRIPT_MESSAGE:
-            processScriptMessage(msg);
+            ChatRecv::processScriptMessage(msg);
             break;
 
         default:
@@ -270,7 +271,7 @@ void ChatHandler::privateMessage(const std::string &restrict recipient,
     outMsg.writeString(recipient, 24, "recipient nick");
     outMsg.writeString(text, static_cast<int>(text.length()), "message");
     outMsg.writeInt8(0, "null char");
-    mSentWhispers.push(recipient);
+    Ea::ChatRecv::mSentWhispers.push(recipient);
 }
 
 void ChatHandler::channelMessage(const std::string &restrict channel,
@@ -376,53 +377,6 @@ void ChatHandler::unIgnore(const std::string &nick) const
     outMsg.writeInt8(1, "flag");
 }
 
-void ChatHandler::processIgnoreNickAck(Net::MessageIn &msg)
-{
-    const int type = msg.readUInt8("type");
-    const int flag = msg.readUInt8("flag");
-    switch (type)
-    {
-        case 0:
-            switch (flag)
-            {
-                case 0:
-                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_SUCCESS);
-                    break;
-                case 1:
-                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_FAILURE);
-                    break;
-                case 2:
-                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_TOO_MANY);
-                    break;
-                default:
-                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_UNKNOWN);
-                    break;
-            }
-            break;
-        case 1:
-            switch (flag)
-            {
-                case 0:
-                    NotifyManager::notify(
-                        NotifyTypes::UNIGNORE_PLAYER_SUCCESS);
-                    break;
-                case 1:
-                    NotifyManager::notify(
-                        NotifyTypes::UNIGNORE_PLAYER_FAILURE);
-                    break;
-                default:
-                    NotifyManager::notify(
-                        NotifyTypes::UNIGNORE_PLAYER_UNKNOWN);
-                    break;
-            }
-            break;
-
-        default:
-            NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_TYPE_UNKNOWN);
-            break;
-    }
-}
-
 void ChatHandler::requestIgnoreList() const
 {
     createOutPacket(CMSG_REQUEST_IGNORE_LIST);
@@ -440,7 +394,7 @@ void ChatHandler::createChatRoom(const std::string &title,
     outMsg.writeInt8(static_cast<int8_t>(isPublic ? 1 : 0), "public");
     outMsg.writeString(password, 8, "password");
     outMsg.writeString(title, 36, "title");
-    mChatRoom = title;
+    ChatRecv::mChatRoom = title;
 }
 
 void ChatHandler::battleTalk(const std::string &text) const
@@ -457,264 +411,6 @@ void ChatHandler::battleTalk(const std::string &text) const
     outMsg.writeString(mes, static_cast<int>(mes.length() + 1), "message");
 }
 
-void ChatHandler::processChat(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processChat")
-    int chatMsgLength = msg.readInt16("len") - 4;
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    processChatContinue(msg.readRawString(chatMsgLength, "message"),
-        ChatMsgType::BY_PLAYER);
-}
-
-void ChatHandler::processFormatMessage(Net::MessageIn &msg)
-{
-    const int msgId = msg.readInt16("msg id");
-    // +++ here need load message from configuration file
-    std::string chatMsg;
-    if (msgId >= 1266 && msgId <= 1269)
-    {
-        mercenaryHandler->handleMercenaryMessage(msgId - 1266);
-        return;
-    }
-    switch (msgId)
-    {
-        case 1334:
-            chatMsg = _("Can't cast skill in this area.");
-            break;
-        case 1335:
-            chatMsg = _("Can't use item in this area.");
-            break;
-        case 1773:
-            chatMsg = _("Can't equip. Wrong level.");
-            break;
-        case 1774:
-            chatMsg = _("Can't use. Wrong level.");
-            break;
-        case 1923:
-            chatMsg = _("Work in progress.");  // busy with npc
-            break;
-        default:
-            chatMsg = strprintf("Message #%d", msgId);
-            break;
-    }
-    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
-}
-
-void ChatHandler::processFormatMessageNumber(Net::MessageIn &msg)
-{
-    int msgId = msg.readInt16("msg id");
-    int value = msg.readInt32("value");
-    if (msgId == 1862)
-    {
-        NotifyManager::notify(NotifyTypes::USE_ITEM_WAIT, value);
-        return;
-    }
-    // +++ here need load message from configuration file
-    const std::string chatMsg = strprintf(
-        "Message #%d, value: %d", msgId, value);
-    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
-}
-
-void ChatHandler::processFormatMessageSkill(Net::MessageIn &msg)
-{
-    const int skillId = msg.readInt16("skill id");
-    const int msgId = msg.readInt32("msg id");
-    // +++ here need load message from configuration file
-    const std::string chatMsg = strprintf(
-        "Message #%d, skill: %d", msgId, skillId);
-    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
-}
-
-void ChatHandler::processColorChat(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processChat")
-    int chatMsgLength = msg.readInt16("len") - 4;
-    msg.readInt32("unused");
-    msg.readInt32("chat color");
-    chatMsgLength -= 8;
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    std::string message = msg.readRawString(chatMsgLength, "message");
-    std::string msg2 = message;
-    if (findCutFirst(msg2, "You're now in the '#") && findCutLast(msg2, "'"))
-    {
-        const size_t idx = msg2.find("' channel for '");
-        if (idx != std::string::npos && chatWindow)
-        {
-            chatWindow->addChannelTab(std::string("#").append(
-                msg2.substr(0, idx)), false);
-            return;
-        }
-    }
-    else
-    {
-        const std::string nick = getLastWhisperNick();
-        if (nick.size() > 1 && nick[0] == '#')
-        {
-            if (message == strprintf("[ %s ] %s : \302\202\302",
-                nick.c_str(), localPlayer->getName().c_str()))
-            {
-                mSentWhispers.pop();
-            }
-        }
-    }
-    processChatContinue(message, ChatMsgType::BY_UNKNOWN);
-}
-
-std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg)
-{
-    std::string msg = chatMsg;
-    std::string channel(GENERAL_CHANNEL);
-    if (findCutFirst(msg, "[ #"))
-    {   // found channel message
-        const size_t idx = msg.find(" ] ");
-        if (idx != std::string::npos)
-        {
-            channel = std::string("#").append(msg.substr(0, idx));
-            chatMsg = msg.substr(idx + 3);
-        }
-    }
-    return channel;
-}
-
-void ChatHandler::processChatContinue(std::string chatMsg,
-                                      ChatMsgTypeT own)
-{
-    const std::string channel = extractChannelFromMessage(chatMsg);
-    bool allow(true);
-    if (chatWindow)
-    {
-        allow = chatWindow->resortChatLog(chatMsg,
-            own,
-            channel,
-            IgnoreRecord_false,
-            TryRemoveColors_true);
-    }
-
-    const size_t pos = chatMsg.find(" : ", 0);
-    if (pos != std::string::npos)
-        chatMsg.erase(0, pos + 3);
-
-    trim(chatMsg);
-
-    if (localPlayer)
-    {
-        if ((chatWindow || mShowMotd) && allow)
-            localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
-    }
-    BLOCK_END("ChatHandler::processChat")
-}
-
-void ChatHandler::processGmChat(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processChat")
-    int chatMsgLength = msg.readInt16("len") - 4;
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-    // remove non persistend "colors" from server.
-    if (!findCutFirst(chatMsg, "ssss"))
-        findCutFirst(chatMsg, "eulb");
-
-    if (chatWindow)
-        chatWindow->addGlobalMessage(chatMsg);
-    BLOCK_END("ChatHandler::processChat")
-}
-
-void ChatHandler::processGmChat2(Net::MessageIn &msg)
-{
-    const int chatMsgLength = msg.readInt16("len") - 16;
-    msg.readInt32("font color");
-    msg.readInt16("font type");
-    msg.readInt16("font size");
-    msg.readInt16("font align");
-    msg.readInt16("font y");
-    const std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-    if (chatWindow)
-        chatWindow->addGlobalMessage(chatMsg);
-}
-
-void ChatHandler::processWhisper(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processWhisper")
-    const int chatMsgLength = msg.readInt16("len") - 32;
-    std::string nick = msg.readString(24, "nick");
-    msg.readInt32("admin flag");
-
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processWhisper")
-        return;
-    }
-
-    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
-}
-
-void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processWhisperResponse")
-
-    const uint8_t type = msg.readUInt8("response");
-    msg.readInt32("unknown");
-    if (type == 1 && chatWindow)
-    {
-        const std::string nick = getLastWhisperNick();
-        if (nick.size() > 1 && nick[0] == '#')
-        {
-            chatWindow->channelChatLog(nick,
-                // TRANSLATORS: chat message
-                strprintf(_("Message could not be sent, channel "
-                "%s is not exists."), nick.c_str()),
-                ChatMsgType::BY_SERVER,
-                IgnoreRecord_false,
-                TryRemoveColors_false);
-            if (!mSentWhispers.empty())
-                mSentWhispers.pop();
-            return;
-        }
-    }
-    processWhisperResponseContinue(msg, type);
-}
-
-void ChatHandler::processChatIgnoreList(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    // +++ need put it in some object or window
-    const int count = (msg.readInt16("len") - 4) / 24;
-    for (int f = 0; f < count; f ++)
-        msg.readString(24, "nick");
-}
-
-void ChatHandler::processChatDisplay(Net::MessageIn &msg)
-{
-    const int len = msg.readInt16("len") - 17;
-    ChatObject *const obj = new ChatObject;
-    obj->ownerId = msg.readBeingId("owner account id");
-    obj->chatId = msg.readInt32("chat id");
-    obj->maxUsers = msg.readInt16("max users");
-    obj->currentUsers = msg.readInt16("current users");
-    obj->type = msg.readUInt8("type");
-    obj->title = msg.readString(len, "title");
-    obj->update();
-
-    Being *const dstBeing = actorManager->findBeing(obj->ownerId);
-    if (dstBeing)
-        dstBeing->setChat(obj);
-}
-
 void ChatHandler::joinChat(const ChatObject *const chat,
                            const std::string &password) const
 {
@@ -726,73 +422,6 @@ void ChatHandler::joinChat(const ChatObject *const chat,
     outMsg.writeString(password, 8, "password");
 }
 
-void ChatHandler::processChatRoomJoinAck(Net::MessageIn &msg)
-{
-    const int count = (msg.readInt16("len") - 8) / 28;
-    const int id = msg.readInt32("chat id");
-
-    // +++ ignore chat members for now
-    for (int f = 0; f < count; f ++)
-    {
-        msg.readInt32("role");
-        msg.readString(24, "name");
-    }
-
-    ChatObject *oldChat = ChatObject::findById(id);
-
-    if (oldChat)
-        PlayerInfo::setRoomName(oldChat->title);
-    else
-        PlayerInfo::setRoomName(std::string());
-    chatWindow->joinRoom(true);
-    ChatObject *const obj = new ChatObject;
-    if (oldChat)
-    {
-        obj->ownerId = oldChat->ownerId;
-        obj->chatId = oldChat->chatId;
-        obj->maxUsers = oldChat->maxUsers;
-        obj->currentUsers = oldChat->currentUsers;
-        obj->type = oldChat->type;
-        obj->title = oldChat->title;
-//        obj->update();
-    }
-    localPlayer->setChat(obj);
-}
-
-void ChatHandler::processChatRoomLeave(Net::MessageIn &msg)
-{
-    msg.readInt16("users");
-    const std::string name = msg.readString(24, "name");
-    const int status = msg.readUInt8("flag");  // 0 - left, 1 - kicked
-    switch (status)
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::ROOM_LEAVE, name);
-            break;
-        case 1:
-            NotifyManager::notify(NotifyTypes::ROOM_KICKED, name);
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-    if (localPlayer && name == localPlayer->getName())
-    {
-        if (chatWindow)
-            chatWindow->joinRoom(false);
-        PlayerInfo::setRoomName(std::string());
-        if (localPlayer)
-            localPlayer->setChat(nullptr);
-    }
-    else
-    {
-        Being *const being = actorManager->findBeingByName(
-            name, ActorType::Player);
-        if (being)
-            being->setChat(nullptr);
-    }
-}
-
 void ChatHandler::joinChannel(const std::string &channel)
 {
     if (serverFeatures->haveJoinChannel())
@@ -806,37 +435,6 @@ void ChatHandler::joinChannel(const std::string &channel)
     }
 }
 
-void ChatHandler::processJoinChannel(Net::MessageIn &msg)
-{
-    if (!chatWindow)
-        return;
-
-    const std::string channel = msg.readString(24, "channel name");
-    int flag = msg.readUInt8("flag");
-
-    if (channel.size() < 2)
-        return;
-    switch (flag)
-    {
-        case 0:
-        default:
-            chatWindow->channelChatLog(channel,
-                // TRANSLATORS: chat message
-                strprintf(_("Can't open channel. Channel "
-                "%s is not exists."), channel.c_str()),
-                ChatMsgType::BY_SERVER,
-                IgnoreRecord_false,
-                TryRemoveColors_false);
-            break;
-
-        case 1:
-        case 2:
-            chatWindow->addChannelTab(std::string("#").append(
-                channel.substr(1)), false);
-            break;
-    }
-}
-
 void ChatHandler::partChannel(const std::string &channel)
 {
     if (serverFeatures->haveJoinChannel())
@@ -846,91 +444,6 @@ void ChatHandler::partChannel(const std::string &channel)
     }
 }
 
-void ChatHandler::processWhisperContinue(const std::string &nick,
-                                         std::string chatMsg)
-{
-    // ignoring future whisper messages
-    if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)
-    {
-        BLOCK_END("ChatHandler::processWhisper")
-        return;
-    }
-    // remove first unicode space if this is may be whisper command.
-    if (chatMsg.find("\302\202!") == 0)
-        chatMsg = chatMsg.substr(2);
-
-    if (nick != "Server")
-    {
-        if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
-            chatWindow->addWhisper(nick, chatMsg);
-    }
-    else if (localChatTab)
-    {
-        localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
-    }
-    BLOCK_END("ChatHandler::processWhisper")
-}
-
-void ChatHandler::processBeingChat(Net::MessageIn &msg)
-{
-    if (!actorManager)
-        return;
-
-    BLOCK_START("ChatHandler::processBeingChat")
-    int chatMsgLength = msg.readInt16("len") - 8;
-    Being *const being = actorManager->findBeing(msg.readBeingId("being id"));
-
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processBeingChat")
-        return;
-    }
-
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-
-    if (being && being->getType() == ActorType::Player)
-        being->setTalkTime();
-
-    const size_t pos = chatMsg.find(" : ", 0);
-    std::string sender_name = ((pos == std::string::npos)
-        ? "" : chatMsg.substr(0, pos));
-
-    if (being && sender_name != being->getName()
-        && being->getType() == ActorType::Player)
-    {
-        if (!being->getName().empty())
-            sender_name = being->getName();
-    }
-    else
-    {
-        chatMsg.erase(0, pos + 3);
-    }
-
-    trim(chatMsg);
-
-    bool allow(true);
-    // We use getIgnorePlayer instead of ignoringPlayer here
-    // because ignorePlayer' side effects are triggered
-    // right below for Being::IGNORE_SPEECH_FLOAT.
-    if (player_relations.checkPermissionSilently(sender_name,
-        PlayerRelation::SPEECH_LOG) && chatWindow)
-    {
-        allow = chatWindow->resortChatLog(
-            removeColors(sender_name).append(" : ").append(chatMsg),
-            ChatMsgType::BY_OTHER,
-            GENERAL_CHANNEL,
-            IgnoreRecord_false,
-            TryRemoveColors_true);
-    }
-
-    if (allow && being && player_relations.hasPermission(sender_name,
-        PlayerRelation::SPEECH_FLOAT))
-    {
-        being->setSpeech(chatMsg, GENERAL_CHANNEL);
-    }
-    BLOCK_END("ChatHandler::processBeingChat")
-}
-
 void ChatHandler::talkPet(const std::string &restrict text,
                           const std::string &restrict channel A_UNUSED) const
 {
@@ -947,205 +460,6 @@ void ChatHandler::talkPet(const std::string &restrict text,
     outMsg.writeInt8(0, "zero byte");
 }
 
-void ChatHandler::processChatRoomCreateAck(Net::MessageIn &msg)
-{
-    const int result = msg.readUInt8("flag");
-    switch (result)
-    {
-        case 0:
-        {
-            PlayerInfo::setRoomName(mChatRoom);
-            chatWindow->joinRoom(true);
-            ChatObject *const obj = new ChatObject;
-            obj->ownerId = localPlayer->getId();
-            obj->chatId = 0;
-            obj->maxUsers = 1000;
-            obj->currentUsers = 1;
-            obj->type = 1;
-            obj->title = mChatRoom;
-            obj->update();
-            localPlayer->setChat(obj);
-            break;
-        }
-        case 1:
-            NotifyManager::notify(NotifyTypes::ROOM_LIMIT_EXCEEDED);
-            break;
-        case 2:
-            NotifyManager::notify(NotifyTypes::ROOM_ALREADY_EXISTS);
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-    mChatRoom.clear();
-}
-
-void ChatHandler::processChatRoomDestroy(Net::MessageIn &msg)
-{
-    const int chatId = msg.readInt32("chat id");
-    actorManager->removeRoom(chatId);
-}
-
-void ChatHandler::processChatRoomJoinFailed(Net::MessageIn &msg)
-{
-    const int result = msg.readUInt8("flag");
-    switch (result)
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_FULL);
-            break;
-        case 1:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_WRONG_PASSWORD);
-            break;
-        case 2:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_KICKED);
-            break;
-        case 3:
-            break;
-        case 4:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_ZENY);
-            break;
-        case 5:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_LOW_LEVEL);
-            break;
-        case 6:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_HIGH_LEVEL);
-            break;
-        case 7:
-            NotifyManager::notify(NotifyTypes::ROOM_ERROR_RACE);
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-    }
-}
-
-void ChatHandler::processChatRoomAddMember(Net::MessageIn &msg)
-{
-    msg.readInt16("users");
-    const std::string name = msg.readString(24, "name");
-    if (!localChatTab)
-        return;
-    NotifyManager::notify(NotifyTypes::ROOM_JOINED, name);
-}
-
-void ChatHandler::processChatRoomSettings(Net::MessageIn &msg)
-{
-    const int sz = msg.readInt16("len") - 17;
-    const BeingId ownerId = msg.readBeingId("owner id");
-    const int chatId = msg.readInt32("chat id");
-    const uint16_t limit = msg.readInt16("limit");
-    msg.readInt16("users");
-    const uint8_t type = msg.readUInt8("type");
-    const std::string &title = msg.readString(sz, "title");
-    ChatObject *const chat = localPlayer->getChat();
-    if (chat && chat->chatId == chatId)
-    {
-        chat->ownerId = ownerId;
-        chat->maxUsers = limit;
-        chat->type = type;
-        if (chat->title != title)
-        {
-            chat->title = title;
-            actorManager->updateRoom(chat);
-            chatWindow->joinRoom(true);
-        }
-    }
-}
-
-void ChatHandler::processChatRoomRoleChange(Net::MessageIn &msg)
-{
-    const int role = msg.readInt32("role");
-    const std::string name = msg.readString(24, "name");
-    switch (role)
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::ROOM_ROLE_OWNER, name);
-            break;
-        case 1:
-            // dont show normal role
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-}
-
-void ChatHandler::processMVPItem(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt16("item id");
-}
-
-void ChatHandler::processMVPExp(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    msg.readInt32("exo");
-}
-
-void ChatHandler::processMVPNoItem(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-}
-
-void ChatHandler::processMannerMessage(Net::MessageIn &msg)
-{
-    const int result = msg.readInt32("type");
-    switch (result)
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::MANNER_CHANGED);
-            break;
-        case 5:
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-}
-
-void ChatHandler::processChatSilence(Net::MessageIn &msg)
-{
-    const int result = msg.readUInt8("type");
-    const std::string name = msg.readString(24, "gm name");
-
-    switch (result)
-    {
-        case 0:
-            NotifyManager::notify(NotifyTypes::MANNER_POSITIVE_POINTS, name);
-            break;
-        case 1:
-            NotifyManager::notify(NotifyTypes::MANNER_NEGATIVE_POINTS, name);
-            break;
-        default:
-            UNIMPLIMENTEDPACKET;
-            break;
-    }
-}
-
-void ChatHandler::processChatTalkieBox(Net::MessageIn &msg)
-{
-    msg.readBeingId("being id");
-    const std::string message = msg.readString(80, "message");
-    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
-}
-
-void ChatHandler::processBattleChatMessage(Net::MessageIn &msg)
-{
-    UNIMPLIMENTEDPACKET;
-    const int sz = msg.readInt16("len") - 24 - 8;
-    msg.readBeingId("account id");
-    msg.readString(24, "nick");
-    msg.readString(sz, "message");
-}
-
-void ChatHandler::processScriptMessage(Net::MessageIn &msg)
-{
-    const int sz = msg.readInt16("len") - 8;
-    msg.readBeingId("being id");
-    const std::string message = msg.readString(sz, "message");
-    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
-}
-
 void ChatHandler::leaveChatRoom() const
 {
     createOutPacket(CMSG_LEAVE_CHAT_ROOM);
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index d934bb203..7fd56cd3c 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -96,79 +96,8 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
         void kickFromChatRoom(const std::string &nick) const override final;
 
     protected:
-        static std::string extractChannelFromMessage(std::string &chatMsg);
-
         static void processRaw(MessageOut &restrict outMsg,
                                const std::string &restrict line);
-
-        static void processChat(Net::MessageIn &msg);
-
-        static void processColorChat(Net::MessageIn &msg);
-
-        static void processChatContinue(std::string chatMsg,
-                                        ChatMsgTypeT own);
-
-        static void processWhisper(Net::MessageIn &msg);
-
-        static void processWhisperResponse(Net::MessageIn &msg);
-
-        static void processGmChat(Net::MessageIn &msg);
-
-        static void processGmChat2(Net::MessageIn &msg);
-
-        static void processChatIgnoreList(Net::MessageIn &msg);
-
-        static void processFormatMessage(Net::MessageIn &msg);
-
-        static void processFormatMessageNumber(Net::MessageIn &msg);
-
-        static void processFormatMessageSkill(Net::MessageIn &msg);
-
-        static void processChatDisplay(Net::MessageIn &msg);
-
-        static void processChatRoomJoinAck(Net::MessageIn &msg);
-
-        static void processChatRoomLeave(Net::MessageIn &msg);
-
-        static void processJoinChannel(Net::MessageIn &msg);
-
-        static void processWhisperContinue(const std::string &nick,
-                                           std::string chatMsg);
-
-        static void processBeingChat(Net::MessageIn &msg);
-
-        static void processIgnoreNickAck(Net::MessageIn &msg);
-
-        static void processChatRoomCreateAck(Net::MessageIn &msg);
-
-        static void processChatRoomDestroy(Net::MessageIn &msg);
-
-        static void processChatRoomJoinFailed(Net::MessageIn &msg);
-
-        static void processChatRoomAddMember(Net::MessageIn &msg);
-
-        static void processChatRoomSettings(Net::MessageIn &msg);
-
-        static void processChatRoomRoleChange(Net::MessageIn &msg);
-
-        static void processMVPItem(Net::MessageIn &msg);
-
-        static void processMVPExp(Net::MessageIn &msg);
-
-        static void processMVPNoItem(Net::MessageIn &msg);
-
-        static void processMannerMessage(Net::MessageIn &msg);
-
-        static void processChatSilence(Net::MessageIn &msg);
-
-        static void processChatTalkieBox(Net::MessageIn &msg);
-
-        static void processBattleChatMessage(Net::MessageIn &msg);
-
-        static void processScriptMessage(Net::MessageIn &msg);
-
-    private:
-        static std::string mChatRoom;
 };
 
 }  // namespace EAthena
diff --git a/src/net/eathena/chatrecv.cpp b/src/net/eathena/chatrecv.cpp
new file mode 100644
index 000000000..69785731b
--- /dev/null
+++ b/src/net/eathena/chatrecv.cpp
@@ -0,0 +1,752 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/eathena/chatrecv.h"
+
+#include "actormanager.h"
+#include "notifymanager.h"
+
+#include "being/localplayer.h"
+#include "being/playerinfo.h"
+#include "being/playerrelation.h"
+#include "being/playerrelations.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/chatconsts.h"
+
+#include "gui/windows/chatwindow.h"
+
+#include "gui/widgets/tabs/chat/chattab.h"
+
+#include "net/mercenaryhandler.h"
+#include "net/serverfeatures.h"
+
+#include "net/ea/chatrecv.h"
+
+#include "net/eathena/messageout.h"
+#include "net/eathena/protocol.h"
+
+#include "resources/chatobject.h"
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+extern Net::ChatHandler *chatHandler;
+
+namespace EAthena
+{
+
+namespace ChatRecv
+{
+    std::string mChatRoom;
+}
+
+void ChatRecv::processIgnoreNickAck(Net::MessageIn &msg)
+{
+    const int type = msg.readUInt8("type");
+    const int flag = msg.readUInt8("flag");
+    switch (type)
+    {
+        case 0:
+            switch (flag)
+            {
+                case 0:
+                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_SUCCESS);
+                    break;
+                case 1:
+                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_FAILURE);
+                    break;
+                case 2:
+                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_TOO_MANY);
+                    break;
+                default:
+                    NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_UNKNOWN);
+                    break;
+            }
+            break;
+        case 1:
+            switch (flag)
+            {
+                case 0:
+                    NotifyManager::notify(
+                        NotifyTypes::UNIGNORE_PLAYER_SUCCESS);
+                    break;
+                case 1:
+                    NotifyManager::notify(
+                        NotifyTypes::UNIGNORE_PLAYER_FAILURE);
+                    break;
+                default:
+                    NotifyManager::notify(
+                        NotifyTypes::UNIGNORE_PLAYER_UNKNOWN);
+                    break;
+            }
+            break;
+
+        default:
+            NotifyManager::notify(NotifyTypes::IGNORE_PLAYER_TYPE_UNKNOWN);
+            break;
+    }
+}
+
+void ChatRecv::processChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processChat")
+    int chatMsgLength = msg.readInt16("len") - 4;
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    processChatContinue(msg.readRawString(chatMsgLength, "message"),
+        ChatMsgType::BY_PLAYER);
+}
+
+void ChatRecv::processFormatMessage(Net::MessageIn &msg)
+{
+    const int msgId = msg.readInt16("msg id");
+    // +++ here need load message from configuration file
+    std::string chatMsg;
+    if (msgId >= 1266 && msgId <= 1269)
+    {
+        mercenaryHandler->handleMercenaryMessage(msgId - 1266);
+        return;
+    }
+    switch (msgId)
+    {
+        case 1334:
+            chatMsg = _("Can't cast skill in this area.");
+            break;
+        case 1335:
+            chatMsg = _("Can't use item in this area.");
+            break;
+        case 1773:
+            chatMsg = _("Can't equip. Wrong level.");
+            break;
+        case 1774:
+            chatMsg = _("Can't use. Wrong level.");
+            break;
+        case 1923:
+            chatMsg = _("Work in progress.");  // busy with npc
+            break;
+        default:
+            chatMsg = strprintf("Message #%d", msgId);
+            break;
+    }
+    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
+}
+
+void ChatRecv::processFormatMessageNumber(Net::MessageIn &msg)
+{
+    int msgId = msg.readInt16("msg id");
+    int value = msg.readInt32("value");
+    if (msgId == 1862)
+    {
+        NotifyManager::notify(NotifyTypes::USE_ITEM_WAIT, value);
+        return;
+    }
+    // +++ here need load message from configuration file
+    const std::string chatMsg = strprintf(
+        "Message #%d, value: %d", msgId, value);
+    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
+}
+
+void ChatRecv::processFormatMessageSkill(Net::MessageIn &msg)
+{
+    const int skillId = msg.readInt16("skill id");
+    const int msgId = msg.readInt32("msg id");
+    // +++ here need load message from configuration file
+    const std::string chatMsg = strprintf(
+        "Message #%d, skill: %d", msgId, skillId);
+    processChatContinue(chatMsg, ChatMsgType::BY_SERVER);
+}
+
+void ChatRecv::processColorChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processChat")
+    int chatMsgLength = msg.readInt16("len") - 4;
+    msg.readInt32("unused");
+    msg.readInt32("chat color");
+    chatMsgLength -= 8;
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    std::string message = msg.readRawString(chatMsgLength, "message");
+    std::string msg2 = message;
+    if (findCutFirst(msg2, "You're now in the '#") && findCutLast(msg2, "'"))
+    {
+        const size_t idx = msg2.find("' channel for '");
+        if (idx != std::string::npos && chatWindow)
+        {
+            chatWindow->addChannelTab(std::string("#").append(
+                msg2.substr(0, idx)), false);
+            return;
+        }
+    }
+    else
+    {
+        const std::string nick = Ea::ChatRecv::getLastWhisperNick();
+        if (nick.size() > 1 && nick[0] == '#')
+        {
+            if (message == strprintf("[ %s ] %s : \302\202\302",
+                nick.c_str(), localPlayer->getName().c_str()))
+            {
+                Ea::ChatRecv::mSentWhispers.pop();
+            }
+        }
+    }
+    processChatContinue(message, ChatMsgType::BY_UNKNOWN);
+}
+
+std::string ChatRecv::extractChannelFromMessage(std::string &chatMsg)
+{
+    std::string msg = chatMsg;
+    std::string channel(GENERAL_CHANNEL);
+    if (findCutFirst(msg, "[ #"))
+    {   // found channel message
+        const size_t idx = msg.find(" ] ");
+        if (idx != std::string::npos)
+        {
+            channel = std::string("#").append(msg.substr(0, idx));
+            chatMsg = msg.substr(idx + 3);
+        }
+    }
+    return channel;
+}
+
+void ChatRecv::processChatContinue(std::string chatMsg,
+                                      ChatMsgTypeT own)
+{
+    const std::string channel = extractChannelFromMessage(chatMsg);
+    bool allow(true);
+    if (chatWindow)
+    {
+        allow = chatWindow->resortChatLog(chatMsg,
+            own,
+            channel,
+            IgnoreRecord_false,
+            TryRemoveColors_true);
+    }
+
+    const size_t pos = chatMsg.find(" : ", 0);
+    if (pos != std::string::npos)
+        chatMsg.erase(0, pos + 3);
+
+    trim(chatMsg);
+
+    if (localPlayer)
+    {
+        if ((chatWindow || Ea::ChatRecv::mShowMotd) && allow)
+            localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
+    }
+    BLOCK_END("ChatRecv::processChat")
+}
+
+void ChatRecv::processGmChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processChat")
+    int chatMsgLength = msg.readInt16("len") - 4;
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+    // remove non persistend "colors" from server.
+    if (!findCutFirst(chatMsg, "ssss"))
+        findCutFirst(chatMsg, "eulb");
+
+    if (chatWindow)
+        chatWindow->addGlobalMessage(chatMsg);
+    BLOCK_END("ChatRecv::processChat")
+}
+
+void ChatRecv::processGmChat2(Net::MessageIn &msg)
+{
+    const int chatMsgLength = msg.readInt16("len") - 16;
+    msg.readInt32("font color");
+    msg.readInt16("font type");
+    msg.readInt16("font size");
+    msg.readInt16("font align");
+    msg.readInt16("font y");
+    const std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+    if (chatWindow)
+        chatWindow->addGlobalMessage(chatMsg);
+}
+
+void ChatRecv::processWhisper(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processWhisper")
+    const int chatMsgLength = msg.readInt16("len") - 32;
+    std::string nick = msg.readString(24, "nick");
+    msg.readInt32("admin flag");
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processWhisper")
+        return;
+    }
+
+    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
+void ChatRecv::processWhisperResponse(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processWhisperResponse")
+
+    const uint8_t type = msg.readUInt8("response");
+    msg.readInt32("unknown");
+    if (type == 1 && chatWindow)
+    {
+        const std::string nick = Ea::ChatRecv::getLastWhisperNick();
+        if (nick.size() > 1 && nick[0] == '#')
+        {
+            chatWindow->channelChatLog(nick,
+                // TRANSLATORS: chat message
+                strprintf(_("Message could not be sent, channel "
+                "%s is not exists."), nick.c_str()),
+                ChatMsgType::BY_SERVER,
+                IgnoreRecord_false,
+                TryRemoveColors_false);
+            if (!Ea::ChatRecv::mSentWhispers.empty())
+                Ea::ChatRecv::mSentWhispers.pop();
+            return;
+        }
+    }
+    Ea::ChatRecv::processWhisperResponseContinue(msg, type);
+}
+
+void ChatRecv::processChatIgnoreList(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    // +++ need put it in some object or window
+    const int count = (msg.readInt16("len") - 4) / 24;
+    for (int f = 0; f < count; f ++)
+        msg.readString(24, "nick");
+}
+
+void ChatRecv::processChatDisplay(Net::MessageIn &msg)
+{
+    const int len = msg.readInt16("len") - 17;
+    ChatObject *const obj = new ChatObject;
+    obj->ownerId = msg.readBeingId("owner account id");
+    obj->chatId = msg.readInt32("chat id");
+    obj->maxUsers = msg.readInt16("max users");
+    obj->currentUsers = msg.readInt16("current users");
+    obj->type = msg.readUInt8("type");
+    obj->title = msg.readString(len, "title");
+    obj->update();
+
+    Being *const dstBeing = actorManager->findBeing(obj->ownerId);
+    if (dstBeing)
+        dstBeing->setChat(obj);
+}
+
+void ChatRecv::processChatRoomJoinAck(Net::MessageIn &msg)
+{
+    const int count = (msg.readInt16("len") - 8) / 28;
+    const int id = msg.readInt32("chat id");
+
+    // +++ ignore chat members for now
+    for (int f = 0; f < count; f ++)
+    {
+        msg.readInt32("role");
+        msg.readString(24, "name");
+    }
+
+    ChatObject *oldChat = ChatObject::findById(id);
+
+    if (oldChat)
+        PlayerInfo::setRoomName(oldChat->title);
+    else
+        PlayerInfo::setRoomName(std::string());
+    chatWindow->joinRoom(true);
+    ChatObject *const obj = new ChatObject;
+    if (oldChat)
+    {
+        obj->ownerId = oldChat->ownerId;
+        obj->chatId = oldChat->chatId;
+        obj->maxUsers = oldChat->maxUsers;
+        obj->currentUsers = oldChat->currentUsers;
+        obj->type = oldChat->type;
+        obj->title = oldChat->title;
+//        obj->update();
+    }
+    localPlayer->setChat(obj);
+}
+
+void ChatRecv::processChatRoomLeave(Net::MessageIn &msg)
+{
+    msg.readInt16("users");
+    const std::string name = msg.readString(24, "name");
+    const int status = msg.readUInt8("flag");  // 0 - left, 1 - kicked
+    switch (status)
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::ROOM_LEAVE, name);
+            break;
+        case 1:
+            NotifyManager::notify(NotifyTypes::ROOM_KICKED, name);
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+    if (localPlayer && name == localPlayer->getName())
+    {
+        if (chatWindow)
+            chatWindow->joinRoom(false);
+        PlayerInfo::setRoomName(std::string());
+        if (localPlayer)
+            localPlayer->setChat(nullptr);
+    }
+    else
+    {
+        Being *const being = actorManager->findBeingByName(
+            name, ActorType::Player);
+        if (being)
+            being->setChat(nullptr);
+    }
+}
+
+void ChatRecv::processJoinChannel(Net::MessageIn &msg)
+{
+    if (!chatWindow)
+        return;
+
+    const std::string channel = msg.readString(24, "channel name");
+    int flag = msg.readUInt8("flag");
+
+    if (channel.size() < 2)
+        return;
+    switch (flag)
+    {
+        case 0:
+        default:
+            chatWindow->channelChatLog(channel,
+                // TRANSLATORS: chat message
+                strprintf(_("Can't open channel. Channel "
+                "%s is not exists."), channel.c_str()),
+                ChatMsgType::BY_SERVER,
+                IgnoreRecord_false,
+                TryRemoveColors_false);
+            break;
+
+        case 1:
+        case 2:
+            chatWindow->addChannelTab(std::string("#").append(
+                channel.substr(1)), false);
+            break;
+    }
+}
+
+void ChatRecv::processWhisperContinue(const std::string &nick,
+                                         std::string chatMsg)
+{
+    // ignoring future whisper messages
+    if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)
+    {
+        BLOCK_END("ChatRecv::processWhisper")
+        return;
+    }
+    // remove first unicode space if this is may be whisper command.
+    if (chatMsg.find("\302\202!") == 0)
+        chatMsg = chatMsg.substr(2);
+
+    if (nick != "Server")
+    {
+        if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
+            chatWindow->addWhisper(nick, chatMsg);
+    }
+    else if (localChatTab)
+    {
+        localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
+    }
+    BLOCK_END("ChatRecv::processWhisper")
+}
+
+void ChatRecv::processBeingChat(Net::MessageIn &msg)
+{
+    if (!actorManager)
+        return;
+
+    BLOCK_START("ChatRecv::processBeingChat")
+    int chatMsgLength = msg.readInt16("len") - 8;
+    Being *const being = actorManager->findBeing(msg.readBeingId("being id"));
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processBeingChat")
+        return;
+    }
+
+    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+
+    if (being && being->getType() == ActorType::Player)
+        being->setTalkTime();
+
+    const size_t pos = chatMsg.find(" : ", 0);
+    std::string sender_name = ((pos == std::string::npos)
+        ? "" : chatMsg.substr(0, pos));
+
+    if (being && sender_name != being->getName()
+        && being->getType() == ActorType::Player)
+    {
+        if (!being->getName().empty())
+            sender_name = being->getName();
+    }
+    else
+    {
+        chatMsg.erase(0, pos + 3);
+    }
+
+    trim(chatMsg);
+
+    bool allow(true);
+    // We use getIgnorePlayer instead of ignoringPlayer here
+    // because ignorePlayer' side effects are triggered
+    // right below for Being::IGNORE_SPEECH_FLOAT.
+    if (player_relations.checkPermissionSilently(sender_name,
+        PlayerRelation::SPEECH_LOG) && chatWindow)
+    {
+        allow = chatWindow->resortChatLog(
+            removeColors(sender_name).append(" : ").append(chatMsg),
+            ChatMsgType::BY_OTHER,
+            GENERAL_CHANNEL,
+            IgnoreRecord_false,
+            TryRemoveColors_true);
+    }
+
+    if (allow && being && player_relations.hasPermission(sender_name,
+        PlayerRelation::SPEECH_FLOAT))
+    {
+        being->setSpeech(chatMsg, GENERAL_CHANNEL);
+    }
+    BLOCK_END("ChatRecv::processBeingChat")
+}
+
+void ChatRecv::processChatRoomCreateAck(Net::MessageIn &msg)
+{
+    const int result = msg.readUInt8("flag");
+    switch (result)
+    {
+        case 0:
+        {
+            PlayerInfo::setRoomName(mChatRoom);
+            chatWindow->joinRoom(true);
+            ChatObject *const obj = new ChatObject;
+            obj->ownerId = localPlayer->getId();
+            obj->chatId = 0;
+            obj->maxUsers = 1000;
+            obj->currentUsers = 1;
+            obj->type = 1;
+            obj->title = mChatRoom;
+            obj->update();
+            localPlayer->setChat(obj);
+            break;
+        }
+        case 1:
+            NotifyManager::notify(NotifyTypes::ROOM_LIMIT_EXCEEDED);
+            break;
+        case 2:
+            NotifyManager::notify(NotifyTypes::ROOM_ALREADY_EXISTS);
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+    mChatRoom.clear();
+}
+
+void ChatRecv::processChatRoomDestroy(Net::MessageIn &msg)
+{
+    const int chatId = msg.readInt32("chat id");
+    actorManager->removeRoom(chatId);
+}
+
+void ChatRecv::processChatRoomJoinFailed(Net::MessageIn &msg)
+{
+    const int result = msg.readUInt8("flag");
+    switch (result)
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_FULL);
+            break;
+        case 1:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_WRONG_PASSWORD);
+            break;
+        case 2:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_KICKED);
+            break;
+        case 3:
+            break;
+        case 4:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_ZENY);
+            break;
+        case 5:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_LOW_LEVEL);
+            break;
+        case 6:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_HIGH_LEVEL);
+            break;
+        case 7:
+            NotifyManager::notify(NotifyTypes::ROOM_ERROR_RACE);
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+    }
+}
+
+void ChatRecv::processChatRoomAddMember(Net::MessageIn &msg)
+{
+    msg.readInt16("users");
+    const std::string name = msg.readString(24, "name");
+    if (!localChatTab)
+        return;
+    NotifyManager::notify(NotifyTypes::ROOM_JOINED, name);
+}
+
+void ChatRecv::processChatRoomSettings(Net::MessageIn &msg)
+{
+    const int sz = msg.readInt16("len") - 17;
+    const BeingId ownerId = msg.readBeingId("owner id");
+    const int chatId = msg.readInt32("chat id");
+    const uint16_t limit = msg.readInt16("limit");
+    msg.readInt16("users");
+    const uint8_t type = msg.readUInt8("type");
+    const std::string &title = msg.readString(sz, "title");
+    ChatObject *const chat = localPlayer->getChat();
+    if (chat && chat->chatId == chatId)
+    {
+        chat->ownerId = ownerId;
+        chat->maxUsers = limit;
+        chat->type = type;
+        if (chat->title != title)
+        {
+            chat->title = title;
+            actorManager->updateRoom(chat);
+            chatWindow->joinRoom(true);
+        }
+    }
+}
+
+void ChatRecv::processChatRoomRoleChange(Net::MessageIn &msg)
+{
+    const int role = msg.readInt32("role");
+    const std::string name = msg.readString(24, "name");
+    switch (role)
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::ROOM_ROLE_OWNER, name);
+            break;
+        case 1:
+            // dont show normal role
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+}
+
+void ChatRecv::processMVPItem(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt16("item id");
+}
+
+void ChatRecv::processMVPExp(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    msg.readInt32("exo");
+}
+
+void ChatRecv::processMVPNoItem(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+}
+
+void ChatRecv::processMannerMessage(Net::MessageIn &msg)
+{
+    const int result = msg.readInt32("type");
+    switch (result)
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::MANNER_CHANGED);
+            break;
+        case 5:
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+}
+
+void ChatRecv::processChatSilence(Net::MessageIn &msg)
+{
+    const int result = msg.readUInt8("type");
+    const std::string name = msg.readString(24, "gm name");
+
+    switch (result)
+    {
+        case 0:
+            NotifyManager::notify(NotifyTypes::MANNER_POSITIVE_POINTS, name);
+            break;
+        case 1:
+            NotifyManager::notify(NotifyTypes::MANNER_NEGATIVE_POINTS, name);
+            break;
+        default:
+            UNIMPLIMENTEDPACKET;
+            break;
+    }
+}
+
+void ChatRecv::processChatTalkieBox(Net::MessageIn &msg)
+{
+    msg.readBeingId("being id");
+    const std::string message = msg.readString(80, "message");
+    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
+}
+
+void ChatRecv::processBattleChatMessage(Net::MessageIn &msg)
+{
+    UNIMPLIMENTEDPACKET;
+    const int sz = msg.readInt16("len") - 24 - 8;
+    msg.readBeingId("account id");
+    msg.readString(24, "nick");
+    msg.readString(sz, "message");
+}
+
+void ChatRecv::processScriptMessage(Net::MessageIn &msg)
+{
+    const int sz = msg.readInt16("len") - 8;
+    msg.readBeingId("being id");
+    const std::string message = msg.readString(sz, "message");
+    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
+}
+
+}  // namespace EAthena
diff --git a/src/net/eathena/chatrecv.h b/src/net/eathena/chatrecv.h
new file mode 100644
index 000000000..fcef0085e
--- /dev/null
+++ b/src/net/eathena/chatrecv.h
@@ -0,0 +1,77 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_EATHENA_CHATRECV_H
+#define NET_EATHENA_CHATRECV_H
+
+#include "net/ea/chathandler.h"
+
+#include "enums/gui/chatmsgtype.h"
+
+#include "net/eathena/messagehandler.h"
+
+namespace EAthena
+{
+    class MessageOut;
+
+    namespace ChatRecv
+    {
+        std::string extractChannelFromMessage(std::string &chatMsg);
+        void processChat(Net::MessageIn &msg);
+        void processColorChat(Net::MessageIn &msg);
+        void processChatContinue(std::string chatMsg,
+                                 ChatMsgTypeT own);
+        void processWhisper(Net::MessageIn &msg);
+        void processWhisperResponse(Net::MessageIn &msg);
+        void processGmChat(Net::MessageIn &msg);
+        void processGmChat2(Net::MessageIn &msg);
+        void processChatIgnoreList(Net::MessageIn &msg);
+        void processFormatMessage(Net::MessageIn &msg);
+        void processFormatMessageNumber(Net::MessageIn &msg);
+        void processFormatMessageSkill(Net::MessageIn &msg);
+        void processChatDisplay(Net::MessageIn &msg);
+        void processChatRoomJoinAck(Net::MessageIn &msg);
+        void processChatRoomLeave(Net::MessageIn &msg);
+        void processJoinChannel(Net::MessageIn &msg);
+        void processWhisperContinue(const std::string &nick,
+                                    std::string chatMsg);
+        void processBeingChat(Net::MessageIn &msg);
+        void processIgnoreNickAck(Net::MessageIn &msg);
+        void processChatRoomCreateAck(Net::MessageIn &msg);
+        void processChatRoomDestroy(Net::MessageIn &msg);
+        void processChatRoomJoinFailed(Net::MessageIn &msg);
+        void processChatRoomAddMember(Net::MessageIn &msg);
+        void processChatRoomSettings(Net::MessageIn &msg);
+        void processChatRoomRoleChange(Net::MessageIn &msg);
+        void processMVPItem(Net::MessageIn &msg);
+        void processMVPExp(Net::MessageIn &msg);
+        void processMVPNoItem(Net::MessageIn &msg);
+        void processMannerMessage(Net::MessageIn &msg);
+        void processChatSilence(Net::MessageIn &msg);
+        void processChatTalkieBox(Net::MessageIn &msg);
+        void processBattleChatMessage(Net::MessageIn &msg);
+        void processScriptMessage(Net::MessageIn &msg);
+        extern std::string mChatRoom;
+    }  // namespace ChatRecv
+}  // namespace EAthena
+
+#endif  // NET_EATHENA_CHATRECV_H
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 78d0f86ab..b13e44b91 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -38,6 +38,9 @@
 
 #include "net/serverfeatures.h"
 
+#include "net/ea/chatrecv.h"
+
+#include "net/tmwa/chatrecv.h"
 #include "net/tmwa/guildmanager.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
@@ -75,37 +78,37 @@ void ChatHandler::handleMessage(Net::MessageIn &msg)
     switch (msg.getId())
     {
         case SMSG_WHISPER_RESPONSE:
-            processWhisperResponse(msg);
+            ChatRecv::processWhisperResponse(msg);
             break;
 
         // Received whisper
         case SMSG_WHISPER:
-            processWhisper(msg);
+            ChatRecv::processWhisper(msg);
             break;
 
         // Received speech from being
         case SMSG_BEING_CHAT:
-            processBeingChat(msg);
+            ChatRecv::processBeingChat(msg);
             break;
 
         case SMSG_PLAYER_CHAT:
-            processChat(msg);
+            ChatRecv::processChat(msg);
             break;
 
         case SMSG_GM_CHAT:
-            processGmChat(msg);
+            ChatRecv::processGmChat(msg);
             break;
 
         case SMSG_MVP_EFFECT:
-            processMVPEffect(msg);
+            Ea::ChatRecv::processMVPEffect(msg);
             break;
 
         case SMSG_IGNORE_ALL_RESPONSE:
-            processIgnoreAllResponse(msg);
+            Ea::ChatRecv::processIgnoreAllResponse(msg);
             break;
 
         case SMSG_SCRIPT_MESSAGE:
-            processScriptMessage(msg);
+            ChatRecv::processScriptMessage(msg);
             break;
 
         default:
@@ -143,7 +146,7 @@ void ChatHandler::privateMessage(const std::string &restrict recipient,
     outMsg.writeInt16(static_cast<int16_t>(text.length() + 28), "len");
     outMsg.writeString(recipient, 24, "recipient nick");
     outMsg.writeString(text, static_cast<int>(text.length()), "message");
-    mSentWhispers.push(recipient);
+    Ea::ChatRecv::mSentWhispers.push(recipient);
 }
 
 void ChatHandler::channelMessage(const std::string &restrict channel,
@@ -270,157 +273,6 @@ void ChatHandler::battleTalk(const std::string &text A_UNUSED) const
 {
 }
 
-void ChatHandler::processChat(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processChat")
-    const int chatMsgLength = msg.readInt16("len") - 4;
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    processChatContinue(msg.readRawString(chatMsgLength, "message"), "");
-}
-
-void ChatHandler::processChatContinue(std::string chatMsg,
-                                      const std::string &channel)
-{
-    const size_t pos = chatMsg.find(" : ", 0);
-
-    bool allow(true);
-    if (chatWindow)
-    {
-        allow = chatWindow->resortChatLog(chatMsg,
-            ChatMsgType::BY_PLAYER,
-            channel,
-            IgnoreRecord_false,
-            TryRemoveColors_true);
-    }
-
-    if (channel.empty())
-    {
-        const std::string senseStr("You sense the following: ");
-        if (actorManager && !chatMsg.find(senseStr))
-        {
-            actorManager->parseLevels(
-                chatMsg.substr(senseStr.size()));
-        }
-    }
-
-    if (pos == std::string::npos && !mShowMotd
-        && mSkipping && channel.empty())
-    {
-        // skip motd from "new" tmw server
-        if (mMotdTime == -1)
-            mMotdTime = cur_time + 1;
-        else if (mMotdTime == cur_time || mMotdTime < cur_time)
-            mSkipping = false;
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    if (pos != std::string::npos)
-        chatMsg.erase(0, pos + 3);
-
-    trim(chatMsg);
-
-    if (localPlayer)
-    {
-        if ((chatWindow || mShowMotd) && allow)
-            localPlayer->setSpeech(chatMsg, channel);
-    }
-    BLOCK_END("ChatHandler::processChat")
-}
-
-void ChatHandler::processGmChat(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processChat")
-    const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT;
-    int chatMsgLength = msg.readInt16("len") - 4;
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processChat")
-        return;
-    }
-
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-    const size_t pos = chatMsg.find(" : ", 0);
-
-    if (normalChat)
-    {
-        bool allow(true);
-        if (chatWindow)
-        {
-            allow = chatWindow->resortChatLog(chatMsg,
-                ChatMsgType::BY_PLAYER,
-                GENERAL_CHANNEL,
-                IgnoreRecord_false,
-                TryRemoveColors_true);
-        }
-
-        const std::string senseStr("You sense the following: ");
-        if (actorManager && !chatMsg.find(senseStr))
-        {
-            actorManager->parseLevels(
-                chatMsg.substr(senseStr.size()));
-        }
-
-        if (pos == std::string::npos &&
-            !mShowMotd &&
-            mSkipping)
-        {
-            // skip motd from "new" tmw server
-            if (mMotdTime == -1)
-                mMotdTime = cur_time + 1;
-            else if (mMotdTime == cur_time || mMotdTime < cur_time)
-                mSkipping = false;
-            BLOCK_END("ChatHandler::processChat")
-            return;
-        }
-
-        if (pos != std::string::npos)
-            chatMsg.erase(0, pos + 3);
-
-        trim(chatMsg);
-
-        if (localPlayer)
-        {
-            if ((chatWindow || mShowMotd) && allow)
-                localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
-        }
-    }
-    else if (localChatTab)
-    {
-        if (chatWindow)
-            chatWindow->addGlobalMessage(chatMsg);
-    }
-    BLOCK_END("ChatHandler::processChat")
-}
-
-void ChatHandler::processWhisper(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processWhisper")
-    const int chatMsgLength = msg.readInt16("len") - 28;
-    std::string nick = msg.readString(24, "nick");
-
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processWhisper")
-        return;
-    }
-
-    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
-}
-
-void ChatHandler::processWhisperResponse(Net::MessageIn &msg)
-{
-    BLOCK_START("ChatHandler::processWhisperResponse")
-
-    const uint8_t type = msg.readUInt8("response");
-    processWhisperResponseContinue(msg, type);
-}
-
 void ChatHandler::joinChat(const ChatObject *const chat A_UNUSED,
                            const std::string &password A_UNUSED) const
 {
@@ -434,207 +286,6 @@ void ChatHandler::partChannel(const std::string &channel A_UNUSED)
 {
 }
 
-void ChatHandler::processWhisperContinue(const std::string &nick,
-                                         std::string chatMsg)
-{
-    // ignoring future whisper messages
-    if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)
-    {
-        BLOCK_END("ChatHandler::processWhisper")
-        return;
-    }
-    // remove first unicode space if this is may be whisper command.
-    if (chatMsg.find("\302\202!") == 0)
-        chatMsg = chatMsg.substr(2);
-
-    if (nick != "Server")
-    {
-        if (guildManager && GuildManager::getEnableGuildBot()
-            && nick == "guild" && guildManager->processGuildMessage(chatMsg))
-        {
-            BLOCK_END("ChatHandler::processWhisper")
-            return;
-        }
-
-        if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
-        {
-            const bool tradeBot = config.getBoolValue("tradebot");
-            const bool showMsg = !config.getBoolValue("hideShopMessages");
-            if (player_relations.hasPermission(nick, PlayerRelation::TRADE))
-            {
-                if (shopWindow)
-                {   // commands to shop from player
-                    if (chatMsg.find("!selllist ") == 0)
-                    {
-                        if (tradeBot)
-                        {
-                            if (showMsg && chatWindow)
-                                chatWindow->addWhisper(nick, chatMsg);
-                            shopWindow->giveList(nick, ShopWindow::SELL);
-                        }
-                    }
-                    else if (chatMsg.find("!buylist ") == 0)
-                    {
-                        if (tradeBot)
-                        {
-                            if (showMsg && chatWindow)
-                                chatWindow->addWhisper(nick, chatMsg);
-                            shopWindow->giveList(nick, ShopWindow::BUY);
-                        }
-                    }
-                    else if (chatMsg.find("!buyitem ") == 0)
-                    {
-                        if (showMsg && chatWindow)
-                            chatWindow->addWhisper(nick, chatMsg);
-                        if (tradeBot)
-                        {
-                            shopWindow->processRequest(nick, chatMsg,
-                                ShopWindow::BUY);
-                        }
-                    }
-                    else if (chatMsg.find("!sellitem ") == 0)
-                    {
-                        if (showMsg && chatWindow)
-                            chatWindow->addWhisper(nick, chatMsg);
-                        if (tradeBot)
-                        {
-                            shopWindow->processRequest(nick, chatMsg,
-                                ShopWindow::SELL);
-                        }
-                    }
-                    else if (chatMsg.length() > 3
-                             && chatMsg.find("\302\202") == 0)
-                    {
-                        chatMsg = chatMsg.erase(0, 2);
-                        if (showMsg && chatWindow)
-                            chatWindow->addWhisper(nick, chatMsg);
-                        if (chatMsg.find("B1") == 0 || chatMsg.find("S1") == 0)
-                            shopWindow->showList(nick, chatMsg);
-                    }
-                    else if (chatWindow)
-                    {
-                        chatWindow->addWhisper(nick, chatMsg);
-                    }
-                }
-                else if (chatWindow)
-                {
-                    chatWindow->addWhisper(nick, chatMsg);
-                }
-            }
-            else
-            {
-                if (chatWindow && (showMsg || (chatMsg.find("!selllist") != 0
-                    && chatMsg.find("!buylist") != 0)))
-                {
-                    chatWindow->addWhisper(nick, chatMsg);
-                }
-            }
-        }
-    }
-    else if (localChatTab)
-    {
-        if (gmChatTab && strStartWith(chatMsg, "[GM] "))
-        {
-            chatMsg = chatMsg.substr(5);
-            const size_t pos = chatMsg.find(": ", 0);
-            if (pos == std::string::npos)
-            {
-                gmChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
-            }
-            else
-            {
-                gmChatTab->chatLog(chatMsg.substr(0, pos),
-                    chatMsg.substr(pos + 2));
-            }
-        }
-        else
-        {
-            localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
-        }
-    }
-    BLOCK_END("ChatHandler::processWhisper")
-}
-
-void ChatHandler::processBeingChat(Net::MessageIn &msg)
-{
-    if (!actorManager)
-        return;
-
-    BLOCK_START("ChatHandler::processBeingChat")
-    int chatMsgLength = msg.readInt16("len") - 8;
-    Being *const being = actorManager->findBeing(msg.readBeingId("being id"));
-    if (!being)
-    {
-        BLOCK_END("ChatHandler::processBeingChat")
-        return;
-    }
-
-    if (chatMsgLength <= 0)
-    {
-        BLOCK_END("ChatHandler::processBeingChat")
-        return;
-    }
-
-    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-
-    if (being->getType() == ActorType::Player)
-        being->setTalkTime();
-
-    const size_t pos = chatMsg.find(" : ", 0);
-    std::string sender_name = ((pos == std::string::npos)
-        ? "" : chatMsg.substr(0, pos));
-
-    if (serverFeatures->haveIncompleteChatMessages())
-    {
-        // work around for "new" tmw server
-        sender_name = being->getName();
-        if (sender_name.empty())
-            sender_name = "?";
-    }
-    else if (sender_name != being->getName()
-             && being->getType() == ActorType::Player)
-    {
-        if (!being->getName().empty())
-            sender_name = being->getName();
-    }
-    else
-    {
-        chatMsg.erase(0, pos + 3);
-    }
-
-    trim(chatMsg);
-
-    bool allow(true);
-    // We use getIgnorePlayer instead of ignoringPlayer here
-    // because ignorePlayer' side effects are triggered
-    // right below for Being::IGNORE_SPEECH_FLOAT.
-    if (player_relations.checkPermissionSilently(sender_name,
-        PlayerRelation::SPEECH_LOG) && chatWindow)
-    {
-        allow = chatWindow->resortChatLog(
-            removeColors(sender_name).append(" : ").append(chatMsg),
-            ChatMsgType::BY_OTHER,
-            GENERAL_CHANNEL,
-            IgnoreRecord_false,
-            TryRemoveColors_true);
-    }
-
-    if (allow && player_relations.hasPermission(sender_name,
-        PlayerRelation::SPEECH_FLOAT))
-    {
-        being->setSpeech(chatMsg, GENERAL_CHANNEL);
-    }
-    BLOCK_END("ChatHandler::processBeingChat")
-}
-
-void ChatHandler::processScriptMessage(Net::MessageIn &msg)
-{
-    const int sz = msg.readInt16("len") - 5;
-    msg.readUInt8("message type");
-    const std::string message = msg.readString(sz, "message");
-    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
-}
-
 void ChatHandler::talkPet(const std::string &restrict text,
                           const std::string &restrict channel) const
 {
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 176d8e3be..4bab1f050 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -94,24 +94,6 @@ class ChatHandler final : public MessageHandler, public Ea::ChatHandler
         void kickFromChatRoom(const std::string &nick) const override final;
 
     protected:
-        static void processChat(Net::MessageIn &msg);
-
-        static void processChatContinue(std::string chatMsg,
-                                        const std::string &channel);
-
-        static void processGmChat(Net::MessageIn &msg);
-
-        static void processWhisper(Net::MessageIn &msg);
-
-        static void processWhisperResponse(Net::MessageIn &msg);
-
-        static void processWhisperContinue(const std::string &nick,
-                                           std::string chatMsg);
-
-        static void processBeingChat(Net::MessageIn &msg);
-
-        static void processScriptMessage(Net::MessageIn &msg);
-
         static void processRaw(MessageOut &restrict outMsg,
                                const std::string &restrict line);
 };
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
new file mode 100644
index 000000000..de0b9a9ed
--- /dev/null
+++ b/src/net/tmwa/chatrecv.cpp
@@ -0,0 +1,416 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/tmwa/chatrecv.h"
+
+#include "actormanager.h"
+#include "configuration.h"
+
+#include "being/localplayer.h"
+#include "being/playerrelation.h"
+#include "being/playerrelations.h"
+
+#include "gui/chatconsts.h"
+
+#include "gui/widgets/tabs/chat/gmtab.h"
+
+#include "gui/windows/chatwindow.h"
+#include "gui/windows/shopwindow.h"
+
+#include "net/serverfeatures.h"
+
+#include "net/ea/chatrecv.h"
+
+#include "net/tmwa/guildmanager.h"
+#include "net/tmwa/messageout.h"
+#include "net/tmwa/protocol.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+void ChatRecv::processChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processChat")
+    const int chatMsgLength = msg.readInt16("len") - 4;
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    processChatContinue(msg.readRawString(chatMsgLength, "message"), "");
+}
+
+void ChatRecv::processChatContinue(std::string chatMsg,
+                                      const std::string &channel)
+{
+    const size_t pos = chatMsg.find(" : ", 0);
+
+    bool allow(true);
+    if (chatWindow)
+    {
+        allow = chatWindow->resortChatLog(chatMsg,
+            ChatMsgType::BY_PLAYER,
+            channel,
+            IgnoreRecord_false,
+            TryRemoveColors_true);
+    }
+
+    if (channel.empty())
+    {
+        const std::string senseStr("You sense the following: ");
+        if (actorManager && !chatMsg.find(senseStr))
+        {
+            actorManager->parseLevels(
+                chatMsg.substr(senseStr.size()));
+        }
+    }
+
+    if (pos == std::string::npos &&
+        !Ea::ChatRecv::mShowMotd &&
+        Ea::ChatRecv::mSkipping &&
+        channel.empty())
+    {
+        // skip motd from "new" tmw server
+        if (Ea::ChatRecv::mMotdTime == -1)
+        {
+            Ea::ChatRecv::mMotdTime = cur_time + 1;
+        }
+        else if (Ea::ChatRecv::mMotdTime == cur_time ||
+                 Ea::ChatRecv::mMotdTime < cur_time)
+        {
+            Ea::ChatRecv::mSkipping = false;
+        }
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    if (pos != std::string::npos)
+        chatMsg.erase(0, pos + 3);
+
+    trim(chatMsg);
+
+    if (localPlayer)
+    {
+        if ((chatWindow || Ea::ChatRecv::mShowMotd) && allow)
+            localPlayer->setSpeech(chatMsg, channel);
+    }
+    BLOCK_END("ChatRecv::processChat")
+}
+
+void ChatRecv::processGmChat(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processChat")
+    const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT;
+    int chatMsgLength = msg.readInt16("len") - 4;
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processChat")
+        return;
+    }
+
+    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+    const size_t pos = chatMsg.find(" : ", 0);
+
+    if (normalChat)
+    {
+        bool allow(true);
+        if (chatWindow)
+        {
+            allow = chatWindow->resortChatLog(chatMsg,
+                ChatMsgType::BY_PLAYER,
+                GENERAL_CHANNEL,
+                IgnoreRecord_false,
+                TryRemoveColors_true);
+        }
+
+        const std::string senseStr("You sense the following: ");
+        if (actorManager && !chatMsg.find(senseStr))
+        {
+            actorManager->parseLevels(
+                chatMsg.substr(senseStr.size()));
+        }
+
+        if (pos == std::string::npos &&
+            !Ea::ChatRecv::mShowMotd &&
+            Ea::ChatRecv::mSkipping)
+        {
+            // skip motd from "new" tmw server
+            if (Ea::ChatRecv::mMotdTime == -1)
+            {
+                Ea::ChatRecv::mMotdTime = cur_time + 1;
+            }
+            else if (Ea::ChatRecv::mMotdTime == cur_time ||
+                     Ea::ChatRecv::mMotdTime < cur_time)
+            {
+                Ea::ChatRecv::mSkipping = false;
+            }
+            BLOCK_END("ChatRecv::processChat")
+            return;
+        }
+
+        if (pos != std::string::npos)
+            chatMsg.erase(0, pos + 3);
+
+        trim(chatMsg);
+
+        if (localPlayer)
+        {
+            if ((chatWindow || Ea::ChatRecv::mShowMotd) && allow)
+                localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
+        }
+    }
+    else if (localChatTab)
+    {
+        if (chatWindow)
+            chatWindow->addGlobalMessage(chatMsg);
+    }
+    BLOCK_END("ChatRecv::processChat")
+}
+
+void ChatRecv::processWhisper(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processWhisper")
+    const int chatMsgLength = msg.readInt16("len") - 28;
+    std::string nick = msg.readString(24, "nick");
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processWhisper")
+        return;
+    }
+
+    processWhisperContinue(nick, msg.readString(chatMsgLength, "message"));
+}
+
+void ChatRecv::processWhisperResponse(Net::MessageIn &msg)
+{
+    BLOCK_START("ChatRecv::processWhisperResponse")
+
+    const uint8_t type = msg.readUInt8("response");
+    Ea::ChatRecv::processWhisperResponseContinue(msg, type);
+}
+
+void ChatRecv::processWhisperContinue(const std::string &nick,
+                                         std::string chatMsg)
+{
+    // ignoring future whisper messages
+    if (chatMsg.find("\302\202G") == 0 || chatMsg.find("\302\202A") == 0)
+    {
+        BLOCK_END("ChatRecv::processWhisper")
+        return;
+    }
+    // remove first unicode space if this is may be whisper command.
+    if (chatMsg.find("\302\202!") == 0)
+        chatMsg = chatMsg.substr(2);
+
+    if (nick != "Server")
+    {
+        if (guildManager && GuildManager::getEnableGuildBot()
+            && nick == "guild" && guildManager->processGuildMessage(chatMsg))
+        {
+            BLOCK_END("ChatRecv::processWhisper")
+            return;
+        }
+
+        if (player_relations.hasPermission(nick, PlayerRelation::WHISPER))
+        {
+            const bool tradeBot = config.getBoolValue("tradebot");
+            const bool showMsg = !config.getBoolValue("hideShopMessages");
+            if (player_relations.hasPermission(nick, PlayerRelation::TRADE))
+            {
+                if (shopWindow)
+                {   // commands to shop from player
+                    if (chatMsg.find("!selllist ") == 0)
+                    {
+                        if (tradeBot)
+                        {
+                            if (showMsg && chatWindow)
+                                chatWindow->addWhisper(nick, chatMsg);
+                            shopWindow->giveList(nick, ShopWindow::SELL);
+                        }
+                    }
+                    else if (chatMsg.find("!buylist ") == 0)
+                    {
+                        if (tradeBot)
+                        {
+                            if (showMsg && chatWindow)
+                                chatWindow->addWhisper(nick, chatMsg);
+                            shopWindow->giveList(nick, ShopWindow::BUY);
+                        }
+                    }
+                    else if (chatMsg.find("!buyitem ") == 0)
+                    {
+                        if (showMsg && chatWindow)
+                            chatWindow->addWhisper(nick, chatMsg);
+                        if (tradeBot)
+                        {
+                            shopWindow->processRequest(nick, chatMsg,
+                                ShopWindow::BUY);
+                        }
+                    }
+                    else if (chatMsg.find("!sellitem ") == 0)
+                    {
+                        if (showMsg && chatWindow)
+                            chatWindow->addWhisper(nick, chatMsg);
+                        if (tradeBot)
+                        {
+                            shopWindow->processRequest(nick, chatMsg,
+                                ShopWindow::SELL);
+                        }
+                    }
+                    else if (chatMsg.length() > 3
+                             && chatMsg.find("\302\202") == 0)
+                    {
+                        chatMsg = chatMsg.erase(0, 2);
+                        if (showMsg && chatWindow)
+                            chatWindow->addWhisper(nick, chatMsg);
+                        if (chatMsg.find("B1") == 0 || chatMsg.find("S1") == 0)
+                            shopWindow->showList(nick, chatMsg);
+                    }
+                    else if (chatWindow)
+                    {
+                        chatWindow->addWhisper(nick, chatMsg);
+                    }
+                }
+                else if (chatWindow)
+                {
+                    chatWindow->addWhisper(nick, chatMsg);
+                }
+            }
+            else
+            {
+                if (chatWindow && (showMsg || (chatMsg.find("!selllist") != 0
+                    && chatMsg.find("!buylist") != 0)))
+                {
+                    chatWindow->addWhisper(nick, chatMsg);
+                }
+            }
+        }
+    }
+    else if (localChatTab)
+    {
+        if (gmChatTab && strStartWith(chatMsg, "[GM] "))
+        {
+            chatMsg = chatMsg.substr(5);
+            const size_t pos = chatMsg.find(": ", 0);
+            if (pos == std::string::npos)
+            {
+                gmChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
+            }
+            else
+            {
+                gmChatTab->chatLog(chatMsg.substr(0, pos),
+                    chatMsg.substr(pos + 2));
+            }
+        }
+        else
+        {
+            localChatTab->chatLog(chatMsg, ChatMsgType::BY_SERVER);
+        }
+    }
+    BLOCK_END("ChatRecv::processWhisper")
+}
+
+void ChatRecv::processBeingChat(Net::MessageIn &msg)
+{
+    if (!actorManager)
+        return;
+
+    BLOCK_START("ChatRecv::processBeingChat")
+    int chatMsgLength = msg.readInt16("len") - 8;
+    Being *const being = actorManager->findBeing(msg.readBeingId("being id"));
+    if (!being)
+    {
+        BLOCK_END("ChatRecv::processBeingChat")
+        return;
+    }
+
+    if (chatMsgLength <= 0)
+    {
+        BLOCK_END("ChatRecv::processBeingChat")
+        return;
+    }
+
+    std::string chatMsg = msg.readRawString(chatMsgLength, "message");
+
+    if (being->getType() == ActorType::Player)
+        being->setTalkTime();
+
+    const size_t pos = chatMsg.find(" : ", 0);
+    std::string sender_name = ((pos == std::string::npos)
+        ? "" : chatMsg.substr(0, pos));
+
+    if (serverFeatures->haveIncompleteChatMessages())
+    {
+        // work around for "new" tmw server
+        sender_name = being->getName();
+        if (sender_name.empty())
+            sender_name = "?";
+    }
+    else if (sender_name != being->getName()
+             && being->getType() == ActorType::Player)
+    {
+        if (!being->getName().empty())
+            sender_name = being->getName();
+    }
+    else
+    {
+        chatMsg.erase(0, pos + 3);
+    }
+
+    trim(chatMsg);
+
+    bool allow(true);
+    // We use getIgnorePlayer instead of ignoringPlayer here
+    // because ignorePlayer' side effects are triggered
+    // right below for Being::IGNORE_SPEECH_FLOAT.
+    if (player_relations.checkPermissionSilently(sender_name,
+        PlayerRelation::SPEECH_LOG) && chatWindow)
+    {
+        allow = chatWindow->resortChatLog(
+            removeColors(sender_name).append(" : ").append(chatMsg),
+            ChatMsgType::BY_OTHER,
+            GENERAL_CHANNEL,
+            IgnoreRecord_false,
+            TryRemoveColors_true);
+    }
+
+    if (allow && player_relations.hasPermission(sender_name,
+        PlayerRelation::SPEECH_FLOAT))
+    {
+        being->setSpeech(chatMsg, GENERAL_CHANNEL);
+    }
+    BLOCK_END("ChatRecv::processBeingChat")
+}
+
+void ChatRecv::processScriptMessage(Net::MessageIn &msg)
+{
+    const int sz = msg.readInt16("len") - 5;
+    msg.readUInt8("message type");
+    const std::string message = msg.readString(sz, "message");
+    localChatTab->chatLog(message, ChatMsgType::BY_SERVER);
+}
+
+}  // namespace TmwAthena
diff --git a/src/net/tmwa/chatrecv.h b/src/net/tmwa/chatrecv.h
new file mode 100644
index 000000000..18d56a525
--- /dev/null
+++ b/src/net/tmwa/chatrecv.h
@@ -0,0 +1,49 @@
+/*
+ *  The ManaPlus Client
+ *  Copyright (C) 2004-2009  The Mana World Development Team
+ *  Copyright (C) 2009-2010  The Mana Developers
+ *  Copyright (C) 2011-2015  The ManaPlus Developers
+ *
+ *  This file is part of The ManaPlus Client.
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_TMWA_CHATRECV_H
+#define NET_TMWA_CHATRECV_H
+
+#include "net/ea/chathandler.h"
+
+#include "net/tmwa/messagehandler.h"
+
+namespace TmwAthena
+{
+    class MessageOut;
+
+    namespace ChatRecv
+    {
+        void processChat(Net::MessageIn &msg);
+        void processChatContinue(std::string chatMsg,
+                                 const std::string &channel);
+        void processGmChat(Net::MessageIn &msg);
+        void processWhisper(Net::MessageIn &msg);
+        void processWhisperResponse(Net::MessageIn &msg);
+        void processWhisperContinue(const std::string &nick,
+                                    std::string chatMsg);
+        void processBeingChat(Net::MessageIn &msg);
+        void processScriptMessage(Net::MessageIn &msg);
+    }  // namespace ChatRecv
+}  // namespace TmwAthena
+
+#endif  // NET_TMWA_CHATRECV_H