diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
index 5ed447e2f..ee637bf3b 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageHeaderView.m
@@ -170,7 +170,7 @@ const CGFloat OWSMessageHeaderViewDateHeaderVMargin = 23;
     CGFloat strokeThickness = [self strokeThicknessWithViewItem:viewItem];
     result.height += strokeThickness;
 
-    CGFloat maxTextWidth = conversationStyle.fullWidthContentWidth;
+    CGFloat maxTextWidth = conversationStyle.headerViewContentWidth;
     CGSize titleSize = [self.titleLabel sizeThatFits:CGSizeMake(maxTextWidth, CGFLOAT_MAX)];
     result.height += titleSize.height + self.stackView.spacing;
 
diff --git a/SignalMessaging/utils/ConversationStyle.swift b/SignalMessaging/utils/ConversationStyle.swift
index 4e7a4d61d..7cbbdf311 100644
--- a/SignalMessaging/utils/ConversationStyle.swift
+++ b/SignalMessaging/utils/ConversationStyle.swift
@@ -34,11 +34,17 @@ public class ConversationStyle: NSObject {
 
     @objc public var errorGutterTrailing: CGFloat = 0
 
-    // viewWidth - (gutterLeading + gutterTrailing)
-    @objc public var contentWidth: CGFloat = 0
+    @objc public var contentWidth: CGFloat {
+        return viewWidth - (gutterLeading + gutterTrailing)
+    }
 
-    // viewWidth - (gutterfullWidthGutterLeadingLeading + fullWidthGutterTrailing)
-    @objc public var fullWidthContentWidth: CGFloat = 0
+    @objc public var fullWidthContentWidth: CGFloat {
+       return viewWidth - (fullWidthGutterLeading + fullWidthGutterTrailing)
+    }
+
+    @objc public var headerViewContentWidth: CGFloat {
+        return viewWidth - (headerGutterLeading + headerGutterTrailing)
+    }
 
     @objc public var maxMessageWidth: CGFloat = 0
 
@@ -97,10 +103,6 @@ public class ConversationStyle: NSObject {
         headerGutterTrailing = 28
         errorGutterTrailing = 16
 
-        contentWidth = viewWidth - (gutterLeading + gutterTrailing)
-
-        fullWidthContentWidth = viewWidth - (fullWidthGutterLeading + fullWidthGutterTrailing)
-
         maxMessageWidth = floor(contentWidth - 32)
 
         let messageTextFont = UIFont.ows_dynamicTypeBody