diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index a2dd05c467..5c218e15e4 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -96,7 +96,6 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/message_bubble_top_padding"
             android:layout_marginBottom="@dimen/message_bubble_top_image_margin"
-            android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="visible">
 
diff --git a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
index 10349e7111..420390b552 100644
--- a/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
+++ b/app/src/main/res/layout/v2_conversation_item_text_only_incoming.xml
@@ -103,16 +103,24 @@
         app:layout_goneMarginStart="16dp"
         tools:background="@color/black">
 
-        <org.thoughtcrime.securesms.conversation.v2.items.SenderNameWithLabelView
-            android:id="@+id/group_sender_name_with_label"
+        <FrameLayout
+            android:id="@+id/group_sender_holder"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/message_bubble_top_padding"
-            android:layout_marginBottom="1dp"
-            android:paddingStart="@dimen/message_bubble_horizontal_padding"
-            android:paddingEnd="@dimen/message_bubble_horizontal_padding"
-            android:visibility="gone"
-            tools:visibility="visible" />
+            android:layout_height="wrap_content">
+
+            <org.thoughtcrime.securesms.conversation.v2.items.SenderNameWithLabelView
+                android:id="@+id/group_sender_name_with_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginBottom="1dp"
+                android:paddingStart="@dimen/message_bubble_horizontal_padding"
+                android:paddingEnd="@dimen/message_bubble_horizontal_padding"
+                android:visibility="gone"
+                tools:visibility="visible" />
+
+        </FrameLayout>
+
 
         <org.thoughtcrime.securesms.components.emoji.EmojiTextView
             android:id="@+id/conversation_item_body"