diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index 8070c1e42f..e6283959e1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -25,7 +25,6 @@ import com.airbnb.lottie.LottieProperty;
 import com.airbnb.lottie.model.KeyPath;
 
 import org.signal.core.util.concurrent.SignalExecutors;
-import org.signal.core.util.logging.Log;
 import org.thoughtcrime.securesms.R;
 import org.thoughtcrime.securesms.animation.AnimationCompleteListener;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index 02e6ee3b41..b31a879a6b 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -88,7 +88,6 @@ import org.thoughtcrime.securesms.conversation.colors.Colorizer;
 import org.thoughtcrime.securesms.database.AttachmentDatabase;
 import org.thoughtcrime.securesms.database.DatabaseFactory;
 import org.thoughtcrime.securesms.database.MessageDatabase;
-import org.thoughtcrime.securesms.database.documents.IdentityKeyMismatch;
 import org.thoughtcrime.securesms.database.model.MediaMmsMessageRecord;
 import org.thoughtcrime.securesms.database.model.MessageRecord;
 import org.thoughtcrime.securesms.database.model.MmsMessageRecord;
@@ -177,7 +176,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
             protected View                       replyIcon;
   @Nullable protected ViewGroup                  contactPhotoHolder;
   @Nullable private   QuoteView                  quoteView;
-            private   ViewGroup                  bodyFooterContainer;
             private   EmojiTextView              bodyText;
             private   ConversationItemFooter     footer;
             private   ConversationItemFooter     stickerFooter;
@@ -246,7 +244,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
     this.backgroundDrawable      = new ClipProjectionDrawable(Objects.requireNonNull(ContextCompat.getDrawable(getContext(),
                                                                                                                R.drawable.conversation_item_background)));
-    this.bodyFooterContainer     =                    findViewById(R.id.conversation_item_body_footer_container);
     this.bodyText                =                    findViewById(R.id.conversation_item_body);
     this.footer                  =                    findViewById(R.id.conversation_item_footer);
     this.stickerFooter           =                    findViewById(R.id.conversation_item_sticker_footer);
@@ -787,7 +784,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
       setSharedContactCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       footer.setVisibility(GONE);
     } else if (hasLinkPreview(messageRecord) && messageRequestAccepted) {
@@ -815,14 +812,14 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
         setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
         setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, true);
 
-        ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         ViewUtil.setTopMargin(linkPreviewStub.get(), 0);
       } else {
         linkPreviewStub.get().setLinkPreview(glideRequests, linkPreview, true);
         linkPreviewStub.get().setDownloadClickedListener(downloadClickListener);
         setLinkPreviewCorners(messageRecord, previousRecord, nextRecord, isGroupThread, false);
-        ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+        ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
         //noinspection ConstantConditions
@@ -854,7 +851,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
         Log.w(TAG, "setMediaAttributes: could not register listener for audio slide " + audioViewStub.get().getAudioSlideUri());
       }
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setPlaybackSpeedListener(new AudioPlaybackSpeedToggleListener());
@@ -874,7 +871,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       documentViewStub.get().setDownloadClickListener(singleDownloadClickListener);
       documentViewStub.get().setOnLongClickListener(passthroughClickListener);
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.setTopMargin(bodyText, 0);
 
@@ -904,7 +901,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       stickerStub.get().setOnLongClickListener(passthroughClickListener);
       stickerStub.get().setOnClickListener(passthroughClickListener);
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setVisibility(VISIBLE);
@@ -940,7 +937,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
       setThumbnailCorners(messageRecord, previousRecord, nextRecord, isGroupThread);
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setVisibility(VISIBLE);
@@ -969,7 +966,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       if (stickerStub.resolved())        stickerStub.get().setVisibility(View.GONE);
       if (revealableStub.resolved())     revealableStub.get().setVisibility(View.GONE);
 
