diff --git a/Signal/src/ViewControllers/HomeView/HomeViewCell.m b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
index b9fb6f32a..38471b801 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewCell.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewCell.m
@@ -191,7 +191,7 @@ NS_ASSUME_NONNULL_BEGIN
     self.dateTimeLabel.text
         = (overrideDate ? [self stringForDate:overrideDate] : [self stringForDate:thread.lastMessageDate]);
 
-    if (hasUnreadMessages) {
+    if (hasUnreadMessages && overrideSnippet == nil) {
         self.dateTimeLabel.textColor = [UIColor ows_blackColor];
         self.dateTimeLabel.font = self.unreadFont.ows_mediumWeight;
     } else {
@@ -200,7 +200,7 @@ NS_ASSUME_NONNULL_BEGIN
     }
 
     NSUInteger unreadCount = thread.unreadCount;
-    if (unreadCount == 0) {
+    if (unreadCount == 0 || overrideSnippet != nil) {
         [self.viewConstraints addObject:[self.payloadView autoPinTrailingToSuperviewMargin]];
     } else {
         [self.contentView addSubview:self.unreadBadge];
diff --git a/SignalMessaging/Views/ContactTableViewCell.m b/SignalMessaging/Views/ContactTableViewCell.m
index 5fa7c9cac..90d9e3316 100644
--- a/SignalMessaging/Views/ContactTableViewCell.m
+++ b/SignalMessaging/Views/ContactTableViewCell.m
@@ -93,7 +93,6 @@ NS_ASSUME_NONNULL_BEGIN
 
     [self.cellView prepareForReuse];
 
-    self.accessoryView = nil;
     self.accessoryType = UITableViewCellAccessoryNone;
 }