diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
index 4d52718b5..1ab9e9def 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.h
@@ -8,6 +8,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+extern const CGFloat OWSMessageCellDateHeaderVMargin;
+
 @interface OWSMessageCell : ConversationViewCell
 
 @property (nonatomic, readonly) OWSMessageBubbleView *messageBubbleView;
diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
index 3279a3f64..c75ccab31 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageCell.m
@@ -9,6 +9,8 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+const CGFloat OWSMessageCellDateHeaderVMargin = 23;
+
 @interface OWSMessageCell ()
 
 // The nullable properties are created as needed.
@@ -59,7 +61,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.dateHeaderLabel.textColor = [UIColor ows_light60Color];
 
     self.dateHeaderView = [UIView new];
-    self.dateHeaderView.layoutMargins = UIEdgeInsetsMake(self.dateHeaderVMargin, 0, self.dateHeaderVMargin, 0);
+    self.dateHeaderView.layoutMargins = UIEdgeInsetsMake(0, 0, OWSMessageCellDateHeaderVMargin, 0);
     [self.dateHeaderView addSubview:self.dateHeaderLabel];
     [self.dateHeaderLabel autoPinToSuperviewMargins];
 
@@ -385,16 +387,11 @@ NS_ASSUME_NONNULL_BEGIN
     return cellSize;
 }
 
-- (CGFloat)dateHeaderVMargin
-{
-    return 23.f;
-}
-
 - (CGFloat)dateHeaderHeight
 {
     if (self.viewItem.shouldShowDate) {
         CGFloat textHeight = self.dateHeaderFont.lineHeight;
-        return (CGFloat)ceil(textHeight + self.dateHeaderVMargin * 2);
+        return (CGFloat)ceil(textHeight + OWSMessageCellDateHeaderVMargin);
     } else {
         return 0.f;
     }
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
index ed64d4f09..df22f1ff7 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewItem.m
@@ -261,7 +261,7 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
     }
 
     if (self.shouldShowDate) {
-        return 0;
+        return OWSMessageCellDateHeaderVMargin;
     }
 
     // "Bubble Collapse".  Adjacent messages with the same author should be close together.