diff --git a/app/src/main/res/drawable/bubble_circle_unread.xml b/app/src/main/res/drawable/bubble_circle_unread.xml
index 41c2374f7..c4cb9d5ec 100644
--- a/app/src/main/res/drawable/bubble_circle_unread.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread.xml
@@ -26,6 +26,6 @@
         android:width="2dp"
         android:color="@color/white" />
     <size
-        android:width="24dp"
-        android:height="24dp" />
+        android:width="32dp"
+        android:height="32dp" />
 </shape>
diff --git a/app/src/main/res/drawable/bubble_circle_unread_mention.xml b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
index 0577d694b..99e07c625 100644
--- a/app/src/main/res/drawable/bubble_circle_unread_mention.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
@@ -26,6 +26,6 @@
         android:width="2dp"
         android:color="@color/white" />
     <size
-        android:width="24dp"
-        android:height="24dp" />
+        android:width="32dp"
+        android:height="32dp" />
 </shape>
diff --git a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
index d112fdc64..9d22b0597 100644
--- a/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
+++ b/app/src/main/res/layout/rv_item_conversation_with_last_message.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
@@ -129,7 +128,9 @@
                 android:lines="1"
                 android:textAlignment="center"
                 android:textColor="@color/conversation_unread_bubble"
-                tools:text="1" />
+                android:textSize="12sp"
+                tools:background="@drawable/bubble_circle_unread"
+                tools:text="99+" />
 
         </RelativeLayout>