diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
index eecc8d31b..8c70f226e 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
+++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/MagicPreviewMessageViewHolder.java
@@ -84,7 +84,7 @@ import static com.nextcloud.talk.ui.recyclerview.MessageSwipeCallback.REPLYABLE_
 @AutoInjector(NextcloudTalkApplication.class)
 public class MagicPreviewMessageViewHolder extends MessageHolders.IncomingImageMessageViewHolder<ChatMessage> {
 
-    private static String TAG = "MagicPreviewMessageViewHolder";
+    private static final String TAG = "MagicPreviewMessageViewHolder";
 
     @BindView(R.id.messageText)
     EmojiTextView messageText;
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 be079c009..38e6098e1 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
@@ -66,7 +66,6 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
         int pressedColor;
         int mentionColor;
 
-
         pressedColor = normalColor;
         mentionColor = resources.getColor(R.color.textColorMaxContrast);
 
@@ -80,8 +79,13 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
         if (message.messageParameters != null && message.messageParameters.size() > 0) {
             for (String key : message.messageParameters.keySet()) {
                 Map<String, String> individualHashMap = message.messageParameters.get(key);
-                if (individualHashMap != null && (individualHashMap.get("type").equals("user") || individualHashMap.get("type").equals("guest") || individualHashMap.get("type").equals("call"))) {
-                    messageString = DisplayUtils.searchAndColor(messageString, "@" + individualHashMap.get("name"), mentionColor);
+                if (individualHashMap != null &&
+                        (individualHashMap.get("type").equals("user") ||
+                                individualHashMap.get("type").equals("guest") ||
+                                individualHashMap.get("type").equals("call"))) {
+                    messageString = DisplayUtils.searchAndColor(
+                            messageString, "@" + individualHashMap.get("name"),
+                            mentionColor);
                 }
             }
         }