diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 9f0ced321..1c4f51070 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -193,7 +193,7 @@ NS_ASSUME_NONNULL_BEGIN
                                              ofView:self.sendFailureBadgeView
                                          withOffset:sendFailureBadgeBottomMargin],
                 [self.sendFailureBadgeView autoPinEdgeToSuperviewEdge:ALEdgeTrailing
-                                                            withInset:self.conversationStyle.gutterTrailing],
+                                                            withInset:self.conversationStyle.errorGutterTrailing],
                 [self.sendFailureBadgeView autoSetDimension:ALDimensionWidth toSize:self.sendFailureBadgeSize],
                 [self.sendFailureBadgeView autoSetDimension:ALDimensionHeight toSize:self.sendFailureBadgeSize],
             ]];
diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift
index 4ad89fa46..4f534d501 100644
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@@ -27,6 +27,7 @@ public class ConversationStyle: NSObject {
     // like "date headers" and "unread indicator".
     @objc public var fullWidthGutterLeading: CGFloat = 0
     @objc public var fullWidthGutterTrailing: CGFloat = 0
+    @objc public var errorGutterTrailing: CGFloat = 0
 
     // viewWidth - (gutterLeading + gutterTrailing)
     @objc public var contentWidth: CGFloat = 0
@@ -87,6 +88,7 @@ public class ConversationStyle: NSObject {
         }
         fullWidthGutterLeading = gutterLeading
         fullWidthGutterTrailing = gutterTrailing
+        errorGutterTrailing = 16
 
         contentWidth = viewWidth - (gutterLeading + gutterTrailing)