diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt
index 83a147b2e..b6c8688f9 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageReactionsListData.kt
@@ -75,11 +75,12 @@ class ChatMessageReactionsListData(private val chatMessage: ChatMessage) {
         for (reaction in chatMessage.reactions) {
             val body = reaction.body
             val count = if (reactionsMap.containsKey(body)) {
-                reactionsMap[body] ?: 1
+                reactionsMap[body] ?: 0
             } else {
-                1
+                0
             }
-            reactionsMap[body] = count
+            // getOrDefault isn't available for API 23 :'(
+            reactionsMap[body] = count + 1
             reactionsList.add(reaction)
         }
         reactions.value = reactionsList
diff --git a/app/src/main/res/layout/chat_message_reactions_list_cell.xml b/app/src/main/res/layout/chat_message_reactions_list_cell.xml
index e17e672ce..68f9f3c6b 100644
--- a/app/src/main/res/layout/chat_message_reactions_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_reactions_list_cell.xml
@@ -11,7 +11,7 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="55dp"
         android:padding="10dp">
 
         <ImageView
diff --git a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml b/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
index eba884dbe..8b9d374cc 100644
--- a/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
+++ b/app/src/main/res/layout/chat_message_reactions_list_dialog.xml
@@ -33,12 +33,12 @@
             android:layout_height="1dp"
             android:layout_marginStart="2dp"
             android:layout_marginEnd="2dp"
-            android:layout_marginBottom="10dp"
+            android:layout_marginBottom="5dp"
             android:background="?dividerColor" />
 
         <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="220dp">
 
             <LinearLayout
                 android:layout_width="match_parent"