diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 97920ff6..253cde9f 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1207,7 +1207,7 @@ public class Application.MainWindow :
             on_conversation_view_added
         );
 
-        this.conversations_paned.pack2(this.conversation_viewer, true, true);
+        this.conversations_paned.pack2(this.conversation_viewer, true, false);
 
         // Main toolbar
         this.main_toolbar = new MainToolbar(config);
diff --git a/src/client/composer/composer-widget.vala b/src/client/composer/composer-widget.vala
index 0a76f90b..ec9e9211 100644
--- a/src/client/composer/composer-widget.vala
+++ b/src/client/composer/composer-widget.vala
@@ -605,6 +605,11 @@ public class Composer.Widget : Gtk.EventBox, Geary.BaseInterface {
         );
         this.background_work_pulse.repetition = FOREVER;
 
+        // Set the from_multiple combo box to ellipsize. This can't be done
+        // from the .ui file.
+        var cells = this.from_multiple.get_cells();
+        ((Gtk.CellRendererText) cells.data).ellipsize = END;
+
         load_entry_completions();
     }