diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index 6a3a81850..b6a619c30 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -1370,7 +1370,6 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
 
 #pragma mark - Dynamic Text
 
-// TODO: Fix this.
 /**
  Called whenever the user manually changes the dynamic type options inside Settings.
 
@@ -2798,6 +2797,11 @@ typedef NS_ENUM(NSInteger, MessagesRangeSizeMode) {
         // may need to extend the mapping's contents to reflect the current
         // range.
         [self updateMessageMappingRangeOptions:MessagesRangeSizeMode_Normal];
+        // Calling resetContentAndLayout is a bit expensive.
+        // Since by definition this won't affect any cells in the previous
+        // range, it should be sufficient to call invalidateLayout.
+        //
+        // TODO: Investigate whether we can just call invalidateLayout.
         [self resetContentAndLayout];
         return;
     }