date header should break cluster

Signal/src/ViewControllers/ConversationView/ConversationViewController.m

@@ -4897,8 +4897,11 @@ typedef enum : NSUInteger {
             } else {
                 isFirstInCluster = previousViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
             }
+
             if (nextViewItem == nil) {
                 isLastInCluster = YES;
+            } else if (nextViewItem.shouldShowDate) {
+                isLastInCluster = YES;
             } else {
                 isLastInCluster = nextViewItem.interaction.interactionType != OWSInteractionType_OutgoingMessage;
             }
@@ -4924,15 +4927,20 @@ typedef enum : NSUInteger {
             }
 
             // clustering
-            if (previousViewItem == nil
+            if (previousViewItem == nil) {
-                || previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
+                isFirstInCluster = YES;
+            } else if (previousViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
                 isFirstInCluster = YES;
             } else {
                 TSIncomingMessage *previousIncomingMessage = (TSIncomingMessage *)previousViewItem.interaction;
                 isFirstInCluster = ![incomingSenderId isEqual:previousIncomingMessage.authorId];
             }
 
-            if (nextViewItem == nil || nextViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
+            if (nextViewItem == nil) {
+                isLastInCluster = YES;
+            } else if (nextViewItem.interaction.interactionType != OWSInteractionType_IncomingMessage) {
+                isLastInCluster = YES;
+            } else if (nextViewItem.shouldShowDate) {
                 isLastInCluster = YES;
             } else {
                 TSIncomingMessage *nextIncomingMessage = (TSIncomingMessage *)nextViewItem.interaction;