diff --git a/src/protocol.cpp b/src/protocol.cpp
index 0e94b99c75..7ba3f061cc 100755
--- a/src/protocol.cpp
+++ b/src/protocol.cpp
@@ -167,6 +167,9 @@ MESSAGES (with connection)
     | 2 bytes number n | n bytes UTF-8 string |
     +------------------+----------------------+
 
+    - "UTF-8 string": the chat message (plain text from client to server;
+      HTML from server to client)
+
 
 - PROTMESSID_NETW_TRANSPORT_PROPS: Properties for network transport
 
diff --git a/src/server.cpp b/src/server.cpp
index e80df8e020..f6daaf67d4 100755
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1395,7 +1395,7 @@ void CServer::CreateAndSendChatTextForAllConChannels ( const int      iCurChanID
         "<font color=""" + sCurColor + """>(" +
         QTime::currentTime().toString ( "hh:mm:ss AP" ) + ") <b>" +
         ChanName.toHtmlEscaped() +
-        "</b></font> " + strChatText;
+        "</b></font> " + strChatText.toHtmlEscaped();
 
 
     // Send chat text to all connected clients ---------------------------------