diff --git a/src/client/components/client-web-view.vala b/src/client/components/client-web-view.vala
index 98e85825..546ebea9 100644
--- a/src/client/components/client-web-view.vala
+++ b/src/client/components/client-web-view.vala
@@ -134,7 +134,7 @@ public class ClientWebView : WebKit.WebView {
     }
 
 
-    public bool has_valid_height = false;
+    public bool has_valid_height { get; set; default = false; }
 
     public string allow_prefix { get; private set; default = ""; }
 
diff --git a/src/client/conversation-viewer/conversation-email.vala b/src/client/conversation-viewer/conversation-email.vala
index 2af0b4fd..f6b4f6f9 100644
--- a/src/client/conversation-viewer/conversation-email.vala
+++ b/src/client/conversation-viewer/conversation-email.vala
@@ -630,7 +630,7 @@ public class ConversationEmail : Gtk.Box {
         view.web_view.inline_resource_loaded.connect((id) => {
                 this.inlined_content_ids.add(id);
             });
-        view.web_view.notify["load-status"].connect(() => {
+        view.web_view.notify["has-valid-height"].connect(() => {
                 bool all_loaded = true;
                 message_view_iterator().foreach((view) => {
                         if (!view.web_view.has_valid_height) {
diff --git a/ui/conversation-email.ui b/ui/conversation-email.ui
index 9e5e494f..0945cea4 100644
--- a/ui/conversation-email.ui
+++ b/ui/conversation-email.ui
@@ -113,13 +113,11 @@
     <property name="name">box</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="hexpand">True</property>
     <property name="orientation">vertical</property>
     <child>
       <object class="GtkSeparator">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="hexpand">True</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
diff --git a/ui/conversation-message.ui b/ui/conversation-message.ui
index d635b08d..6190fb21 100644
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@@ -601,6 +601,7 @@
                   <object class="GtkGrid" id="body_container">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="orientation">vertical</property>
                     <style>
                       <class name="geary-message-body"/>
                     </style>