diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
index 1d0b7398f..9e59da0c1 100644
--- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
@@ -3474,42 +3474,37 @@ class ChatActivity :
                 ""
             }
 
-        val statusMessageView = binding.chatToolbar.findViewById<TextView>(R.id.chat_toolbar_status_message)
         if (currentConversation?.type == ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) {
             var statusMessage = ""
             if (currentConversation?.statusIcon != null) {
                 statusMessage += currentConversation?.statusIcon
             }
-
             if (currentConversation?.statusMessage != null) {
                 statusMessage += currentConversation?.statusMessage
             }
-
-            if (statusMessage.isNotEmpty()) {
-                viewThemeUtils.platform.colorTextView(statusMessageView, ColorRole.ON_SURFACE)
-                statusMessageView.text = statusMessage
-                statusMessageView.visibility = View.VISIBLE
-            } else {
-                statusMessageView.visibility = View.GONE
-            }
+            statusMessageViewContents(statusMessage)
         } else {
-            var descriptionMessage = ""
             if (currentConversation?.type == ConversationType.ROOM_GROUP_CALL ||
                 currentConversation?.type == ConversationType.ROOM_PUBLIC_CALL
             ) {
+                var descriptionMessage = ""
                 descriptionMessage += currentConversation?.description
-
-                if (descriptionMessage.isNotEmpty()) {
-                    viewThemeUtils.platform.colorTextView(statusMessageView, ColorRole.ON_SURFACE)
-                    statusMessageView.text = descriptionMessage
-                    statusMessageView.visibility = View.VISIBLE
-                } else {
-                    statusMessageView.visibility = View.GONE
-                }
+                statusMessageViewContents(descriptionMessage)
             }
         }
     }
 
+    private fun statusMessageViewContents(statusMessageContent: String) {
+        val statusMessageView = binding.chatToolbar.findViewById<TextView>(R.id.chat_toolbar_status_message)
+        if (statusMessageContent.isNotEmpty()) {
+            viewThemeUtils.platform.colorTextView(statusMessageView, ColorRole.ON_SURFACE)
+            statusMessageView.text = statusMessageContent
+            statusMessageView.visibility = View.VISIBLE
+        } else {
+            statusMessageView.visibility = View.GONE
+        }
+    }
+
     public override fun onDestroy() {
         super.onDestroy()
         logConversationInfos("onDestroy")
diff --git a/app/src/main/res/layout/rv_item_open_conversation.xml b/app/src/main/res/layout/rv_item_open_conversation.xml
index e42a1d2b5..455372ec7 100644
--- a/app/src/main/res/layout/rv_item_open_conversation.xml
+++ b/app/src/main/res/layout/rv_item_open_conversation.xml
@@ -40,13 +40,13 @@
         android:lines="1"
         android:textAlignment="viewStart"
         android:textColor="@color/low_emphasis_text"
-        android:textSize="14sp"
+        android:textSize="13sp"
         tools:text="Jane Doe" />
 
     <ImageView
         android:id="@+id/avatar_view"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
+        android:layout_width="52dp"
+        android:layout_height="52dp"
         android:layout_centerVertical="true"
         android:layout_marginEnd="@dimen/standard_margin"
         android:contentDescription="@string/avatar" />