diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index bcc3a24d5..e9c3c2b1e 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -633,7 +633,7 @@ NS_ASSUME_NONNULL_BEGIN
 
 - (CGFloat)quotedReplyTopMargin
 {
-    return 22.f;
+    return 16.f;
 }
 
 - (nullable LinkPreviewSent *)linkPreviewState
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index 62493bc4b..c0fe4d203 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -131,7 +131,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 4;
 
 - (CGFloat)bubbleHMargin
 {
-    return (self.isForPreview ? 0.f : LKValues.largeSpacing);
+    return (self.isForPreview ? 0.f : 20.f);
 }
 
 - (CGFloat)hSpacing
@@ -648,7 +648,7 @@ const CGFloat kRemotelySourcedContentRowSpacing = 4;
 
 - (UIFont *)quotedTextFont
 {
-    return [UIFont systemFontOfSize:LKValues.mediumFontSize];
+    return [UIFont systemFontOfSize:LKValues.smallFontSize];
 }
 
 - (UIColor *)fileTypeTextColor
diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift
index e6f907320..fb09c5d85 100644
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@@ -116,7 +116,7 @@ public class ConversationStyle: NSObject {
 
         let messageTextFont = UIFont.systemFont(ofSize: Values.smallFontSize)
 
-        let baseFontOffset: CGFloat = 16
+        let baseFontOffset: CGFloat = 12
 
         // Don't include the distance from the "cap height" to the top of the UILabel
         // in the top margin.
@@ -126,7 +126,7 @@ public class ConversationStyle: NSObject {
         // negative value.
         textInsetBottom = max(0, round(baseFontOffset - abs(messageTextFont.descender)))
 
-        textInsetHorizontal = 16
+        textInsetHorizontal = 12
 
         lastTextLineAxis = CGFloat(round(baseFontOffset + messageTextFont.capHeight * 0.5))