Merge branch 'composer_height' into 'mainline'

client: conversation-viewer: Give more room to composer in embedded mode

See merge request GNOME/geary!735

src/client/conversation-viewer/conversation-viewer.vala

@@ -195,6 +195,11 @@ public class ConversationViewer : Gtk.Stack, Geary.BaseInterface {
         }
 
         if (kinetic) this.conversation_scroller.kinetic_scrolling = true;
+
+        // Set a minimal composer height
+        composer.set_size_request(
+            -1, this.conversation_scroller.get_allocated_height() / 3 * 2
+        );
     }
 
     /**