diff --git a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
index 9b1cc66c2..1c8ad92d5 100644
--- a/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
+++ b/app/src/main/java/org/linphone/ui/main/chat/adapter/ConversationEventAdapter.kt
@@ -149,6 +149,11 @@ class ConversationEventAdapter(
             with(binding) {
                 model = message
 
+                setOnLongClickListener {
+                    chatMessageLongPressEvent.value = Event(message)
+                    true
+                }
+
                 setShowDeliveryInfoClickListener {
                     showDeliveryForChatMessageModelEvent.value = Event(message)
                 }
diff --git a/app/src/main/res/layout/chat_bubble_long_press_menu.xml b/app/src/main/res/layout/chat_bubble_long_press_menu.xml
index 61e5194d5..1bd6edef3 100644
--- a/app/src/main/res/layout/chat_bubble_long_press_menu.xml
+++ b/app/src/main/res/layout/chat_bubble_long_press_menu.xml
@@ -52,7 +52,7 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/bubble"/>
+                app:layout_constraintBottom_toTopOf="@id/bubble_top_barrier"/>
 
             <androidx.appcompat.widget.AppCompatTextView
                 style="@style/default_text_style"
@@ -143,12 +143,34 @@
                 app:layout_constraintTop_toTopOf="@id/thumbs_up"
                 app:layout_constraintBottom_toBottomOf="@id/emojis_background" />
 
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/bubble_top_barrier"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:barrierDirection="top"
+                app:constraint_referenced_ids="incoming_bubble, outgoing_bubble" />
+
             <include
-                android:id="@+id/bubble"
+                android:id="@+id/outgoing_bubble"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:layout_marginEnd="16dp"
+                android:visibility="@{model.outgoing ? View.VISIBLE : View.GONE, default=gone}"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toTopOf="@id/reply"
+                model="@{model}"
+                layout="@layout/chat_bubble_outgoing"/>
+
+            <include
+                android:id="@+id/incoming_bubble"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginEnd="16dp"
+                android:visibility="@{model.outgoing ? View.GONE : View.VISIBLE}"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"