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 b09799f26bd..02634faaa86 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -88,6 +88,7 @@
 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;
@@ -176,7 +177,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;
@@ -245,7 +245,6 @@ protected void onFinishInflate() {
 
     this.backgroundDrawable      = new ClipProjectionDrawable(Objects.requireNonNull(ContextCompat.getDrawable(getContext(),
                                                                                                                R.drawable.conversation_item_background)));
-    this.bodyFooterContainer     =                    findViewById(R.id.conversation_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);
@@ -783,7 +782,7 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
 
       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) {
@@ -811,13 +810,13 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
         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);
       } 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);
       }
 
@@ -846,7 +845,7 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
         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());
@@ -866,7 +865,7 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
       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);
 
       footer.setVisibility(VISIBLE);
@@ -895,7 +894,7 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
       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);
@@ -931,7 +930,7 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
 
       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);
@@ -960,16 +959,9 @@ private void setMediaAttributes(@NonNull  MessageRecord                messageRe
       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);
 
-      if (messageRecord.isMms() && !messageRecord.isOutgoing() && isGroupThread && !hasQuote(messageRecord)) {
-        boolean startOfCluster = isStartOfMessageCluster(messageRecord, previousRecord, isGroupThread);
-        int     margin         = startOfCluster ? readDimen(R.dimen.message_bubble_quote_negative_margin) : readDimen(R.dimen.message_bubble_top_padding);
-
-        ViewUtil.setTopMargin(bodyText, margin);
-      }
-
       footer.setVisibility(VISIBLE);
     }
   }
