diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index bb168fad8..d3169abb3 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -349,7 +349,7 @@ NS_ASSUME_NONNULL_BEGIN
 
             if (self.isQuotedReply) {
                 UIView *spacerView = [UIView containerView];
-                [spacerView autoSetDimension:ALDimensionHeight toSize:self.bodyMedaQuotedReplyVSpacing];
+                [spacerView autoSetDimension:ALDimensionHeight toSize:self.bodyMediaQuotedReplyVSpacing];
                 [spacerView setCompressionResistanceHigh];
                 [self.stackView addArrangedSubview:spacerView];
             }
@@ -606,7 +606,7 @@ NS_ASSUME_NONNULL_BEGIN
     return 2.f;
 }
 
-- (CGFloat)bodyMedaQuotedReplyVSpacing
+- (CGFloat)bodyMediaQuotedReplyVSpacing
 {
     return 8.f;
 }
@@ -1176,7 +1176,7 @@ NS_ASSUME_NONNULL_BEGIN
         }
 
         if (bodyMediaSize && quotedMessageSize && self.hasFullWidthMediaView) {
-            cellSize.height += self.bodyMedaQuotedReplyVSpacing;
+            cellSize.height += self.bodyMediaQuotedReplyVSpacing;
         }
     }
 
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
index 3e21cdd27..ca0cbaac3 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSQuotedMessageView.m
@@ -264,6 +264,9 @@ NS_ASSUME_NONNULL_BEGIN
         [quotedAttachmentView setCompressionResistanceHigh];
         [hStackView addArrangedSubview:quotedAttachmentView];
     } else {
+        // If there's no attachment, add an empty view so that
+        // the stack view's spacing serves as a margin between
+        // the text views and the trailing edge.
         UIView *emptyView = [UIView containerView];
         [hStackView addArrangedSubview:emptyView];
         [emptyView setContentHuggingHigh];