diff --git a/src/client/conversation-list/conversation-list-view.vala b/src/client/conversation-list/conversation-list-view.vala
index 8eb6d3f9..c36a7d13 100644
--- a/src/client/conversation-list/conversation-list-view.vala
+++ b/src/client/conversation-list/conversation-list-view.vala
@@ -106,8 +106,8 @@ public class ConversationList.View : Gtk.ScrolledWindow, Geary.BaseInterface {
     }
 
     public override void get_preferred_width(out int minimum_size, out int natural_size) {
-        minimum_size = 150;
-        natural_size = 200;
+        minimum_size = 360;
+        natural_size = 500;
     }
 
     /**
diff --git a/src/client/conversation-viewer/conversation-viewer.vala b/src/client/conversation-viewer/conversation-viewer.vala
index 1bc34ade..2cc93194 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -152,8 +152,8 @@ public class ConversationViewer : Gtk.Stack, Geary.BaseInterface {
     }
 
     public override void get_preferred_width(out int minimum_size, out int natural_size) {
-        minimum_size = 300;
-        natural_size = 500;
+        minimum_size = 360;
+        natural_size = 400;
     }
 
     /**
diff --git a/src/client/folder-list/folder-list-tree.vala b/src/client/folder-list/folder-list-tree.vala
index fd142afa..732d6cd8 100644
--- a/src/client/folder-list/folder-list-tree.vala
+++ b/src/client/folder-list/folder-list-tree.vala
@@ -49,8 +49,8 @@ public class FolderList.Tree : Sidebar.Tree, Geary.BaseInterface {
     }
 
     public override void get_preferred_width(out int minimum_size, out int natural_size) {
-        minimum_size = 300;
-        natural_size = 400;
+        minimum_size = 360;
+        natural_size = 500;
     }
 
     public void set_has_new(Geary.Folder folder, bool has_new) {
diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index 94247a5e..b23419e7 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -27,7 +27,7 @@
                 <child>
                   <object class="HdyLeaflet" id="inner_leaflet">
                     <property name="visible">True</property>
-                    <property name="hexpand">True</property>
+                    <property name="hexpand-set">True</property>
                     <property name="can_swipe_back">True</property>
                     <property name="transition_type">over</property>
                     <signal name="notify::folded" handler="on_inner_leaflet_changed" swapped="no"/>