diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
index 2bf6f3588..e2c16f2d2 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.java
@@ -132,7 +132,7 @@ public class MagicIncomingTextMessageViewHolder
         if (messageParameters != null && messageParameters.size() > 0) {
             for (String key : messageParameters.keySet()) {
                 Map<String, String> individualHashMap = message.getMessageParameters().get(key);
-                if (individualHashMap.get("type").equals("user")) {
+                if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
                     int color;
 
                     if (individualHashMap.get("id").equals(message.getActiveUserId())) {
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
index 517c2e23d..af8f171f8 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.java
@@ -88,7 +88,7 @@ public class MagicOutcomingTextMessageViewHolder extends MessageHolders.Outcomin
         if (messageParameters != null && messageParameters.size() > 0) {
             for (String key : messageParameters.keySet()) {
                 Map<String, String> individualHashMap = message.getMessageParameters().get(key);
-                if (individualHashMap.get("type").equals("user")) {
+                if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
                     if (!individualHashMap.get("id").equals(message.getActiveUserId())) {
                         messageString = DisplayUtils.searchAndColor(messageText.getText().toString(),
                                 messageString, "@" + individualHashMap.get("name"), NextcloudTalkApplication
diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
index db025b8f6..0be31bdbe 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
@@ -57,7 +57,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
         if (message.getMessageParameters() != null && message.getMessageParameters().size() > 0) {
             for (String key : message.getMessageParameters().keySet()) {
                 Map<String, String> individualHashMap = message.getMessageParameters().get(key);
-                if (individualHashMap.get("type").equals("user")) {
+                if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
                     int color;
 
                     if (individualHashMap.get("id").equals(message.getActiveUserId())) {
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java
index 0e4adc264..2c3867c0a 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.java
@@ -28,7 +28,7 @@ public class ChatUtils {
         if (messageParameters != null && messageParameters.size() > 0) {
             for (String key : messageParameters.keySet()) {
                 HashMap<String, String> individualHashMap = messageParameters.get(key);
-                if (individualHashMap.get("type").equals("user")) {
+                if (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest")) {
                     message = message.replaceAll("\\{" + key + "\\}", "@" +
                             messageParameters.get(key).get("name"));
                 }