diff --git a/res/layout/longmessage_bubble_received.xml b/res/layout/longmessage_bubble_received.xml
index 49d7ca4dad..4c408eb224 100644
--- a/res/layout/longmessage_bubble_received.xml
+++ b/res/layout/longmessage_bubble_received.xml
@@ -33,6 +33,7 @@
         android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+        android:gravity="end"
         android:clipChildren="false"
         android:clipToPadding="false"
         android:alpha="0.7"
diff --git a/res/layout/longmessage_bubble_sent.xml b/res/layout/longmessage_bubble_sent.xml
index 722c7eee1e..329c129b2f 100644
--- a/res/layout/longmessage_bubble_sent.xml
+++ b/res/layout/longmessage_bubble_sent.xml
@@ -34,6 +34,7 @@
         android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         android:layout_gravity="end"
+        android:gravity="end"
         android:clipChildren="false"
         android:clipToPadding="false"
         app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
diff --git a/res/layout/shared_contact_view.xml b/res/layout/shared_contact_view.xml
index 630a4dafa6..3be0ab8b05 100644
--- a/res/layout/shared_contact_view.xml
+++ b/res/layout/shared_contact_view.xml
@@ -63,6 +63,7 @@
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:layout_marginTop="4dp"
             android:layout_gravity="end"
+            android:gravity="end"
             android:elevation="9dp"
             android:orientation="horizontal" />