diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index a3b643086..0aafdd920 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -3499,6 +3499,7 @@ typedef enum : NSUInteger {
                     continue;
                 }
                 isOnlyModifyingLastMessage = NO;
+                break;
             }
             case YapDatabaseViewChangeMove:
                 isOnlyModifyingLastMessage = NO;
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index 9d3baf52f..535d6cd54 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -839,10 +839,6 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
               contactsManager:self.contactsManager
         blockedPhoneNumberSet:self.blockedPhoneNumberSet];
 
-    if ((unsigned long)indexPath.row == [self.threadMappings numberOfItemsInSection:0] - 1) {
-        cell.separatorInset = UIEdgeInsetsMake(0.f, cell.bounds.size.width, 0.f, 0.f);
-    }
-
     return cell;
 }