Merge branch 'charlesmchen/messageViewGlitches'

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 {