diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml
index fa22c50cb7..5b7d503cdf 100644
--- a/res/layout/conversation_item_received.xml
+++ b/res/layout/conversation_item_received.xml
@@ -45,160 +45,169 @@
         </RelativeLayout>
 
         <LinearLayout
-            android:id="@+id/body_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/massive_spacing"
-            android:layout_marginStart="12dp"
-            android:paddingTop="@dimen/medium_spacing"
-            android:paddingBottom="@dimen/medium_spacing"
+            android:orientation="vertical"
             android:layout_toStartOf="@+id/indicators_parent"
             android:layout_alignWithParentIfMissing="true"
-            android:orientation="vertical"
             android:clipToPadding="false"
-            android:clipChildren="false"
-            android:background="@color/white"
-            tools:backgroundTint="@color/conversation_blue">
+            android:clipChildren="false">
 
             <LinearLayout
-                android:id="@+id/group_sender_holder"
+                android:id="@+id/body_bubble"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/medium_spacing"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:orientation="horizontal"
-                android:visibility="gone"
-                tools:visibility="visible">
+                android:layout_marginEnd="@dimen/massive_spacing"
+                android:layout_marginStart="12dp"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
+                android:orientation="vertical"
+                android:clipToPadding="false"
+                android:clipChildren="false"
+                android:background="@color/white"
+                tools:backgroundTint="@color/conversation_blue">
 
-                <TextView
-                    android:id="@+id/group_message_sender"
+                <LinearLayout
+                    android:id="@+id/group_sender_holder"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="4sp"
-                    style="@style/Signal.Text.Preview"
-                    android:fontFamily="sans-serif-medium"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:orientation="horizontal"
+                    android:visibility="gone"
+                    tools:visibility="visible">
+
+                    <TextView
+                        android:id="@+id/group_message_sender"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4sp"
+                        style="@style/Signal.Text.Preview"
+                        android:fontFamily="sans-serif-medium"
+                        android:textColor="?conversation_item_received_text_primary_color"
+                        android:textSize="@dimen/small_font_size"
+                        android:alpha="0.6"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        tools:visibility="visible"
+                        tools:text="+14152222222"/>
+
+                    <TextView
+                        android:id="@+id/group_message_sender_profile"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:paddingStart="4sp"
+                        android:paddingEnd="4sp"
+                        style="@style/Signal.Text.Preview"
+                        android:fontFamily="sans-serif-regular"
+                        android:textColor="?conversation_item_received_text_primary_color"
+                        android:textStyle="italic"
+                        android:maxLines="1"
+                        android:ellipsize="end"
+                        tools:text="~Clement Duval"/>
+
+                </LinearLayout>
+
+                <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
+                    android:visibility="gone"
+                    app:message_type="incoming"
+                    app:quote_colorPrimary="@color/text"
+                    app:quote_colorSecondary="@color/text"
+                    tools:visibility="visible"/>
+
+                <ViewStub
+                    android:id="@+id/shared_contact_view_stub"
+                    android:layout="@layout/conversation_item_received_shared_contact"
+                    android:layout_width="@dimen/media_bubble_default_dimens"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/message_bubble_top_padding"
+                    android:visibility="gone"/>
+
+                <ViewStub
+                    android:id="@+id/image_view_stub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_item_received_thumbnail" />
+
+                <ViewStub
+                    android:id="@+id/sticker_view_stub"
+                    android:layout_width="@dimen/media_bubble_sticker_dimens"
+                    android:layout_height="@dimen/media_bubble_sticker_dimens"
+                    android:layout="@layout/conversation_item_received_sticker" />
+
+                <ViewStub
+                    android:id="@+id/link_preview_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_item_received_link_preview" />
+
+                <ViewStub
+                    android:id="@+id/audio_view_stub"
+                    android:layout="@layout/conversation_item_received_audio"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+
+                <ViewStub
+                    android:id="@+id/document_view_stub"
+                    android:layout="@layout/conversation_item_received_document"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                    android:id="@+id/conversation_item_body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    style="@style/Signal.Text.Body"
                     android:textColor="?conversation_item_received_text_primary_color"
-                    android:textSize="@dimen/small_font_size"
+                    android:textColorLink="?conversation_item_received_text_primary_color"
+                    android:ellipsize="end"
+                    app:scaleEmojis="true"
+                    app:emoji_maxLength="1000"
+                    tools:text="Mango pickle lorem ipsum"/>
+
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
                     android:alpha="0.6"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    tools:visibility="visible"
-                    tools:text="+14152222222"/>
+                    app:footer_text_color="?conversation_item_received_text_secondary_color"
+                    app:footer_icon_color="?conversation_item_received_text_secondary_color"/>
 
-                <TextView
-                    android:id="@+id/group_message_sender_profile"
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_sticker_footer"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingStart="4sp"
-                    android:paddingEnd="4sp"
-                    style="@style/Signal.Text.Preview"
-                    android:fontFamily="sans-serif-regular"
-                    android:textColor="?conversation_item_received_text_primary_color"
-                    android:textStyle="italic"
-                    android:maxLines="1"
-                    android:ellipsize="end"
-                    tools:text="~Clement Duval"/>
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:visibility="gone"
+                    app:footer_text_color="?conversation_sticker_footer_text_color"
+                    app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
 
             </LinearLayout>
 
