diff --git a/syncplay/protocols.py b/syncplay/protocols.py
index bcda382..d94ceac 100644
--- a/syncplay/protocols.py
+++ b/syncplay/protocols.py
@@ -242,7 +242,8 @@ class SyncClientProtocol(JSONCommandProtocol):
             }
         })
     def handleChat(self,message):
-        self._client.ui.showMessage(message)
+        messageString = '<'+message['username']+'>'+message['message']
+        self._client.ui.showMessage(messageString)
         #TODO
 
     def setReady(self, isReady, manuallyInitiated=True):
diff --git a/syncplay/server.py b/syncplay/server.py
index efaaf50..cbe555b 100644
--- a/syncplay/server.py
+++ b/syncplay/server.py
@@ -130,7 +130,8 @@ class SyncFactory(Factory):
             self._roomManager.broadcastRoom(watcher, lambda w: w.sendControlledRoomAuthStatus(False, watcher.getName(), room._name))
 
     def sendChat(self,watcher,message):
-        self._roomManager.broadcastRoom(watcher, lambda w: w.sendChatMessage(message))
+        messageDict={"message":message,"username" : watcher.getName()}
+        self._roomManager.broadcastRoom(watcher, lambda w: w.sendChatMessage(messageDict))
 
     def setReady(self, watcher, isReady, manuallyInitiated=True):
         watcher.setReady(isReady)