@@ -1132,7 +1124,6 @@ private void setStatusIcons(MessageRecord messageRecord, boolean hasWallpaper) {
   }
 
   private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageRecord> previous, @NonNull Optional<MessageRecord> next, boolean isGroupThread, @NonNull ChatColors chatColors) {
-    boolean startOfCluster = isStartOfMessageCluster(current, previous, isGroupThread);
     if (current.isMms() && !current.isMmsNotification() && ((MediaMmsMessageRecord)current).getQuote() != null) {
       if (quoteView == null) {
         throw new AssertionError();
@@ -1154,7 +1145,7 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR
 
       quoteView.setOnLongClickListener(passthroughClickListener);
 
-      if (startOfCluster) {
+      if (isStartOfMessageCluster(current, previous, isGroupThread)) {
         if (current.isOutgoing()) {
           quoteView.setTopCornerSizes(true, true);
         } else if (isGroupThread) {
@@ -1174,12 +1165,6 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR
         ViewUtil.setTopMargin(mediaThumbnailStub.require(), readDimen(R.dimen.message_bubble_top_padding));
       }
 
-      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)) {
         ViewUtil.setTopMargin(linkPreviewStub.get(), readDimen(R.dimen.message_bubble_top_padding));
       }
@@ -1191,6 +1176,10 @@ private void setQuote(@NonNull MessageRecord current, @NonNull Optional<MessageR
       if (mediaThumbnailStub.resolved()) {
         ViewUtil.setTopMargin(mediaThumbnailStub.require(), 0);
       }
+
+      if (linkPreviewStub.resolved()) {
+        ViewUtil.setTopMargin(linkPreviewStub.get(), 0);
+      }
     }
   }
 
diff --git a/app/src/main/res/drawable/ic_timer_00_12.xml b/app/src/main/res/drawable/ic_timer_00_12.xml
index e9b3f493faf..de6d32d21f6 100644
--- a/app/src/main/res/drawable/ic_timer_00_12.xml
+++ b/app/src/main/res/drawable/ic_timer_00_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.75,6a0.75,0.75 0,0 1,-1.5 0c0,-0.414 0.475,-3.581 0.5,-3.75S5.862,2 6,2s0.226,0.087 0.25,0.25S6.75,5.589 6.75,6ZM5.375,0.625A0.625,0.625 0,1 0,6 0,0.625 0.625,0 0,0 5.375,0.625ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM10.03,3.312a0.625,0.625 0,1 0,0.625 -0.624A0.626,0.626 0,0 0,10.03 3.312ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM8.063,1.345A0.625,0.625 0,1 0,8.688 0.72,0.624 0.624,0 0,0 8.063,1.345ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
+      android:pathData="M9.42,10.923a6.014,6.014 0,0 1,-0.865 0.5l-0.508,-0.88a4.959,4.959 0,0 0,0.866 -0.5ZM5.5,1.041a4.915,4.915 0,0 1,1 0L6.5,0.026a6.07,6.07 0,0 0,-1 0ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.923,2.579 L10.046,3.086a4.959,4.959 0,0 1,0.5 0.866l0.88,-0.508A6.014,6.014 0,0 0,10.923 2.58ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.042,1.463a5.008,5.008 0,0 1,0.866 0.5l0.513,-0.889a6.057,6.057 0,0 0,-0.866 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM1.464,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM6.25,2h-0.5l-0.5,4a0.75,0.75 0,0 0,1.5 0Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_05_12.xml b/app/src/main/res/drawable/ic_timer_05_12.xml
index 870a7788dca..b401c124a02 100644
--- a/app/src/main/res/drawable/ic_timer_05_12.xml
+++ b/app/src/main/res/drawable/ic_timer_05_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.65,6.375a0.75,0.75 0,0 1,-1.3 -0.75c0.208,-0.359 2.2,-2.864 2.308,-3a0.25,0.25 0,0 1,0.434 0.25C8.034,3.022 6.855,6.019 6.65,6.375ZM9.183,1.486A0.5,0.5 0,0 0,9 0.8,6 6,0 0,0 6,0 0.5,0.5 0,0 0,6 1a5,5 0,0 1,2.5 0.668,0.493 0.493,0 0,0 0.25,0.068A0.5,0.5 0,0 0,9.183 1.486ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM10.03,3.312a0.625,0.625 0,1 0,0.625 -0.624A0.626,0.626 0,0 0,10.03 3.312ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
+      android:pathData="M5.5,0.025A6,6 0,0 1,9.421 1.074l-0.513,0.889A4.972,4.972 0,0 0,5.5 1.041ZM10.536,8.042a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM8.913,10.042a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM10.544,3.949 L11.424,3.441a6.014,6.014 0,0 0,-0.5 -0.865l-0.877,0.507A4.959,4.959 0,0 1,10.544 3.953ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM1.954,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM2.581,1.076 L3.087,1.954a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM1.464,3.959a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM7.784,2.411 L5.351,5.625a0.75,0.75 0,0 0,1.3 0.75L8.216,2.661Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_10_12.xml b/app/src/main/res/drawable/ic_timer_10_12.xml
index 02d1679d6c1..83bfa773842 100644
--- a/app/src/main/res/drawable/ic_timer_10_12.xml
+++ b/app/src/main/res/drawable/ic_timer_10_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.375,6.65a0.75,0.75 0,0 1,-0.75 -1.3c0.359,-0.207 3.339,-1.379 3.5,-1.442A0.245,0.245 0,0 1,9.464 4a0.25,0.25 0,0 1,-0.091 0.342C9.251,4.439 6.731,6.444 6.375,6.65ZM11.014,3.682A0.5,0.5 0,0 0,11.2 3,6.021 6.021,0 0,0 6,0 0.5,0.5 0,0 0,6 1a5.021,5.021 0,0 1,4.331 2.5,0.5 0.5,0 0,0 0.433,0.25A0.49,0.49 0,0 0,11.014 3.682ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM10.75,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.75 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
+      android:pathData="M1.041,6.5L0.025,6.5a6.07,6.07 0,0 1,0 -1L1.04,5.5A4.915,4.915 0,0 0,1.041 6.5ZM5.5,1.041a4.988,4.988 0,0 1,5.044 2.912l0.88,-0.508A6,6 0,0 0,5.5 0.025ZM10.536,8.041a4.966,4.966 0,0 1,-0.5 0.866l0.889,0.513a6,6 0,0 0,0.5 -0.866ZM10.96,6.5h1.014a6.07,6.07 0,0 0,0 -1L10.959,5.5A4.915,4.915 0,0 1,10.96 6.5ZM8.913,10.046a4.959,4.959 0,0 1,-0.866 0.5l0.508,0.88a6.014,6.014 0,0 0,0.865 -0.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM1.958,8.913a4.959,4.959 0,0 1,-0.5 -0.866l-0.88,0.508a6.014,6.014 0,0 0,0.5 0.865ZM1.468,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM9.343,3.784L5.625,5.35a0.75,0.75 0,0 0,0.75 1.3L9.589,4.216Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_15_12.xml b/app/src/main/res/drawable/ic_timer_15_12.xml
index 96a25caac61..55b412926cb 100644
--- a/app/src/main/res/drawable/ic_timer_15_12.xml
+++ b/app/src/main/res/drawable/ic_timer_15_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6,6.75a0.75,0.75 0,0 1,0 -1.5c0.414,0 3.581,0.475 3.75,0.5S10,5.862 10,6s-0.087,0.226 -0.25,0.25S6.411,6.75 6,6.75ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5.006,5.006 0,0 1,5 5,0.5 0.5,0 0,0 1,0ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655ZM10.03,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,10.03 8.687Z"/>
+      android:pathData="M1.05,6.5h-1a5.963,5.963 0,0 1,0 -1h1A5.063,5.063 0,0 0,1.05 6.5ZM10.545,8.047a4.907,4.907 0,0 1,-0.5 0.865l0.874,0.5a5.94,5.94 0,0 0,0.491 -0.87ZM5.5,1.05A4.932,4.932 0,0 1,10.95 6.5h1A5.924,5.924 0,0 0,5.5 0.048ZM9.416,10.918 L8.916,10.044a4.907,4.907 0,0 1,-0.865 0.5l0.5,0.864A5.889,5.889 0,0 0,9.416 10.918ZM3.953,10.545a4.846,4.846 0,0 1,-0.865 -0.5l-0.5,0.874a5.94,5.94 0,0 0,0.87 0.491ZM6.5,10.945a5.063,5.063 0,0 1,-1 0v1a5.963,5.963 0,0 0,1 0ZM2.584,1.082l0.5,0.873a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM1.956,8.912a4.907,4.907 0,0 1,-0.5 -0.865l-0.864,0.5a5.94,5.94 0,0 0,0.491 0.87ZM1.456,3.953a4.907,4.907 0,0 1,0.5 -0.865l-0.874,-0.5a5.94,5.94 0,0 0,-0.491 0.87ZM6,5.25a0.75,0.75 0,0 0,0 1.5l4,-0.5v-0.5Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_20_12.xml b/app/src/main/res/drawable/ic_timer_20_12.xml
index 4e825b8c1f6..9f985f5b273 100644
--- a/app/src/main/res/drawable/ic_timer_20_12.xml
+++ b/app/src/main/res/drawable/ic_timer_20_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M5.625,6.65a0.75,0.75 0,0 1,0.75 -1.3c0.359,0.208 2.864,2.2 3,2.308a0.25,0.25 0,0 1,-0.25 0.434C8.978,8.034 5.981,6.855 5.625,6.65ZM11.2,9A6,6 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5,5 0,0 1,4.331 7.5A0.5,0.5 0,0 0,11.2 9ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM8.062,10.655a0.625,0.625 0,1 0,0.626 -0.625A0.625,0.625 0,0 0,8.062 10.655ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655Z"/>
+      android:pathData="M5.5,0.026A5.986,5.986 0,0 1,10.923 9.42l-0.877,-0.507A4.965,4.965 0,0 0,5.5 1.04ZM2.58,10.926a6.014,6.014 0,0 0,0.865 0.5l0.508,-0.88a4.959,4.959 0,0 1,-0.866 -0.5ZM1.041,5.5L0.025,5.5a6.07,6.07 0,0 0,0 1L1.04,6.5A4.915,4.915 0,0 1,1.041 5.5ZM9.421,10.926 L8.908,10.037a4.966,4.966 0,0 1,-0.866 0.5l0.513,0.889A6,6 0,0 0,9.421 10.926ZM6.5,10.96a4.915,4.915 0,0 1,-1 0v1.016a6.07,6.07 0,0 0,1 0ZM2.579,1.074l0.513,0.889a5.008,5.008 0,0 1,0.866 -0.5L3.445,0.575A6.057,6.057 0,0 0,2.579 1.074ZM1.963,8.908a4.966,4.966 0,0 1,-0.5 -0.866l-0.889,0.513a6,6 0,0 0,0.5 0.866ZM1.456,3.953a4.959,4.959 0,0 1,0.5 -0.866L1.077,2.58a6.014,6.014 0,0 0,-0.5 0.865ZM6.375,5.353a0.75,0.75 0,0 0,-0.75 1.3L9.339,8.216l0.25,-0.432Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_25_12.xml b/app/src/main/res/drawable/ic_timer_25_12.xml
index 175416e6fad..7628fab7911 100644
--- a/app/src/main/res/drawable/ic_timer_25_12.xml
+++ b/app/src/main/res/drawable/ic_timer_25_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M5.35,6.375a0.75,0.75 0,0 1,1.3 -0.75c0.207,0.359 1.379,3.339 1.442,3.5A0.245,0.245 0,0 1,8 9.464a0.25,0.25 0,0 1,-0.342 -0.091C7.561,9.251 5.556,6.731 5.35,6.375ZM9,11.2A6,6 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5,5 0,0 1,2.5 9.332A0.5,0.5 0,1 0,9 11.2ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM5.375,11.375A0.625,0.625 0,1 0,6 10.75,0.625 0.625,0 0,0 5.375,11.375ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655Z"/>
+      android:pathData="M1.077,9.42a6.014,6.014 0,0 1,-0.5 -0.865l0.88,-0.508a4.959,4.959 0,0 0,0.5 0.866ZM1.464,3.958a4.966,4.966 0,0 1,0.5 -0.866l-0.889,-0.513a6,6 0,0 0,-0.5 0.866ZM1.04,5.5L0.026,5.5a6.07,6.07 0,0 0,0 1L1.041,6.5A4.915,4.915 0,0 1,1.04 5.5ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM3.958,10.536a4.966,4.966 0,0 1,-0.866 -0.5l-0.513,0.889a6,6 0,0 0,0.866 0.5ZM11.8,4.447A6,6 0,0 0,5.5 0.025L5.5,1.041a4.981,4.981 0,0 1,2.547 9.5l0.508,0.88A6,6 0,0 0,11.8 4.447ZM6.5,10.959a4.915,4.915 0,0 1,-1 0v1.014a6.07,6.07 0,0 0,1 0ZM6.65,5.625a0.75,0.75 0,1 0,-1.3 0.75L7.784,9.589l0.432,-0.25Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_30_12.xml b/app/src/main/res/drawable/ic_timer_30_12.xml
index 1f239641f3b..13639f7f84f 100644
--- a/app/src/main/res/drawable/ic_timer_30_12.xml
+++ b/app/src/main/res/drawable/ic_timer_30_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M5.25,6a0.75,0.75 0,0 1,1.5 0c0,0.414 -0.475,3.581 -0.5,3.75S6.138,10 6,10s-0.226,-0.087 -0.25,-0.25S5.25,6.411 5.25,6ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1 5,5 0,0 1,6 11a0.5,0.5 0,0 0,0 1A6.006,6.006 0,0 0,12 6ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM2.688,10.655a0.625,0.625 0,1 0,0.625 -0.625A0.624,0.624 0,0 0,2.688 10.655Z"/>
+      android:pathData="M1.05,6.5h-1a5.963,5.963 0,0 1,0 -1h1A5.063,5.063 0,0 0,1.05 6.5ZM1.956,8.912a4.907,4.907 0,0 1,-0.5 -0.865l-0.864,0.5a5.94,5.94 0,0 0,0.491 0.87ZM1.456,3.953a4.907,4.907 0,0 1,0.5 -0.865l-0.874,-0.5a5.94,5.94 0,0 0,-0.491 0.87ZM10.244,1.753A5.962,5.962 0,0 0,5.5 0.048v1a4.978,4.978 0,1 1,0 9.9v1A5.976,5.976 0,0 0,10.243 1.757ZM2.584,1.082l0.5,0.873a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM3.953,10.545a4.907,4.907 0,0 1,-0.865 -0.5l-0.5,0.874a5.94,5.94 0,0 0,0.87 0.491ZM6,5.25A0.75,0.75 0,0 0,5.25 6l0.5,4h0.5l0.5,-4A0.75,0.75 0,0 0,6 5.25Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_35_12.xml b/app/src/main/res/drawable/ic_timer_35_12.xml
index af28919fd3e..ff02bad9b40 100644
--- a/app/src/main/res/drawable/ic_timer_35_12.xml
+++ b/app/src/main/res/drawable/ic_timer_35_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M5.35,5.625a0.75,0.75 0,1 1,1.3 0.75c-0.208,0.359 -2.2,2.864 -2.308,3a0.25,0.25 0,0 1,-0.434 -0.25C3.966,8.978 5.145,5.981 5.35,5.625ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5,5 0,1 1,-2.5 9.332A0.5,0.5 0,1 0,3 11.2,6 6,0 0,0 12,6ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,8.687a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 8.687ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312Z"/>
+      android:pathData="M1.04,6.5L0.026,6.5a6.07,6.07 0,0 1,0 -1L1.041,5.5A4.915,4.915 0,0 0,1.04 6.5ZM0.576,3.445l0.88,0.508a4.959,4.959 0,0 1,0.5 -0.866L1.077,2.58A6.014,6.014 0,0 0,0.576 3.445ZM0.576,8.555a6,6 0,0 0,0.5 0.866l0.889,-0.513a4.966,4.966 0,0 1,-0.5 -0.866ZM2.576,1.074 L3.089,1.963a5.008,5.008 0,0 1,0.866 -0.5L3.445,0.575A6.057,6.057 0,0 0,2.579 1.074ZM7.553,0.2A6,6 0,0 0,5.5 0.026L5.5,1.04a4.994,4.994 0,1 1,-0.794 9.79,4.961 4.961,0 0,1 -1.619,-0.784l-0.507,0.877A6,6 0,1 0,7.553 0.2ZM6.375,5.35a0.751,0.751 0,0 0,-1.025 0.275L3.784,9.339l0.432,0.25L6.65,6.375A0.751,0.751 0,0 0,6.375 5.35Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_40_12.xml b/app/src/main/res/drawable/ic_timer_40_12.xml
index bbf1ba66e98..4cbcac258bf 100644
--- a/app/src/main/res/drawable/ic_timer_40_12.xml
+++ b/app/src/main/res/drawable/ic_timer_40_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M5.625,5.35a0.75,0.75 0,1 1,0.75 1.3c-0.359,0.207 -3.339,1.379 -3.5,1.442A0.245,0.245 0,0 1,2.536 8a0.25,0.25 0,0 1,0.091 -0.342C2.749,7.561 5.269,5.556 5.625,5.35ZM0,6a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0 6ZM2.688,1.345A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1 5,5 0,1 1,1.669 8.5,0.5 0.5,0 0,0 0.8,9 6,6 0,0 0,12 6Z"/>
+      android:pathData="M1.074,2.579l0.889,0.513a5.035,5.035 0,0 0,-0.5 0.866L0.575,3.445A6,6 0,0 1,1.074 2.579ZM0.026,5.5a6.07,6.07 0,0 0,0 1H1.041a4.915,4.915 0,0 1,0 -1ZM11.8,4.447A6,6 0,0 0,5.5 0.025V1.041A4.991,4.991 0,1 1,1.456 8.047l-0.88,0.508A6,6 0,0 0,11.8 4.447ZM2.581,1.076l0.506,0.878a4.959,4.959 0,0 1,0.866 -0.5L3.446,0.576A5.994,5.994 0,0 0,2.581 1.076ZM6.65,5.625A0.751,0.751 0,0 0,5.625 5.35L2.411,7.784l0.25,0.432L6.375,6.649A0.749,0.749 0,0 0,6.65 5.625Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_45_12.xml b/app/src/main/res/drawable/ic_timer_45_12.xml
index 259ac80c2f3..9e868025a22 100644
--- a/app/src/main/res/drawable/ic_timer_45_12.xml
+++ b/app/src/main/res/drawable/ic_timer_45_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6,5.25a0.75,0.75 0,0 1,0 1.5c-0.414,0 -3.581,-0.475 -3.75,-0.5S2,6.138 2,6s0.087,-0.226 0.25,-0.25S5.589,5.25 6,5.25ZM2.688,1.35A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM0.72,3.312a0.625,0.625 0,1 0,0.625 -0.625A0.625,0.625 0,0 0,0.72 3.312ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1 5,5 0,1 1,1 6,0.5 0.5,0 0,0 0,6 6,6 0,0 0,12 6Z"/>
+      android:pathData="M1.082,2.584l0.874,0.5a4.907,4.907 0,0 0,-0.5 0.865l-0.864,-0.5A5.94,5.94 0,0 1,1.082 2.584ZM2.582,1.084 L3.082,1.957a4.97,4.97 0,0 1,0.865 -0.5l-0.5,-0.863A5.94,5.94 0,0 0,2.584 1.082ZM10.241,1.759A5.962,5.962 0,0 0,5.5 0.048v1A5,5 0,1 1,1.05 5.5h-1a5.989,5.989 0,1 0,10.2 -3.743ZM6,5.25l-4,0.5v0.5l4,0.5a0.75,0.75 0,0 0,0 -1.5Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_50_12.xml b/app/src/main/res/drawable/ic_timer_50_12.xml
index 0c077d60ea4..00bf75c4ec0 100644
--- a/app/src/main/res/drawable/ic_timer_50_12.xml
+++ b/app/src/main/res/drawable/ic_timer_50_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.375,5.35a0.75,0.75 0,1 1,-0.75 1.3c-0.359,-0.208 -2.864,-2.2 -3,-2.308a0.25,0.25 0,0 1,0.25 -0.434C3.022,3.966 6.019,5.145 6.375,5.35ZM2.688,1.35A0.625,0.625 0,1 0,3.313 0.72,0.624 0.624,0 0,0 2.688,1.345ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1 5,5 0,1 1,1.669 3.5,0.5 0.5,0 1,0 0.8,3 6,6 0,1 0,12 6Z"/>
+      android:pathData="M3.445,0.575l0.513,0.888a5.008,5.008 0,0 0,-0.866 0.5l-0.513,-0.889A6.057,6.057 0,0 1,3.445 0.575ZM7.553,0.2A6,6 0,0 0,5.5 0.026V1.04A4.991,4.991 0,1 1,1.17 4.706a4.961,4.961 0,0 1,0.784 -1.619L1.077,2.58A6,6 0,1 0,7.553 0.2ZM6.375,5.35 L2.661,3.784l-0.25,0.432L5.625,6.649a0.75,0.75 0,1 0,0.75 -1.3Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_55_12.xml b/app/src/main/res/drawable/ic_timer_55_12.xml
index d73255ded6a..bb66f6a4d1a 100644
--- a/app/src/main/res/drawable/ic_timer_55_12.xml
+++ b/app/src/main/res/drawable/ic_timer_55_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.65,5.625a0.75,0.75 0,0 1,-1.3 0.75c-0.207,-0.359 -1.379,-3.339 -1.442,-3.5A0.245,0.245 0,0 1,4 2.536a0.25,0.25 0,0 1,0.342 0.091C4.439,2.749 6.444,5.269 6.65,5.625ZM12,6A6.006,6.006 0,0 0,6 0,0.5 0.5,0 0,0 6,1a5,5 0,1 1,-2.5 0.668A0.5,0.5 0,1 0,3 0.8,6 6,0 1,0 12,6Z"/>
+      android:pathData="M11.2,9A6,6 0,1 1,3.445 0.575l0.507,0.879A4.989,4.989 0,1 0,8.5 1.67a4.958,4.958 0,0 0,-3 -0.631V0.024A6,6 0,0 1,11.2 9ZM6.65,5.625 L4.216,2.411l-0.432,0.25L5.35,6.375a0.75,0.75 0,0 0,1.3 -0.75Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_timer_60_12.xml b/app/src/main/res/drawable/ic_timer_60_12.xml
index 60db4495c61..57d3316994c 100644
--- a/app/src/main/res/drawable/ic_timer_60_12.xml
+++ b/app/src/main/res/drawable/ic_timer_60_12.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:fillColor="#FFFFFFFF"
-      android:pathData="M6.75,6a0.75,0.75 0,0 1,-1.5 0c0,-0.414 0.475,-3.581 0.5,-3.75S5.862,2 6,2s0.226,0.087 0.25,0.25S6.75,5.589 6.75,6ZM12,6a6,6 0,1 0,-6 6A6.006,6.006 0,0 0,12 6ZM11,6A5,5 0,1 1,6 1,5.006 5.006,0 0,1 11,6Z"/>
+      android:pathData="M6,1A5,5 0,1 1,1 6,5.006 5.006,0 0,1 6,1M6,0a6,6 0,1 0,6 6A6,6 0,0 0,6 0ZM6.25,2h-0.5l-0.5,4a0.75,0.75 0,0 0,1.5 0Z"/>
 </vector>
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 6c462c8f457..12a11673441 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -70,19 +70,21 @@
             android:id="@+id/group_sender_holder"
             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"
-            android:layout_marginTop="@dimen/message_bubble_top_padding"
-            android:layout_marginBottom="4dp"
+            android:layout_marginTop="3dp"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp"
+            android:paddingStart="@dimen/message_bubble_horizontal_padding"
+            android:paddingEnd="@dimen/message_bubble_horizontal_padding"
             android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="visible">
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/group_message_sender"
-                style="@style/TextAppearance.Signal.Subtitle"
+                style="@style/Signal.Text.Preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="4sp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textColor="@color/signal_text_primary"
@@ -96,8 +98,8 @@
             android:id="@+id/quote_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/message_bubble_top_padding"
             android:layout_marginStart="6dp"
+            android:layout_marginTop="@dimen/message_bubble_top_padding"
             android:layout_marginEnd="6dp"
             android:visibility="gone"
             app:message_type="incoming"
@@ -109,8 +111,8 @@
             android:id="@+id/shared_contact_view_stub"
             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_top_padding"
+            android:layout="@layout/conversation_item_received_shared_contact"
             android:visibility="gone" />
 
         <ViewStub
@@ -136,8 +138,9 @@
             android:layout_width="@dimen/message_audio_width"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="@dimen/message_bubble_top_padding_audio"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
+            android:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
             android:layout="@layout/conversation_item_received_audio" />
 
         <ViewStub
@@ -145,8 +148,9 @@
             android:layout_width="210dp"
             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:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
             android:layout="@layout/conversation_item_received_document" />
 
         <ViewStub
@@ -154,50 +158,42 @@
             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:layout_marginBottom="@dimen/message_bubble_collapsed_footer_padding"
             android:layout="@layout/conversation_item_received_revealable" />
 
-        <LinearLayout
-            android:id="@+id/conversation_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:orientation="vertical"
-            android:clipChildren="false"
-            android:clipToPadding="false">
+            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.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="-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_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" />
 
         <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 1da12477220..02523b5bc31 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
@@ -27,8 +27,7 @@
             android:id="@+id/reply_icon"
             android:layout_width="@dimen/conversation_item_reply_size"
             android:layout_height="@dimen/conversation_item_reply_size"
-            android:paddingStart="9dp"
-            android:paddingEnd="9dp"
+            android:padding="9dp"
             android:tint="@color/signal_icon_tint_primary"
             android:layout_gravity="center"
             app:srcCompat="@drawable/ic_reply_24" />
@@ -71,19 +70,21 @@
             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="-6dp"
-            android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginTop="3dp"
+            android:paddingTop="3dp"
+            android:paddingBottom="3dp"
+            android:paddingStart="@dimen/message_bubble_horizontal_padding"
+            android:paddingEnd="@dimen/message_bubble_horizontal_padding"
             android:orientation="horizontal"
             android:visibility="gone"
             tools:visibility="visible">
 
             <org.thoughtcrime.securesms.components.emoji.EmojiTextView
                 android:id="@+id/group_message_sender"
-                style="@style/TextAppearance.Signal.Subtitle"
+                style="@style/Signal.Text.Preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="4sp"
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:textColor="@color/signal_text_primary"
@@ -93,54 +94,44 @@
 
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/conversation_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:orientation="vertical"
-            android:clipChildren="false"
-            android:clipToPadding="false">
-
-            <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" />
+            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" />
 
-        </LinearLayout>
+        <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.ConversationItemFooter
             android:id="@+id/conversation_item_sticker_footer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/message_bubble_horizontal_padding"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
             android:clipChildren="false"
             android:clipToPadding="false"
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 b3f6566930e..0def05648cb 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_collapsed_footer_padding"
             android:layout="@layout/conversation_item_sent_revealable" />
 
-        <LinearLayout
-            android:id="@+id/conversation_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:orientation="vertical"
+            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="-4dp"
+            android:layout_marginEnd="@dimen/message_bubble_horizontal_padding"
+            android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
             android:clipChildren="false"
-            android:clipToPadding="false">
-
-            <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>
+            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.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 440beaddc33..baf2a43bc8c 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,45 +46,36 @@
         android:orientation="vertical"
         tools:backgroundTint="@color/core_grey_05">
 
-        <LinearLayout
-            android:id="@+id/conversation_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:orientation="vertical"
-            android:clipChildren="false"
-            android:clipToPadding="false">
-
-            <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" />
+            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_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_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.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 73244f5fe1f..081ef0dafd8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -35,14 +35,11 @@
     <dimen name="message_bubble_corner_radius">2dp</dimen>
     <dimen name="message_bubble_shadow_distance">1.5dp</dimen>
     <dimen name="message_bubble_horizontal_padding">12dp</dimen>
-    <dimen name="message_bubble_top_padding">7dp</dimen>
-    <dimen name="message_bubble_text_top_padding">1dp</dimen>
-    <dimen name="message_bubble_content_top_padding">4dp</dimen>
+    <dimen name="message_bubble_top_padding">6dp</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="message_bubble_bottom_padding">8dp</dimen>
     <dimen name="media_bubble_remove_button_size">24dp</dimen>
     <dimen name="media_bubble_edit_button_size">24dp</dimen>
     <dimen name="media_bubble_default_dimens">210dp</dimen>