diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index ae80027f1..b98f63217 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -106,6 +106,13 @@ fun setLeftMargin(view: View, margin: Float) {
     view.layoutParams = layoutParams
 }
 
+@BindingAdapter("android:layout_marginRight")
+fun setRightMargin(view: View, margin: Float) {
+    val layoutParams = view.layoutParams as RelativeLayout.LayoutParams
+    layoutParams.rightMargin = margin.toInt()
+    view.layoutParams = layoutParams
+}
+
 @BindingAdapter("android:layout_weight")
 fun setLayoutWeight(view: View, weight: Float) {
     val layoutParams = view.layoutParams as LinearLayout.LayoutParams
diff --git a/app/src/main/res/layout/chat_message_list_cell.xml b/app/src/main/res/layout/chat_message_list_cell.xml
index 5cffeb790..f392bcddc 100644
--- a/app/src/main/res/layout/chat_message_list_cell.xml
+++ b/app/src/main/res/layout/chat_message_list_cell.xml
@@ -70,7 +70,7 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentLeft="true"
                 android:layout_below="@id/time"
-                android:layout_marginLeft="5dp"
+                android:layout_marginLeft="10dp"
                 android:gravity="center"
                 app:viewModel="@{viewModel}"
                 tools:layout="@layout/contact_avatar" />
@@ -88,7 +88,7 @@
                 android:layout_toRightOf="@id/avatar"
                 android:layout_below="@id/time"
                 android:layout_marginBottom="1dp"
-                android:layout_marginRight="3dp"
+                android:layout_marginRight="@{viewModel.chatMessage.outgoing ? @dimen/outgoing_chat_message_bubble_right_margin : @dimen/incoming_chat_message_bubble_right_margin}"
                 android:layout_marginLeft="@{selectionListViewModel.isEditionEnabled ? @dimen/edit_chat_message_bubble_left_margin : !viewModel.chatMessage.outgoing ? @dimen/incoming_chat_message_bubble_left_margin : @dimen/outgoing_chat_message_bubble_left_margin}"
                 android:paddingTop="5dp"
                 android:paddingBottom="5dp">
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 2104de5e7..857c3640f 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -3,6 +3,8 @@
     <dimen name="edit_chat_message_bubble_left_margin">10dp</dimen>
     <dimen name="incoming_chat_message_bubble_left_margin">0dp</dimen>
     <dimen name="outgoing_chat_message_bubble_left_margin">45dp</dimen>
+    <dimen name="incoming_chat_message_bubble_right_margin">10dp</dimen>
+    <dimen name="outgoing_chat_message_bubble_right_margin">3dp</dimen>
     <dimen name="chat_message_bubble_image_height_big">200dp</dimen>
     <dimen name="chat_message_bubble_image_height_small">100dp</dimen>
     <dimen name="video_preview_max_size">200dp</dimen>