diff --git a/Signal/src/ViewControllers/MessageDetailViewController.swift b/Signal/src/ViewControllers/MessageDetailViewController.swift
index 20b19313a..bbb029f2d 100644
--- a/Signal/src/ViewControllers/MessageDetailViewController.swift
+++ b/Signal/src/ViewControllers/MessageDetailViewController.swift
@@ -89,8 +89,6 @@ class MessageDetailViewController: OWSViewController, UIScrollViewDelegate, Medi
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
 
-        updateTextLayout()
-
         if mode == .focusOnMetadata {
             if let bubbleView = self.bubbleView {
                 // Force layout.
@@ -293,6 +291,8 @@ class MessageDetailViewController: OWSViewController, UIScrollViewDelegate, Medi
         if let mediaMessageView = mediaMessageView {
             mediaMessageView.autoMatch(.height, to: .width, of: mediaMessageView, withOffset:0, relation: .lessThanOrEqual)
         }
+
+        updateTextLayout()
     }
 
     private func displayableTextIfText() -> String? {