diff --git a/code/chat.js b/code/chat.js
index e5b69e26..d570decc 100644
--- a/code/chat.js
+++ b/code/chat.js
@@ -271,7 +271,7 @@ window.chat.writeDataToHash = function(newData, storageHash, skipSecureMsgs) {
         break;
 
       case 'TEXT':
-        var tmp = markup[1].plain.autoLink();
+        var tmp = $('<div/>').text(markup[1].plain).html().autoLink();
         msg += tmp.replace(window.PLAYER['nickMatcher'], '<em>$1</em>');
         break;