-            <org.thoughtcrime.securesms.components.QuoteView
-                android:id="@+id/quote_view"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/large_spacing"
-                android:layout_marginBottom="@dimen/medium_spacing"
-                android:layout_marginEnd="@dimen/large_spacing"
-                android:visibility="gone"
-                app:message_type="incoming"
-                app:quote_colorPrimary="@color/text"
-                app:quote_colorSecondary="@color/text"
-                tools:visibility="visible"/>
-
-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_received_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:visibility="gone"/>
-
-            <ViewStub
-                android:id="@+id/image_view_stub"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout="@layout/conversation_item_received_thumbnail" />
-
-            <ViewStub
-                android:id="@+id/sticker_view_stub"
-                android:layout_width="@dimen/media_bubble_sticker_dimens"
-                android:layout_height="@dimen/media_bubble_sticker_dimens"
-                android:layout="@layout/conversation_item_received_sticker" />
-
-            <ViewStub
-                android:id="@+id/link_preview_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout="@layout/conversation_item_received_link_preview" />
-
-            <ViewStub
-                android:id="@+id/audio_view_stub"
-                android:layout="@layout/conversation_item_received_audio"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="6dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
-
-            <ViewStub
-                android:id="@+id/document_view_stub"
-                android:layout="@layout/conversation_item_received_document"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                style="@style/Signal.Text.Body"
-                android:textColor="?conversation_item_received_text_primary_color"
-                android:textColorLink="?conversation_item_received_text_primary_color"
-                android:ellipsize="end"
-                app:scaleEmojis="true"
-                app:emoji_maxLength="1000"
-                tools:text="Mango pickle lorem ipsum"/>
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:alpha="0.6"
-                app:footer_text_color="?conversation_item_received_text_secondary_color"
-                app:footer_icon_color="?conversation_item_received_text_secondary_color"/>
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_sticker_footer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                android:visibility="gone"
-                app:footer_text_color="?conversation_sticker_footer_text_color"
-                app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
-
         </LinearLayout>
 
         <org.thoughtcrime.securesms.components.AlertView
@@ -210,4 +219,5 @@
             android:gravity="center_vertical"/>
 
     </RelativeLayout>
-</org.thoughtcrime.securesms.conversation.ConversationItem>
+
+</org.thoughtcrime.securesms.conversation.ConversationItem>
\ No newline at end of file
diff --git a/res/layout/conversation_item_sent.xml b/res/layout/conversation_item_sent.xml
index 87f39bbca6..60f032ea8a 100644
--- a/res/layout/conversation_item_sent.xml
+++ b/res/layout/conversation_item_sent.xml
@@ -23,134 +23,143 @@
         android:clipChildren="false">
 
         <LinearLayout
-            android:id="@+id/body_bubble"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="@dimen/massive_spacing"
-            android:paddingTop="@dimen/medium_spacing"
-            android:paddingBottom="@dimen/medium_spacing"
             android:layout_toStartOf="@+id/indicators_parent"
             android:layout_alignWithParentIfMissing="true"
-            android:layout_gravity="end"
             android:clipToPadding="false"
-            android:clipChildren="false"
-            android:background="@color/white"
-            tools:backgroundTint="@color/core_grey_05">
+            android:clipChildren="false">
 
-            <org.thoughtcrime.securesms.components.QuoteView
-                android:id="@+id/quote_view"
+            <LinearLayout
+                android:id="@+id/body_bubble"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/large_spacing"
-                android:layout_marginBottom="@dimen/medium_spacing"
-                android:layout_marginEnd="@dimen/large_spacing"
-                android:visibility="gone"
-                app:message_type="outgoing"
-                app:quote_colorPrimary="@color/text"
-                app:quote_colorSecondary="@color/text"
-                tools:visibility="visible"/>
-
-            <ViewStub
-                android:id="@+id/shared_contact_view_stub"
-                android:layout="@layout/conversation_item_sent_shared_contact"
-                android:layout_width="@dimen/media_bubble_default_dimens"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/medium_spacing"
-                android:visibility="gone"/>
-
-            <ViewStub
-                android:id="@+id/image_view_stub"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout="@layout/conversation_item_sent_thumbnail" />
-
-            <ViewStub
-                android:id="@+id/sticker_view_stub"
-                android:layout_width="@dimen/media_bubble_sticker_dimens"
-                android:layout_height="@dimen/media_bubble_sticker_dimens"
-                android:layout="@layout/conversation_item_sent_sticker" />
-
-            <ViewStub
-                android:id="@+id/link_preview_stub"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout="@layout/conversation_item_sent_link_preview" />
-
-            <ViewStub
-                android:id="@+id/audio_view_stub"
-                android:layout="@layout/conversation_item_sent_audio"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="6dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
-
-            <ViewStub
-                android:id="@+id/document_view_stub"
-                android:layout="@layout/conversation_item_sent_document"
-                android:layout_width="210dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="4dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                style="@style/Signal.Text.Body"
-                android:textColor="?conversation_item_sent_text_primary_color"
-                android:textColorLink="?conversation_item_sent_text_primary_color"
-                android:ellipsize="end"
-                app:scaleEmojis="true"
-                app:emoji_maxLength="1000"
-                tools:text="Mango pickle lorem ipsum"/>
-
-            <View
-                android:id="@+id/group_sender_holder"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"/>
-
-            <TextView
-                android:id="@+id/group_message_sender"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <TextView
-                android:id="@+id/group_message_sender_profile"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone" />
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:clipChildren="false"
+                android:orientation="vertical"
+                android:layout_marginStart="@dimen/massive_spacing"
+                android:paddingTop="@dimen/medium_spacing"
+                android:paddingBottom="@dimen/medium_spacing"
+                android:layout_gravity="end"
                 android:clipToPadding="false"
