diff --git a/js/models/conversations.js b/js/models/conversations.js
index 0d49252185ef..fdca9edfa093 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -1471,10 +1471,7 @@
         }
 
         // 1. Load provided thumbnail
-        if (this.loadQuoteThumbnail(message, quote)) {
-          this.forceRender(message);
-          return;
-        }
+        const gotThumbnail = this.loadQuoteThumbnail(message, quote);
 
         // 2. Check to see if we've already loaded the target message into memory
         const { author, id } = quote;
@@ -1487,6 +1484,13 @@
           return;
         }
 
+        // Even if we got the thumbnail locall, we wanted to populate the referenced
+        //   message so a click can navigate to it.
+        if (gotThumbnail) {
+          this.forceRender(message);
+          return;
+        }
+
         // We only go further if we need more data for this message. It's always important
         //   to grab the quoted message to allow for navigating to it by clicking.
         const { attachments } = quote;
diff --git a/stylesheets/_conversation.scss b/stylesheets/_conversation.scss
index cd5a0d80d15f..9195bff821d3 100644
--- a/stylesheets/_conversation.scss
+++ b/stylesheets/_conversation.scss
@@ -52,6 +52,7 @@
 .message-detail-wrapper {
   height: calc(100% - 48px);
   width: 100%;
+  overflow-y: auto;
 }
 
 .discussion-container {
diff --git a/stylesheets/_modules.scss b/stylesheets/_modules.scss
index 7f76594ebc1d..353c3fcf1332 100644
--- a/stylesheets/_modules.scss
+++ b/stylesheets/_modules.scss
@@ -1955,7 +1955,7 @@
   font-size: 13px;
   line-height: 18px;
 
-  height: 1.2em;
+  height: 1.3em;
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;