diff --git a/src/client/conversation-list/conversation-list-view.vala b/src/client/conversation-list/conversation-list-view.vala
index cc39ed95..8eb6d3f9 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 = 300;
-        natural_size = 500;
+        minimum_size = 150;
+        natural_size = 200;
     }
 
     /**
diff --git a/src/client/conversation-viewer/conversation-viewer.vala b/src/client/conversation-viewer/conversation-viewer.vala
index 013ff4b3..1bc34ade 100644
--- a/src/client/conversation-viewer/conversation-viewer.vala
+++ b/src/client/conversation-viewer/conversation-viewer.vala
@@ -153,7 +153,7 @@ 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 = 700;
+        natural_size = 500;
     }
 
     /**
diff --git a/src/client/folder-list/folder-list-tree.vala b/src/client/folder-list/folder-list-tree.vala
index 1ecc97ca..fd142afa 100644
--- a/src/client/folder-list/folder-list-tree.vala
+++ b/src/client/folder-list/folder-list-tree.vala
@@ -50,7 +50,7 @@ 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 = 500;
+        natural_size = 400;
     }
 
     public void set_has_new(Geary.Folder folder, bool has_new) {
diff --git a/ui/components-headerbar-conversation-list.ui b/ui/components-headerbar-conversation-list.ui
index f53901af..dc26d814 100644
--- a/ui/components-headerbar-conversation-list.ui
+++ b/ui/components-headerbar-conversation-list.ui
@@ -4,7 +4,6 @@
   <requires lib="gtk+" version="3.20"/>
   <template class="ComponentsConversationListHeaderBar" parent="HdyHeaderBar">
     <property name="visible">True</property>
-    <property name="hexpand">True</property>
     <child>
       <object class="GtkButton" id="back_button">
         <property name="receives_default">False</property>