diff --git a/vector/src/main/res/layout/view_read_receipts.xml b/vector/src/main/res/layout/view_read_receipts.xml
index 3b5ac377b7..facdba07d2 100644
--- a/vector/src/main/res/layout/view_read_receipts.xml
+++ b/vector/src/main/res/layout/view_read_receipts.xml
@@ -20,6 +20,13 @@
         android:layout_marginHorizontal="4dp"
         tools:text="999+" />
 
+    <!-- Extra layout so we can do our RTL tricks for dual-side bubbles and having the receiptsMore on the other side -->
+    <LinearLayout
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:orientation="horizontal">
+    <!-- Wrong indention for upstream merges -->
+
     <ImageView
         android:id="@+id/receiptAvatar3"
         android:layout_width="@dimen/item_event_message_state_size"
@@ -57,4 +64,6 @@
         android:scaleType="centerCrop"
         tools:src="@sample/user_round_avatars" />
 
+    </LinearLayout>
+
 </merge>