2 files changed, 8 insertions, 15 deletions
diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp
index 43248e8b..bd0504b5 100644
--- a/src/gui/widgets/chattab.cpp
+++ b/src/gui/widgets/chattab.cpp
@@ -30,12 +30,12 @@
 #include "gui/recorder.h"
 #include "gui/scrollarea.h"
 
+#include "net/net.h"
 #ifdef TMWSERV_SUPPORT
 #include "net/tmwserv/chatserver/chatserver.h"
 #include "net/tmwserv/gameserver/player.h"
 #else
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
+#include "net/ea/chathandler.h"
 #endif
 
 #include "resources/iteminfo.h"
@@ -276,16 +276,11 @@ void ChatTab::clearText()
 }
 
 void ChatTab::handleInput(const std::string &msg) {
+    // Net::getChatHandler()->talk(msg);
 #ifdef TMWSERV_SUPPORT
     Net::GameServer::Player::say(msg);
 #else
-    std::string mes = player_node->getName() + " : " + msg;
-
-    MessageOut outMsg(CMSG_CHAT_MESSAGE);
-    // Added + 1 in order to let eAthena parse admin commands correctly
-    outMsg.writeInt16(mes.length() + 4 + 1);
-    outMsg.writeString(mes, mes.length() + 1);
-    return;
+    chatHandler->talk(msg);
 #endif
 }
 
diff --git a/src/gui/widgets/whispertab.cpp b/src/gui/widgets/whispertab.cpp
index 75131bda..a641f0ad 100644
--- a/src/gui/widgets/whispertab.cpp
+++ b/src/gui/widgets/whispertab.cpp
@@ -25,11 +25,11 @@
 
 #include "gui/palette.h"
 
+#include "net/net.h"
 #ifdef TMWSERV_SUPPORT
 #include "net/tmwserv/chatserver/chatserver.h"
 #else
-#include "net/messageout.h"
-#include "net/ea/protocol.h"
+#include "net/ea/chathandler.h"
 #endif
 
 #include "utils/gettext.h"
@@ -53,13 +53,11 @@ void WhisperTab::handleInput(const std::string &msg) {
         return;
     }
 
+    // Net::getChatHandler()->privateMessage(mNick, msg);
 #ifdef TMWSERV_SUPPORT
     Net::ChatServer::privMsg(mNick, msg);
 #else
-    MessageOut outMsg(CMSG_CHAT_WHISPER);
-    outMsg.writeInt16(msg.length() + 28);
-    outMsg.writeString(mNick, 24);
-    outMsg.writeString(msg, msg.length());
+    chatHandler->privateMessage(mNick, msg);
 #endif
 
     chatLog(strprintf(_("%s: %s"), player_node->getName().c_str(),