diff --git a/app/src/main/res/layout/chat_bubble_incoming.xml b/app/src/main/res/layout/chat_bubble_incoming.xml
index 30222eaeb..5d572803a 100644
--- a/app/src/main/res/layout/chat_bubble_incoming.xml
+++ b/app/src/main/res/layout/chat_bubble_incoming.xml
@@ -165,7 +165,8 @@
             android:selected="@{model.isSelected}"
             android:background="@{model.groupedWithPreviousMessage ? @drawable/chat_bubble_incoming_full_background : @drawable/chat_bubble_incoming_first_background, default=@drawable/chat_bubble_incoming_first_background}"
             app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/chat_bubble_max_width"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toBottomOf="@id/reply"
             app:layout_constraintStart_toEndOf="@id/avatar">
 
diff --git a/app/src/main/res/layout/chat_bubble_outgoing.xml b/app/src/main/res/layout/chat_bubble_outgoing.xml
index 4e007c55c..9cbedfebb 100644
--- a/app/src/main/res/layout/chat_bubble_outgoing.xml
+++ b/app/src/main/res/layout/chat_bubble_outgoing.xml
@@ -136,8 +136,9 @@
             android:gravity="end"
             android:selected="@{model.isSelected}"
             android:background="@{model.groupedWithNextMessage ? @drawable/chat_bubble_outgoing_full_background : @drawable/chat_bubble_outgoing_last_background, default=@drawable/chat_bubble_outgoing_last_background}"
-            app:layout_constraintHorizontal_bias="0"
-            app:layout_constraintWidth_max="@dimen/chat_bubble_max_width"
+            app:layout_constraintHorizontal_bias="1"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/reply"
             app:layout_constraintEnd_toEndOf="parent">
 
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index 186240824..48f1b89cf 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -85,7 +85,6 @@
     <dimen name="chat_bubble_meeting_invite_width">271dp</dimen>
     <dimen name="chat_bubble_voice_record_width">271dp</dimen>
     <dimen name="chat_bubble_max_reply_width">271dp</dimen>
-    <dimen name="chat_bubble_max_width">291dp</dimen>
     <dimen name="chat_bubble_images_rounded_corner_radius">5dp</dimen>
     <dimen name="chat_bubble_start_margin_when_avatar_displayed">10dp</dimen>
     <dimen name="chat_conversation_header_avatar_start_margin_if_back_button">5dp</dimen>