diff --git a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
index ff0f093d6706519649a9556beb0cabfe849fcec4..0f0070d77e90bf8782b72fd96125dc1ab2d85792 100644
--- a/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
+++ b/jami-android/app/src/main/java/cx/ring/adapters/ConversationAdapter.kt
@@ -363,7 +363,7 @@ class ConversationAdapter(
                     }
                     // Subscribe on result.
                     Observable.combineLatest(entry) { resultDictionary ->
-                        resultDictionary.map { it ->
+                        resultDictionary.map {
                             it as Pair<ContactViewModel, List<Interaction>>
                         }
                     }
@@ -411,7 +411,7 @@ class ConversationAdapter(
                             chip.isVisible = true
                             chip.isClickable = true
                             chip.isFocusable = true
-                            chip.isChecked = false
+                            //chip.isChecked = false
                         }
                     }
                 }
@@ -1663,8 +1663,8 @@ class ConversationAdapter(
          */
         private fun setBottomMargin(view: View, margin_in_dp: Int) {
             val targetSize = (margin_in_dp * view.context.resources.displayMetrics.density).toInt()
-            val params = view.layoutParams as MarginLayoutParams
-            params.bottomMargin = targetSize
+            val params = view.layoutParams as? MarginLayoutParams?
+            params?.bottomMargin = targetSize
         }
 
         /**
diff --git a/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
index f0c5083cc7cc7bd50740b8bada273da86a37275d..e1a379cbfe1e7bc928b9bc2020a2c21570f9777e 100644
--- a/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
+++ b/jami-android/app/src/main/java/cx/ring/viewholders/ConversationViewHolder.kt
@@ -71,7 +71,7 @@ class ConversationViewHolder(v: ViewGroup, val type: MessageType) : RecyclerView
     val mReplyTxt: TextView? = v.findViewById(R.id.msg_reply_txt)
     val mInReplyTo: TextView? = v.findViewById(R.id.msg_in_reply_to)
     val mPeerDisplayName: TextView? = v.findViewById(R.id.msg_display_name)
-    val reactionChip: Chip? = v.findViewById(R.id.reaction_chip)
+    val reactionChip: TextView? = v.findViewById(R.id.reaction_chip)
     val mIcon: ImageView? = when (type) {
         MessageType.INCOMING_CALL_INFORMATION,
         MessageType.OUTGOING_CALL_INFORMATION -> v.findViewById(R.id.call_icon)
diff --git a/jami-android/app/src/main/res/layout/item_conv_msg_me.xml b/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
index cf39f39de69432a3931d135a9daf0d59bdda52c0..6f50a3f328ca23ca5e4dfdcb8937f953c1065e5c 100644
--- a/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
+++ b/jami-android/app/src/main/res/layout/item_conv_msg_me.xml
@@ -139,25 +139,23 @@ along with this program; if not, write to the Free Software
             android:layout_alignParentEnd="true"
             android:layout_marginEnd="5dp" />
 
-        <com.google.android.material.chip.Chip
+        <TextView
             android:id="@+id/reaction_chip"
-            style="@style/Widget.Material3.Chip.Suggestion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/msg_txt"
             android:layout_alignEnd="@id/msg_txt"
             android:layout_marginTop="-16dp"
             android:layout_marginEnd="8dp"
+            android:background="@drawable/background_item_conv_image"
             android:backgroundTint="@color/icon_background_color"
             android:elevation="4dp"
             android:outlineProvider="none"
             android:text="👍 😍 3"
-            app:chipCornerRadius="5dp"
-            app:chipEndPadding="0dp"
-            app:chipStartPadding="0dp"
-            app:chipStrokeColor="@color/border_color"
-            app:textEndPadding="5dp"
-            app:textStartPadding="5dp" />
+            android:lines="1"
+            android:singleLine="true"
+            android:maxLines="1"
+            android:padding="5dp" />
 
     </RelativeLayout>
 
diff --git a/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml b/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
index dfafa83bf31a7813557b3ca9a1473dd817ce588a..c3d51a0a5dd74b381a161cd1e7cbd8a7d76367ef 100644
--- a/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
+++ b/jami-android/app/src/main/res/layout/item_conv_msg_peer.xml
@@ -127,25 +127,23 @@ along with this program; if not, write to the Free Software
             tools:visibility="visible" />
         <!--    maxEms="8" to have around 16 characters displayed   -->
 
-        <com.google.android.material.chip.Chip
+        <TextView
             android:id="@+id/reaction_chip"
-            style="@style/Widget.Material3.Chip.Suggestion"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/msg_txt"
             android:layout_alignStart="@id/msg_txt"
             android:layout_marginStart="8dp"
             android:layout_marginTop="-16dp"
+            android:background="@drawable/background_item_conv_image"
             android:backgroundTint="@color/icon_background_color"
             android:elevation="4dp"
             android:outlineProvider="none"
             android:text="👍😍 3"
-            app:chipCornerRadius="5dp"
-            app:chipEndPadding="0dp"
-            app:chipStartPadding="0dp"
-            app:chipStrokeColor="@color/border_color"
-            app:textEndPadding="5dp"
-            app:textStartPadding="5dp" />
+            android:lines="1"
+            android:singleLine="true"
+            android:maxLines="1"
+            android:padding="5dp"  />
 
         <TextView
             android:id="@+id/msg_in_reply_to"