-                app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
-                app:footer_icon_color="?attr/conversation_item_sent_icon_color"/>
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_sticker_footer"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="6dp"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
                 android:clipChildren="false"
-                android:clipToPadding="false"
-                android:visibility="gone"
-                app:footer_text_color="?conversation_sticker_footer_text_color"
-                app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
+                android:background="@color/white"
+                tools:backgroundTint="@color/core_grey_05">
+
+                <org.thoughtcrime.securesms.components.QuoteView
+                    android:id="@+id/quote_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/large_spacing"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:layout_marginEnd="@dimen/large_spacing"
+                    android:visibility="gone"
+                    app:message_type="outgoing"
+                    app:quote_colorPrimary="@color/text"
+                    app:quote_colorSecondary="@color/text"
+                    tools:visibility="visible"/>
+
+                <ViewStub
+                    android:id="@+id/shared_contact_view_stub"
+                    android:layout="@layout/conversation_item_sent_shared_contact"
+                    android:layout_width="@dimen/media_bubble_default_dimens"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/medium_spacing"
+                    android:visibility="gone"/>
+
+                <ViewStub
+                    android:id="@+id/image_view_stub"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_item_sent_thumbnail" />
+
+                <ViewStub
+                    android:id="@+id/sticker_view_stub"
+                    android:layout_width="@dimen/media_bubble_sticker_dimens"
+                    android:layout_height="@dimen/media_bubble_sticker_dimens"
+                    android:layout="@layout/conversation_item_sent_sticker" />
+
+                <ViewStub
+                    android:id="@+id/link_preview_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout="@layout/conversation_item_sent_link_preview" />
+
+                <ViewStub
+                    android:id="@+id/audio_view_stub"
+                    android:layout="@layout/conversation_item_sent_audio"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="6dp"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+
+                <ViewStub
+                    android:id="@+id/document_view_stub"
+                    android:layout="@layout/conversation_item_sent_document"
+                    android:layout_width="210dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginBottom="4dp"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding" />
+
+                <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+                    android:id="@+id/conversation_item_body"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    style="@style/Signal.Text.Body"
+                    android:textColor="?conversation_item_sent_text_primary_color"
+                    android:textColorLink="?conversation_item_sent_text_primary_color"
+                    android:ellipsize="end"
+                    app:scaleEmojis="true"
+                    app:emoji_maxLength="1000"
+                    tools:text="Mango pickle lorem ipsum"/>
+
+                <View
+                    android:id="@+id/group_sender_holder"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone"/>
+
+                <TextView
+                    android:id="@+id/group_message_sender"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/group_message_sender_profile"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone" />
+
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
+                    app:footer_icon_color="?attr/conversation_item_sent_icon_color"/>
+
+                <org.thoughtcrime.securesms.components.ConversationItemFooter
+                    android:id="@+id/conversation_item_sticker_footer"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                    android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+                    android:clipChildren="false"
+                    android:clipToPadding="false"
+                    android:visibility="gone"
+                    app:footer_text_color="?conversation_sticker_footer_text_color"
+                    app:footer_icon_color="?conversation_sticker_footer_icon_color"/>
+
+            </LinearLayout>
 
         </LinearLayout>
 
@@ -166,4 +175,4 @@
 
     </RelativeLayout>
 
-</org.thoughtcrime.securesms.conversation.ConversationItem>
+</org.thoughtcrime.securesms.conversation.ConversationItem>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
index b7e74b8d1b..d9300166c8 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
@@ -547,6 +547,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
 
     DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this);
 
+    inputPanel.setHint("Message");
+
     updateSessionRestoreBanner();
 
     Log.i(TAG, "onResume() Finished: " + (System.currentTimeMillis() - getIntent().getLongExtra(TIMING_EXTRA, 0)));
diff --git a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 541e6ac900..fb56fbca52 100644
--- a/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/src/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -1053,12 +1053,6 @@ public class ConversationItem extends LinearLayout
     int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
     int spacingBottom = spacingTop;
 
-    boolean isOutgoingStack = current.isOutgoing() && previous.orNull() != null && previous.get().isOutgoing();
-
-    if (isOutgoingStack) {
-      spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
-    }
-
     if (isStartOfMessageCluster(current, previous, isGroupThread)) {
       spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
     }