diff --git a/syncplay/constants.py b/syncplay/constants.py
index c9191ec..6d8f88d 100644
--- a/syncplay/constants.py
+++ b/syncplay/constants.py
@@ -153,7 +153,8 @@ STYLE_READY_PUSHBUTTON = "QPushButton { text-align: left; padding: 10px 5px 10px
 STYLE_AUTO_PLAY_PUSHBUTTON = "QPushButton { text-align: left; padding: 5px 5px 5px 5px; }"
 STYLE_NOTIFICATIONBOX = "Username { color: #367AA9; font-weight:bold; }"
 STYLE_CONTACT_INFO = u"<span style=\"color: grey\"><strong><small>{}</span><br /><br />" # Contact info message
-STYLE_USERNAME = "color: #367AA9; font-weight:bold;"
+STYLE_USER_MESSAGE = u"<span style=\"{}\">&lt;{}&gt;</span> {}"
+STYLE_USERNAME = u"color: #367AA9; font-weight:bold;"
 STYLE_ERRORNOTIFICATION = "color: red;"
 STYLE_DIFFERENTITEM_COLOR = 'red'
 STYLE_NOFILEITEM_COLOR = 'blue'
@@ -180,6 +181,7 @@ UI_COMMAND_REGEX = r"^(?P<command>[^\ ]+)(?:\ (?P<parameter>.+))?"
 UI_OFFSET_REGEX = r"^(?:o|offset)\ ?(?P<sign>[/+-])?(?P<time>\d{1,9}(?:[^\d\.](?:\d{1,9})){0,2}(?:\.(?:\d{1,3}))?)$"
 UI_SEEK_REGEX = r"^(?:s|seek)?\ ?(?P<sign>[+-])?(?P<time>\d{1,4}(?:[^\d\.](?:\d{1,6})){0,2}(?:\.(?:\d{1,3}))?)$"
 PARSE_TIME_REGEX = r'(:?(?:(?P<hours>\d+?)[^\d\.])?(?:(?P<minutes>\d+?))?[^\d\.])?(?P<seconds>\d+?)(?:\.(?P<miliseconds>\d+?))?$'
+MESSAGE_WITH_USERNAME_REGEX = "^(<(?P<username>[^<>]+)>)(?P<message>.*)"
 SERVER_MAX_TEMPLATE_LENGTH = 10000
 PRIVACY_SENDRAW_MODE = "SendRaw"
 PRIVACY_SENDHASHED_MODE = "SendHashed"
diff --git a/syncplay/protocols.py b/syncplay/protocols.py
index ddba3f0..c0055be 100644
--- a/syncplay/protocols.py
+++ b/syncplay/protocols.py
@@ -249,10 +249,9 @@ class SyncClientProtocol(JSONCommandProtocol):
             }
         })
     def handleChat(self,message):
-        userMessage = message['message'].replace(u"<",u"<<").replace(u">",u">>")
+        userMessage = message['message']
         messageString = u"<{}> {}".format(message['username'], userMessage)
         self._client.ui.showMessage(messageString)
-        #TODO
 
     def setReady(self, isReady, manuallyInitiated=True):
         self.sendSet({
diff --git a/syncplay/ui/gui.py b/syncplay/ui/gui.py
index b5475f2..4a0c62d 100644
--- a/syncplay/ui/gui.py
+++ b/syncplay/ui/gui.py
@@ -337,13 +337,14 @@ class MainWindow(QtGui.QMainWindow):
 
     def showMessage(self, message, noTimestamp=False):
         message = unicode(message)
-        message = message.replace(u"&", u"&amp;").replace(u'"', u"&quot;").replace(u"<", u"&lt;").replace(">", u"&gt;")
-        message = message.replace(u"&lt;&lt;", u"<LT>")
-        message = message.replace(u"&gt;&gt;", u"<GT>")
-        message = message.replace(u"&lt;", u"<span style=\"{}\">&lt;".format(constants.STYLE_USERNAME))
-        message = message.replace(u"&gt;", u"&gt;</span>")
-        message = message.replace(u"<LT>;", u"&lt;")
-        message = message.replace(u"<GT>", u"&gt;")
+        username = None
+        messageWithUsername = re.match(constants.MESSAGE_WITH_USERNAME_REGEX, message, re.UNICODE)
+        if messageWithUsername:
+            username = messageWithUsername.group("username")
+            message = messageWithUsername.group("message")
+        message = message.replace(u"&", u"&amp;").replace(u'"', u"&quot;").replace(u"<", u"&lt;").replace(u">", u"&gt;")
+        if username:
+            message = constants.STYLE_USER_MESSAGE.format(constants.STYLE_USERNAME, username, message)
         message = message.replace(u"\n", u"<br />")
         if noTimestamp:
             self.newMessage(u"{}<br />".format(message))