diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
index ae82ce52e..70d8ade7d 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessage.java
@@ -114,7 +114,8 @@ public class ChatMessage implements IMessage {
             for (String key : messageParameters.keySet()) {
                 HashMap<String, String> individualHashMap = messageParameters.get(key);
                 if (individualHashMap.get("type").equals("user")) {
-                    message = message.replaceAll("\\{" + key + "\\}", messageParameters.get(key).get("name"));
+                    message = message.replaceAll("\\{" + key + "\\}", "@" +
+                            messageParameters.get(key).get("name"));
                 }
             }
         }