From dc78e32bbfbfa78684a42675e75649ddb39952ac Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Tue, 4 Apr 2017 10:51:32 -0400
Subject: [PATCH 1/2] Reload data and invalidate layout whenever message view
 will appear.

// FREEBIE
---
 Signal/src/ViewControllers/MessagesViewController.m | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m
index 11bab16ee..7b4dc5ecb 100644
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@@ -524,6 +524,9 @@ typedef enum : NSUInteger {
                                                            ];
 
     [self ensureBlockStateIndicator];
+    
+    [self.collectionView.collectionViewLayout invalidateLayout];
+    [self.collectionView reloadData];
 }
 
 - (void)setUserHasScrolled:(BOOL)userHasScrolled {

From 6fde2852b1a1061879560cf835763439dcf1c359 Mon Sep 17 00:00:00 2001
From: Matthew Chen <charlesmchen@gmail.com>
Date: Mon, 10 Apr 2017 12:44:03 -0400
Subject: [PATCH 2/2] Respond to CR.

// FREEBIE
---
 Signal/src/ViewControllers/MessagesViewController.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Signal/src/ViewControllers/MessagesViewController.m b/Signal/src/ViewControllers/MessagesViewController.m
index 7b4dc5ecb..f17b106f6 100644
--- a/Signal/src/ViewControllers/MessagesViewController.m
+++ b/Signal/src/ViewControllers/MessagesViewController.m
@@ -524,7 +524,8 @@ typedef enum : NSUInteger {
                                                            ];
 
     [self ensureBlockStateIndicator];
-    
+
+    // Avoid layout corrupt issues and out-of-date message subtitles.
     [self.collectionView.collectionViewLayout invalidateLayout];
     [self.collectionView reloadData];
 }