diff --git a/Signal/src/views/LinkPreviewView.swift b/Signal/src/views/LinkPreviewView.swift
index fe7a80034..6448e9b82 100644
--- a/Signal/src/views/LinkPreviewView.swift
+++ b/Signal/src/views/LinkPreviewView.swift
@@ -569,18 +569,13 @@ public class LinkPreviewView: UIStackView {
         self.distribution = .fill
         self.spacing = 8
         self.isLayoutMarginsRelativeArrangement = true
-        let hMarginLeading: CGFloat = 6
-        let hMarginTrailing: CGFloat = 12
-        self.layoutMargins = UIEdgeInsets(top: draftMarginTop,
-                                          left: CurrentAppContext().isRTL ? hMarginTrailing : hMarginLeading,
-                                          bottom: 0,
-                                          right: CurrentAppContext().isRTL ? hMarginLeading : hMarginTrailing)
 
         self.layoutConstraints.append(self.autoSetDimension(.height, toSize: draftHeight + draftMarginTop))
 
         // Image
 
-        if let imageView = createDraftImageView(state: state) {
+        let draftImageView = createDraftImageView(state: state)
+        if let imageView = draftImageView {
             imageView.contentMode = .scaleAspectFill
             imageView.autoPinToSquareAspectRatio()
             let imageSize = draftHeight
@@ -591,6 +586,14 @@ public class LinkPreviewView: UIStackView {
             addArrangedSubview(imageView)
         }
 
+        let hasImage = draftImageView != nil
+        let hMarginLeading: CGFloat = hasImage ? 6 : 12
+        let hMarginTrailing: CGFloat = 12
+        self.layoutMargins = UIEdgeInsets(top: draftMarginTop,
+                                          left: CurrentAppContext().isRTL ? hMarginTrailing : hMarginLeading,
+                                          bottom: 0,
+                                          right: CurrentAppContext().isRTL ? hMarginLeading : hMarginTrailing)
+
         // Right
 
         let rightStack = UIStackView()