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 c51a07398..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
@@ -433,7 +433,7 @@ class ConversationItem(
                 } else if (MessageType.SINGLE_NC_ATTACHMENT_MESSAGE == chatMessage?.getCalculateMessageType()) {
                     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 78a830cc4..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) {
@@ -30,7 +30,8 @@ class ChatUtils {
                 if (individualHashMap != null) {
                     val type = individualHashMap["type"]
                     resultMessage = if (type == "user" || type == "guest" || type == "call" || type == "email" ||
-                        type == "user-group" || type == "circle") {
+                        type == "user-group" || type == "circle"
+                    ) {
                         resultMessage?.replace("{$key}", "@" + individualHashMap["name"])
                     } else if (type == "geo-location") {
                         individualHashMap["name"]