diff --git a/src/core/coreuserinputhandler.cpp b/src/core/coreuserinputhandler.cpp
index b8d92e2..f27ab7a 100644
--- a/src/core/coreuserinputhandler.cpp
+++ b/src/core/coreuserinputhandler.cpp
@@ -387,7 +387,7 @@ void CoreUserInputHandler::handleWhowas(const BufferInfo &bufferInfo, const QStr

 void CoreUserInputHandler::defaultHandler(QString cmd, const BufferInfo &bufferInfo, const QString &msg) {
   Q_UNUSED(bufferInfo);
-  emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg));
+  emit putCmd(serverEncode(cmd.toUpper()), serverEncode(msg.split(" ")));
 }

 void CoreUserInputHandler::putPrivmsg(const QByteArray &target, const QByteArray &message) {