diff --git a/mu4e/mu4e-view.el b/mu4e/mu4e-view.el
index a9101df5..697c7db4 100644
--- a/mu4e/mu4e-view.el
+++ b/mu4e/mu4e-view.el
@@ -618,8 +618,8 @@ As a side-effect, a message that is being viewed loses its
       (erase-buffer)
       (insert-file-contents-literally
        (mu4e-message-readable-path msg) nil nil nil t)
-      (setq-local mu4e~view-message msg)))
-  (mu4e~view-render-buffer msg)
+      (setq-local mu4e~view-message msg)
+      (mu4e~view-render-buffer msg)))
   (unless (mu4e--view-detached-p gnus-article-buffer)
     (with-current-buffer mu4e-linked-headers-buffer
       ;; We need this here as we want to avoid displaying the buffer until