diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m
index 11bab16ee..f17b106f6 100644
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@@ -524,6 +524,10 @@ typedef enum : NSUInteger {
                                                            ];
 
     [self ensureBlockStateIndicator];
+
+    // Avoid layout corrupt issues and out-of-date message subtitles.
+    [self.collectionView.collectionViewLayout invalidateLayout];
+    [self.collectionView reloadData];
 }
 
 - (void)setUserHasScrolled:(BOOL)userHasScrolled {