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 bdb327bfb7..b84045a0eb 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;
@@ -727,14 +726,6 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       bodyText.setText(StringUtil.trim(styledText));
       bodyText.setVisibility(View.VISIBLE);
     }
-
-    if (!messageRecord.isOutgoing()) {
-      if (!messageRecord.isMms()) {
-        ViewUtil.setTopMargin(bodyText, readDimen(R.dimen.message_bubble_content_top_padding));
-      } else {
-        ViewUtil.setTopMargin(bodyText, readDimen(R.dimen.message_bubble_text_top_padding));
-      }
-    }
   }
 
   private void setMediaAttributes(@NonNull  MessageRecord                messageRecord,
@@ -1171,6 +1162,10 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
 
       if (mediaThumbnailStub.resolved()) {
         ViewUtil.setTopMargin(mediaThumbnailStub.get(), readDimen(R.dimen.message_bubble_top_padding));
+      } else if (startOfCluster && !current.isOutgoing() && groupThread) {
+        ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_quote_negative_margin));
+      } else {
+        ViewUtil.setTopMargin(quoteView, readDimen(R.dimen.message_bubble_top_padding));
       }
 
       if (linkPreviewStub.resolved() && !hasBigImageLinkPreview(current)) {
@@ -1181,13 +1176,8 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
         quoteView.dismiss();
       }
 
-      int topMargin = (current.isOutgoing() || !startOfCluster || !groupThread) ? 0 : readDimen(R.dimen.message_bubble_content_top_padding);
       if (mediaThumbnailStub.resolved()) {
-        ViewUtil.setTopMargin(mediaThumbnailStub.get(), topMargin);
-      }
-
-      if (linkPreviewStub.resolved()) {
-        ViewUtil.setTopMargin(linkPreviewStub.get(), topMargin);
+        ViewUtil.setTopMargin(mediaThumbnailStub.get(), 0);
       }
     }
   }
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 a71123c6db..49c3b639a8 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -73,6 +73,7 @@
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginBottom="4dp"
             android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="visible">
@@ -95,7 +96,7 @@
             android:id="@+id/quote_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
             android:layout_marginStart="6dp"
             android:layout_marginEnd="6dp"
             android:visibility="gone"
@@ -109,38 +110,34 @@
             android:layout_width="@dimen/media_bubble_default_dimens"
             android:layout_height="wrap_content"
             android:layout="@layout/conversation_item_received_shared_contact"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding"
+            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"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
+            android:layout="@layout/conversation_item_received_thumbnail" />
 
         <ViewStub
             android:id="@+id/sticker_view_stub"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout="@layout/conversation_item_received_sticker"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
+            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"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding" />
+            android:layout="@layout/conversation_item_received_link_preview" />
 
         <ViewStub
             android:id="@+id/audio_view_stub"
             android:layout_width="@dimen/message_audio_width"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="8dp"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:layout="@layout/conversation_item_received_audio" />
 
         <ViewStub
@@ -148,9 +145,8 @@
             android:layout_width="210dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:layout="@layout/conversation_item_received_document" />
 
         <ViewStub
@@ -158,42 +154,48 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="@dimen/message_bubble_content_top_padding"
-            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-            android:layout="@layout/conversation_item_received_revealable" />
-
-        <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_content_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_mode="incoming"
-            app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
-            app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
-            app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
+            android:layout="@layout/conversation_item_received_revealable" />
+
+        <LinearLayout
+            android:id="@+id/conversation_body_footer_container"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            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_content_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="-5dp"
+                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_mode="incoming"
+                app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
+                app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
+                app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
+        </LinearLayout>
 
         <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 15835698ef..a6c5a14fc9 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
@@ -72,6 +72,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/message_bubble_top_padding"
+            android:layout_marginBottom="-6dp"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:orientation="horizontal"
@@ -92,37 +93,45 @@
 
         </LinearLayout>
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/conversation_item_body"
-            style="@style/Signal.Text.Body"
+        <LinearLayout
+            android:id="@+id/conversation_body_footer_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="1dp"
-            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
-            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginEnd="@dimen/message_bubble_horizontal_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" />
+            android:orientation="vertical">
 
-        <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_mode="incoming"
-            app:footer_icon_color="@color/signal_icon_tint_secondary"
-            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
-            app:footer_text_color="@color/signal_text_secondary" />
+            <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_marginTop="@dimen/message_bubble_top_padding"
+                android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+                android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+                android:layout_marginEnd="@dimen/message_bubble_horizontal_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="-5dp"
+                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_mode="incoming"
+                app:footer_icon_color="@color/signal_icon_tint_secondary"
+                app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
+                app:footer_text_color="@color/signal_text_secondary" />
+
+        </LinearLayout>
 
         <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 0def05648c..608eb324c4 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -115,36 +115,44 @@
             android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
             android:layout="@layout/conversation_item_sent_revealable" />
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/conversation_item_body"
-            style="@style/Signal.Text.Body"
+        <LinearLayout
+            android:id="@+id/conversation_body_footer_container"
             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" />
+            android:orientation="vertical">
 
-        <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:clipChildren="false"
-            android:clipToPadding="false"
-            app:footer_mode="outgoing"
-            app:footer_icon_color="@color/signal_icon_tint_secondary"
-            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
-            app:footer_text_color="@color/signal_text_secondary" />
+            <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_mode="outgoing"
+                app:footer_icon_color="@color/signal_icon_tint_secondary"
+                app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
+                app:footer_text_color="@color/signal_text_secondary" />
+
+        </LinearLayout>
 
         <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 baf2a43bc8..d13bcc0a1a 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,36 +46,43 @@
         android:orientation="vertical"
         tools:backgroundTint="@color/core_grey_05">
 
-        <org.thoughtcrime.securesms.components.emoji.EmojiTextView
-            android:id="@+id/conversation_item_body"
-            style="@style/Signal.Text.Body"
+        <LinearLayout
+            android:id="@+id/conversation_body_footer_container"
             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" />
+            android:orientation="vertical">
 
-        <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:clipChildren="false"
-            android:clipToPadding="false"
-            app:footer_mode="outgoing"
-            app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
-            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.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_mode="outgoing"
+                app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
+                app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
+                app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
+        </LinearLayout>
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 5f0044b798..73244f5fe1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -40,6 +40,7 @@
     <dimen name="message_bubble_content_top_padding">4dp</dimen>
     <dimen name="message_bubble_top_padding_audio">12dp</dimen>
     <dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
+    <dimen name="message_bubble_quote_negative_margin">-3dp</dimen>
     <dimen name="message_bubble_edge_margin">32dp</dimen>
     <dimen name="message_bubble_bottom_padding">7dp</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>