diff --git a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt
index 11db3e57d..ee1fc9974 100644
--- a/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt
+++ b/app/src/main/java/com/nextcloud/talk/newarch/features/conversationsList/ConversationPresenter.kt
@@ -120,8 +120,8 @@ open class ConversationsPresenter(context: Context, onElementClick: ((Page, Hold
                                         conversation.lastMessage!!.lastMessageDisplayText
                                 )
                             } else {
-                                authorDisplayName = if (!TextUtils.isEmpty(conversation.lastMessage!!.actorDisplayName))
-                                    conversation.lastMessage!!.actorDisplayName
+                                authorDisplayName = if (!TextUtils.isEmpty(conversation.lastMessage?.actorDisplayName)) {
+                                    conversation.lastMessage?.actorDisplayName!!.substringBefore(" ")                                }
                                 else if ("guests" == conversation.lastMessage!!.actorType)
                                     context.getString(R.string.nc_guest)
                                 else