diff --git a/common/server.cpp b/common/server.cpp
index ff49a6dc..432c008e 100644
--- a/common/server.cpp
+++ b/common/server.cpp
@@ -345,6 +345,8 @@ void Server::externalRoomSay(int roomId, const QString &userName, const QString
         return;
     }
     room->say(userName, message, false);
+
+    getDatabaseInterface()->logMessage(0, userName, "ISL", message, Server_DatabaseInterface::MessageTargetRoom, room->getId(), room->getName());
 }
 
 void Server::externalRoomGameListChanged(int roomId, const ServerInfo_Game &gameInfo)
diff --git a/common/server_player.cpp b/common/server_player.cpp
index b9277a2d..ec8c09e2 100644
--- a/common/server_player.cpp
+++ b/common/server_player.cpp
@@ -767,6 +767,8 @@ Response::ResponseCode Server_Player::cmdGameSay(const Command_GameSay &cmd, Res
     Event_GameSay event;
     event.set_message(cmd.message());
     ges.enqueueGameEvent(event, playerId);
+
+    game->getRoom()->getServer()->getDatabaseInterface()->logMessage(playerId, QString::fromStdString(userInfo->name()), QString::fromStdString(userInfo->address()), QString::fromStdString(cmd.message()), Server_DatabaseInterface::MessageTargetGame, game->getGameId(), game->getDescription());
     
     return Response::RespOk;
 }
diff --git a/common/server_protocolhandler.cpp b/common/server_protocolhandler.cpp
index 2ca3902a..07f3fd0f 100644
--- a/common/server_protocolhandler.cpp
+++ b/common/server_protocolhandler.cpp
@@ -395,7 +395,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdMessage(const Command_Message
     SessionEvent *se = prepareSessionEvent(event);
     userInterface->sendProtocolItem(*se);
     rc.enqueuePreResponseItem(ServerMessage::SESSION_EVENT, se);
-    
+
+    databaseInterface->logMessage(userInfo->id(), QString::fromStdString(userInfo->name()), QString::fromStdString(userInfo->address()), QString::fromStdString(cmd.message()), Server_DatabaseInterface::MessageTargetChat, userInterface->getUserInfo()->id(), receiver);
+
     return Response::RespOk;
 }
 
@@ -543,6 +545,9 @@ Response::ResponseCode Server_ProtocolHandler::cmdRoomSay(const Command_RoomSay
     msg.replace(QChar('\n'), QChar(' '));
     
     room->say(QString::fromStdString(userInfo->name()), msg);
+
+    databaseInterface->logMessage(userInfo->id(), QString::fromStdString(userInfo->name()), QString::fromStdString(userInfo->address()), msg, Server_DatabaseInterface::MessageTargetRoom, room->getId(), room->getName());
+
     return Response::RespOk;
 }