diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
index 8b2433438..89cd98fc4 100644
--- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
+++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt
@@ -431,9 +431,9 @@ class ConversationItem(
                     )
                     return lastMessage
                 } else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) {
-                    var attachmentName = chatMessage.message
+                    var attachmentName = chatMessage.text
                     if (attachmentName == "{file}") {
-                        attachmentName = chatMessage.messageParameters?.get("file")?.get("name")
+                        attachmentName = chatMessage.messageParameters?.get("file")?.get("name") ?: ""
                     }
                     val author = authorName(chatMessage)
 
diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
index 818680c3f..90048be05 100644
--- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
+++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatUtils.kt
@@ -21,7 +21,7 @@ class ChatUtils {
             return message
         }
 
-        @Suppress("Detekt.ComplexMethod")
+        @Suppress("Detekt.ComplexMethod", "Detekt.ComplexCondition")
         private fun parse(messageParameters: HashMap<String?, HashMap<String?, String?>>, message: String?): String? {
             var resultMessage = message
             for (key in messageParameters.keys) {
@@ -29,7 +29,9 @@ class ChatUtils {
 
                 if (individualHashMap != null) {
                     val type = individualHashMap["type"]
-                    resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email") {
+                    resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email" ||
+                        type == "user-group" || type == "circle"
+                    ) {
                         resultMessage?.replace("{$key}", "@" + individualHashMap["name"])
                     } else if (type == "geo-location") {
                         individualHashMap["name"]