-      ViewUtil.updateLayoutParams(bodyFooterContainer, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+      ViewUtil.updateLayoutParams(bodyText, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
       ViewUtil.updateLayoutParamsIfNonNull(groupSenderHolder, ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
 
       footer.setVisibility(VISIBLE);
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 8ea41046a4..b636d6d651 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -163,46 +163,38 @@
             android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:layout="@layout/conversation_item_received_revealable" />
 
-        <LinearLayout
-            android:id="@+id/conversation_item_body_footer_container"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/conversation_item_body"
+            style="@style/Signal.Text.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:ellipsize="end"
+            android:textColor="@color/signal_text_primary"
+            android:textColorLink="@color/signal_text_primary"
+            app:emoji_maxLength="1000"
+            app:scaleEmojis="true"
+            tools:text="Mango pickle lorem ipsum" />
+
+        <org.thoughtcrime.securesms.components.ConversationItemFooter
+            android:id="@+id/conversation_item_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="-4dp"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:layout_gravity="end"
+            android:alpha="0.7"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                style="@style/Signal.Text.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:ellipsize="end"
-                android:textColor="@color/signal_text_primary"
-                android:textColorLink="@color/signal_text_primary"
-                app:emoji_maxLength="1000"
-                app:scaleEmojis="true"
-                tools:text="Mango pickle lorem ipsum" />
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="-4dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:alpha="0.7"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
-                app:footer_mode="incoming"
-                app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
-                app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
-        </LinearLayout>
+            app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
+            app:footer_mode="incoming"
+            app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
+            app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index 9cbb32f0a6..74bd74775f 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -93,47 +93,37 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/conversation_item_body_footer_container"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/conversation_item_body"
+            style="@style/Signal.Text.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+            android:ellipsize="end"
+            android:textColor="@color/signal_text_primary"
+            android:textColorLink="@color/signal_text_primary"
+            app:emoji_maxLength="1000"
+            app:scaleEmojis="true"
+            tools:text="Mango pickle lorem ipsum" />
+
+        <org.thoughtcrime.securesms.components.ConversationItemFooter
+            android:id="@+id/conversation_item_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="-4dp"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:alpha="0.7"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                style="@style/Signal.Text.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:ellipsize="end"
-                android:textColor="@color/signal_text_primary"
-                android:textColorLink="@color/signal_text_primary"
-                app:emoji_maxLength="1000"
-                app:scaleEmojis="true"
-                tools:text="Mango pickle lorem ipsum" />
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="-4dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:alpha="0.7"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                app:footer_icon_color="@color/signal_icon_tint_secondary"
-                app:footer_mode="incoming"
-                app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
-                app:footer_text_color="@color/signal_text_secondary" />
-
-        </LinearLayout>
+            app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_mode="incoming"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
+            app:footer_text_color="@color/signal_text_secondary" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"
diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
index 2babb8c01e..7dd8cc3266 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -115,46 +115,36 @@
             android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:layout="@layout/conversation_item_sent_revealable" />
 
-        <LinearLayout
-            android:id="@+id/conversation_item_body_footer_container"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/conversation_item_body"
+            style="@style/Signal.Text.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:ellipsize="end"
+            android:textColor="@color/conversation_item_sent_text_primary_color"
+            android:textColorLink="@color/conversation_item_sent_text_primary_color"
+            app:emoji_maxLength="1000"
+            app:scaleEmojis="true"
+            tools:text="Mango pickle lorem ipsum" />
+
+        <org.thoughtcrime.securesms.components.ConversationItemFooter
+            android:id="@+id/conversation_item_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="-5dp"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                style="@style/Signal.Text.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:ellipsize="end"
-                android:textColor="@color/conversation_item_sent_text_primary_color"
-                android:textColorLink="@color/conversation_item_sent_text_primary_color"
-                app:emoji_maxLength="1000"
-                app:scaleEmojis="true"
-                tools:text="Mango pickle lorem ipsum" />
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="-5dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                app:footer_icon_color="@color/signal_icon_tint_secondary"
-                app:footer_mode="outgoing"
-                app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
-                app:footer_text_color="@color/signal_text_secondary" />
-
-        </LinearLayout>
+            app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_mode="outgoing"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
+            app:footer_text_color="@color/signal_text_secondary" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"
diff --git a/app/src/main/res/layout/conversation_item_sent_text_only.xml b/app/src/main/res/layout/conversation_item_sent_text_only.xml
index 67471a2921..9457fa27f7 100644
--- a/app/src/main/res/layout/conversation_item_sent_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_sent_text_only.xml
@@ -46,46 +46,37 @@
         android:orientation="vertical"
         tools:backgroundTint="@color/core_grey_05">
 
-        <LinearLayout
-            android:id="@+id/conversation_item_body_footer_container"
+        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
+            android:id="@+id/conversation_item_body"
+            style="@style/Signal.Text.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+            android:ellipsize="end"
+            android:textColor="@color/conversation_item_sent_text_primary_color"
+            android:textColorLink="@color/conversation_item_sent_text_primary_color"
+            app:emoji_maxLength="1000"
+            app:scaleEmojis="true"
+            tools:text="Mango pickle lorem ipsum" />
+
+        <org.thoughtcrime.securesms.components.ConversationItemFooter
+            android:id="@+id/conversation_item_footer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="-5dp"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:layout_gravity="end"
             android:clipChildren="false"
             android:clipToPadding="false"
-            android:orientation="vertical">
-
-            <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-                android:id="@+id/conversation_item_body"
-                style="@style/Signal.Text.Body"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="@dimen/message_bubble_top_padding"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-                android:ellipsize="end"
-                android:textColor="@color/conversation_item_sent_text_primary_color"
-                android:textColorLink="@color/conversation_item_sent_text_primary_color"
-                app:emoji_maxLength="1000"
-                app:scaleEmojis="true"
-                tools:text="Mango pickle lorem ipsum" />
-
-            <org.thoughtcrime.securesms.components.ConversationItemFooter
-                android:id="@+id/conversation_item_footer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginTop="-5dp"
-                android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
-                android:clipChildren="false"
-                android:clipToPadding="false"
-                app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
-                app:footer_mode="outgoing"
-                app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
-                app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
-
-        </LinearLayout>
+            app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
+            app:footer_mode="outgoing"
+            app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
+            app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"