From 7b994ece1d94d05d275793396a26c6edb37c9bc7 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Fri, 9 Apr 2021 21:09:10 +1000
Subject: [PATCH 01/16] client: Move MainToolbar into the Components name space
 proper

---
 po/POTFILES.in                                |  6 ++--
 .../application/application-main-window.vala  |  6 ++--
 .../components-conversation-actions.vala      |  2 +-
 ...lbar.vala => components-main-toolbar.vala} | 30 ++++++++++++-------
 src/client/composer/composer-box.vala         |  4 +--
 src/client/meson.build                        |  2 +-
 ...us.ui => components-main-toolbar-menus.ui} |  0
 ...-toolbar.ui => components-main-toolbar.ui} | 12 ++++----
 ui/org.gnome.Geary.gresource.xml              |  4 +--
 9 files changed, 39 insertions(+), 27 deletions(-)
 rename src/client/components/{main-toolbar.vala => components-main-toolbar.vala} (85%)
 rename ui/{main-toolbar-menus.ui => components-main-toolbar-menus.ui} (100%)
 rename ui/{main-toolbar.ui => components-main-toolbar.ui} (90%)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index b93e507a..8d6c52b2 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -44,6 +44,7 @@ src/client/components/components-in-app-notification.vala
 src/client/components/components-info-bar-stack.vala
 src/client/components/components-info-bar.vala
 src/client/components/components-inspector.vala
+src/client/components/components-main-toolbar.vala
 src/client/components/components-placeholder-pane.vala
 src/client/components/components-preferences-window.vala
 src/client/components/components-problem-report-info-bar.vala
@@ -54,7 +55,6 @@ src/client/components/components-web-view.vala
 src/client/components/count-badge.vala
 src/client/components/folder-popover.vala
 src/client/components/icon-factory.vala
-src/client/components/main-toolbar.vala
 src/client/components/monitored-progress-bar.vala
 src/client/components/monitored-spinner.vala
 src/client/components/status-bar.vala
@@ -465,6 +465,8 @@ ui/components-info-bar.ui
 ui/components-inspector-error-view.ui
 ui/components-inspector-log-view.ui
 ui/components-inspector.ui
+ui/components-main-toolbar.ui
+ui/components-main-toolbar-menus.ui
 ui/components-placeholder-pane.ui
 ui/conversation-contact-popover.ui
 ui/conversation-email.ui
@@ -476,7 +478,5 @@ ui/conversation-viewer.ui
 ui/find_bar.glade
 ui/folder-popover.ui
 ui/gtk/help-overlay.ui
-ui/main-toolbar.ui
-ui/main-toolbar-menus.ui
 ui/password-dialog.glade
 ui/problem-details-dialog.ui
diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 0e135326..76e0c898 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -302,7 +302,7 @@ public class Application.MainWindow :
 
     // Widget descendants
     public FolderList.Tree folder_list { get; private set; default = new FolderList.Tree(); }
-    public MainToolbar main_toolbar { get; private set; }
+    public Components.MainToolbar main_toolbar { get; private set; }
     public SearchBar search_bar { get; private set; }
     public ConversationListView conversation_list_view  { get; private set; }
     public ConversationViewer conversation_viewer { get; private set; }
@@ -1303,7 +1303,9 @@ public class Application.MainWindow :
                                                 BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
 
         // Main toolbar
-        this.main_toolbar = new MainToolbar(config, conversation_viewer_action_bar);
+        this.main_toolbar = new Components.MainToolbar(
+            config, conversation_viewer_action_bar
+        );
         this.main_toolbar.add_to_size_groups(this.folder_size_group,
                                              this.folder_separator_size_group,
                                              this.conversations_size_group,
diff --git a/src/client/components/components-conversation-actions.vala b/src/client/components/components-conversation-actions.vala
index a8cdaed9..91b1268c 100644
--- a/src/client/components/components-conversation-actions.vala
+++ b/src/client/components/components-conversation-actions.vala
@@ -41,7 +41,7 @@ public class Components.ConversationActions : GLib.Object {
             new Gtk.Builder.from_resource("/org/gnome/Geary/components-conversation-actions.ui");
         // Assemble the mark menus
         Gtk.Builder menu_builder =
-            new Gtk.Builder.from_resource("/org/gnome/Geary/main-toolbar-menus.ui");
+            new Gtk.Builder.from_resource("/org/gnome/Geary/components-main-toolbar-menus.ui");
         MenuModel mark_menu = (MenuModel) menu_builder.get_object("mark_message_menu");
 
         this.mark_copy_move_buttons = (Gtk.Box) builder.get_object("mark_copy_move_buttons");
diff --git a/src/client/components/main-toolbar.vala b/src/client/components/components-main-toolbar.vala
similarity index 85%
rename from src/client/components/main-toolbar.vala
rename to src/client/components/components-main-toolbar.vala
index 6140053c..32ad5eea 100644
--- a/src/client/components/main-toolbar.vala
+++ b/src/client/components/components-main-toolbar.vala
@@ -1,23 +1,33 @@
-/* Copyright 2017 Software Freedom Conservancy Inc.
+/*
+ * Copyright © 2017 Software Freedom Conservancy Inc.
  *
  * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
+ * (version 2.1 or later). See the COPYING file in this distribution.
  */
 
-// Draws the main toolbar.
-[GtkTemplate (ui = "/org/gnome/Geary/main-toolbar.ui")]
-public class MainToolbar : Hdy.Leaflet {
+
+/**
+ * The toolbar for the main window.
+ *
+ * @see Application.MainWindow
+ */
+[GtkTemplate (ui = "/org/gnome/Geary/components-main-toolbar.ui")]
+public class Components.MainToolbar : Hdy.Leaflet {
+
     // How wide the left pane should be. Auto-synced with our settings
     public int left_pane_width { get; set; }
+
     // Used to form the title of the folder header
     public string account { get; set; }
     public string folder { get; set; }
+
     // Close button settings
     public bool show_close_button { get; set; default = true; }
+
     // Search bar
     public bool search_open { get; set; default = false; }
 
-    private Components.ConversationActionBar conversation_viewer_action_bar;
+    private ConversationActionBar conversation_viewer_action_bar;
 
     [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
 
@@ -34,14 +44,14 @@ public class MainToolbar : Hdy.Leaflet {
     [GtkChild] private unowned Gtk.Separator conversations_separator;
 
     // Conversation header elements
-    [GtkChild] private unowned Components.ConversationHeaderBar conversation_header;
+    [GtkChild] private unowned ConversationHeaderBar conversation_header;
 
     [GtkChild] private unowned Hdy.HeaderGroup header_group;
 
     Gtk.SizeGroup conversation_group;
 
     public MainToolbar(Application.Configuration config,
-                       Components.ConversationActionBar action_bar) {
+                       ConversationActionBar action_bar) {
         if (config.desktop_environment != UNITY) {
             this.bind_property("account", this.conversations_header, "title", BindingFlags.SYNC_CREATE);
             this.bind_property("folder", this.conversations_header, "subtitle", BindingFlags.SYNC_CREATE);
@@ -50,7 +60,7 @@ public class MainToolbar : Hdy.Leaflet {
         this.conversation_header.action_bar = action_bar;
 
         // Assemble the main/mark menus
-        Gtk.Builder builder = new Gtk.Builder.from_resource("/org/gnome/Geary/main-toolbar-menus.ui");
+        Gtk.Builder builder = new Gtk.Builder.from_resource("/org/gnome/Geary/components-main-toolbar-menus.ui");
         MenuModel main_menu = (MenuModel) builder.get_object("main_menu");
 
         // Setup folder header elements
@@ -97,7 +107,7 @@ public class MainToolbar : Hdy.Leaflet {
         conversation_group.add_swipeable(this);
     }
 
-    public void add_conversation_actions(Components.ConversationActions actions) {
+    public void add_conversation_actions(ConversationActions actions) {
         conversation_header.add_conversation_actions(actions);
     }
 
diff --git a/src/client/composer/composer-box.vala b/src/client/composer/composer-box.vala
index 2f823cb5..2addc0c1 100644
--- a/src/client/composer/composer-box.vala
+++ b/src/client/composer/composer-box.vala
@@ -27,14 +27,14 @@ public class Composer.Box : Gtk.Frame, Container {
     /** {@inheritDoc} */
     internal Widget composer { get; set; }
 
-    private MainToolbar main_toolbar { get; private set; }
+    private Components.MainToolbar main_toolbar { get; private set; }
 
 
     /** Emitted when the container is closed. */
     public signal void vanished();
 
 
-    public Box(Widget composer, MainToolbar main_toolbar) {
+    public Box(Widget composer, Components.MainToolbar main_toolbar) {
         this.composer = composer;
         this.composer.set_mode(PANED);
 
diff --git a/src/client/meson.build b/src/client/meson.build
index 5aed39de..7262580b 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -57,6 +57,7 @@ client_vala_sources = files(
   'components/components-inspector-error-view.vala',
   'components/components-inspector-log-view.vala',
   'components/components-inspector-system-view.vala',
+  'components/components-main-toolbar.vala',
   'components/components-placeholder-pane.vala',
   'components/components-preferences-window.vala',
   'components/components-problem-report-info-bar.vala',
@@ -67,7 +68,6 @@ client_vala_sources = files(
   'components/count-badge.vala',
   'components/folder-popover.vala',
   'components/icon-factory.vala',
-  'components/main-toolbar.vala',
   'components/monitored-progress-bar.vala',
   'components/monitored-spinner.vala',
   'components/status-bar.vala',
diff --git a/ui/main-toolbar-menus.ui b/ui/components-main-toolbar-menus.ui
similarity index 100%
rename from ui/main-toolbar-menus.ui
rename to ui/components-main-toolbar-menus.ui
diff --git a/ui/main-toolbar.ui b/ui/components-main-toolbar.ui
similarity index 90%
rename from ui/main-toolbar.ui
rename to ui/components-main-toolbar.ui
index aba5529b..95c80838 100644
--- a/ui/main-toolbar.ui
+++ b/ui/components-main-toolbar.ui
@@ -6,7 +6,7 @@
     <property name="visible">True</property>
     <property name="icon_name">mail-archive-symbolic</property>
   </object>
-  <template class="MainToolbar" parent="HdyLeaflet">
+  <template class="ComponentsMainToolbar" parent="HdyLeaflet">
     <property name="visible">True</property>
     <property name="can_swipe_back">True</property>
     <property name="transition_type">over</property>
@@ -19,7 +19,7 @@
         <child>
           <object class="HdyHeaderBar" id="folder_header">
             <property name="visible">True</property>
-            <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
+            <property name="show_close_button" bind-source="ComponentsMainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
             <property name="title">Mail</property>
             <child>
               <object class="GtkMenuButton" id="main_menu_button">
@@ -60,7 +60,7 @@
           <object class="HdyHeaderBar" id="conversations_header">
             <property name="visible">True</property>
             <property name="hexpand">True</property>
-            <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
+            <property name="show_close_button" bind-source="ComponentsMainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
             <child>
               <object class="GtkButton" id="conversations_back">
                 <property name="receives_default">False</property>
@@ -144,8 +144,8 @@
     </child>
     <child>
       <object class="ComponentsConversationHeaderBar" id="conversation_header">
-        <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
-        <property name="folded" bind-source="MainToolbar" bind-property="folded" bind-flags="sync-create"/>
+        <property name="show_close_button" bind-source="ComponentsMainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
+        <property name="folded" bind-source="ComponentsMainToolbar" bind-property="folded" bind-flags="sync-create"/>
       </object>
       <packing>
         <property name="name">conversation</property>
@@ -160,7 +160,7 @@
     </headerbars>
   </object>
   <object class="HdyHeaderGroup" id="header_group">
-    <property name="decorate-all" bind-source="MainToolbar" bind-property="folded" bind-flags="sync-create"/>
+    <property name="decorate-all" bind-source="ComponentsMainToolbar" bind-property="folded" bind-flags="sync-create"/>
     <headerbars>
       <headerbar name="conversations_header_group"/>
       <headerbar name="conversation_header"/>
diff --git a/ui/org.gnome.Geary.gresource.xml b/ui/org.gnome.Geary.gresource.xml
index 891ab1c8..24b9803f 100644
--- a/ui/org.gnome.Geary.gresource.xml
+++ b/ui/org.gnome.Geary.gresource.xml
@@ -21,6 +21,8 @@
     <file compressed="true" preprocess="xml-stripblanks">components-inspector-error-view.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-inspector-log-view.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-inspector-system-view.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">components-main-toolbar.ui</file>
+    <file compressed="true" preprocess="xml-stripblanks">components-main-toolbar-menus.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-placeholder-pane.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">composer-editor.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">composer-editor-menus.ui</file>
@@ -41,8 +43,6 @@
     <file compressed="true" preprocess="xml-stripblanks">find_bar.glade</file>
     <file compressed="true" preprocess="xml-stripblanks">folder-popover.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">main-toolbar.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">main-toolbar-menus.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">password-dialog.glade</file>
     <file compressed="true" preprocess="xml-stripblanks">problem-details-dialog.ui</file>
     <file compressed="true">signature-web-view.js</file>

From 0aa8ad6a057342f701510f12d9147b693ae75f05 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sat, 10 Apr 2021 02:34:38 +1000
Subject: [PATCH 02/16] client: Convert from shared conversation action widget
 to use multiple

Convert Components.ConversationActions to a widget that encapsulates
selectively visible conversations action groups. Use multiple instances
of that in preference to a single shared instance that gets re-parented
as the responsive UI adjusts.

Flatten the custom widget hierarchy a bit by merging the
`ConversationActionBar` and `ConversationHeaderbar` widgets into
`MainToolbar` itself.
---
 po/POTFILES.in                                |   3 -
 .../application/application-main-window.vala  |  89 +++--
 .../components-conversation-action-bar.vala   |  38 --
 .../components-conversation-actions.vala      |  91 ++---
 .../components-conversation-header-bar.vala   |  71 ----
 .../components/components-main-toolbar.vala   |  44 +--
 src/client/meson.build                        |   2 -
 ui/application-main-window.ui                 |  33 +-
 ui/components-conversation-action-bar.ui      |  34 --
 ui/components-conversation-actions.ui         | 337 +++++++++---------
 ui/components-conversation-header-bar.ui      |  33 --
 ui/components-main-toolbar.ui                 |  61 +++-
 ui/geary.css                                  |   8 +
 ui/org.gnome.Geary.gresource.xml              |   2 -
 14 files changed, 372 insertions(+), 474 deletions(-)
 delete mode 100644 src/client/components/components-conversation-action-bar.vala
 delete mode 100644 src/client/components/components-conversation-header-bar.vala
 delete mode 100644 ui/components-conversation-action-bar.ui
 delete mode 100644 ui/components-conversation-header-bar.ui

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8d6c52b2..d8301ec4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -38,7 +38,6 @@ src/client/application/secret-mediator.vala
 src/client/client-action.vala
 src/client/components/components-attachment-pane.vala
 src/client/components/components-conversation-actions.vala
-src/client/components/components-conversation-action-bar.vala
 src/client/components/components-entry-undo.vala
 src/client/components/components-in-app-notification.vala
 src/client/components/components-info-bar-stack.vala
@@ -458,8 +457,6 @@ ui/components-attachment-pane.ui
 ui/components-attachment-pane-menus.ui
 ui/components-attachment-view.ui
 ui/components-conversation-actions.ui
-ui/components-conversation-action-bar.ui
-ui/components-conversation-header-bar.ui
 ui/components-in-app-notification.ui
 ui/components-info-bar.ui
 ui/components-inspector-error-view.ui
diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 76e0c898..d47a1569 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -307,9 +307,6 @@ public class Application.MainWindow :
     public ConversationListView conversation_list_view  { get; private set; }
     public ConversationViewer conversation_viewer { get; private set; }
 
-    // Actions in the Conversation HeaderBar or ActionBar
-    private Components.ConversationActions conversation_actions;
-
     public Components.InfoBarStack conversation_list_info_bars {
         get; private set; default = new Components.InfoBarStack(PRIORITY_QUEUE);
     }
@@ -344,12 +341,18 @@ public class Application.MainWindow :
     [GtkChild] private unowned Gtk.Box main_layout;
     [GtkChild] private unowned Hdy.Leaflet main_leaflet;
     [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
+
     [GtkChild] private unowned Gtk.Box folder_box;
     [GtkChild] private unowned Gtk.ScrolledWindow folder_list_scrolled;
+
     [GtkChild] private unowned Gtk.Box conversation_list_box;
     [GtkChild] private unowned Gtk.ScrolledWindow conversation_list_scrolled;
+    [GtkChild] private unowned Gtk.Revealer conversation_list_actions_revealer;
+    [GtkChild] private unowned Components.ConversationActions conversation_list_actions;
+
     [GtkChild] private unowned Gtk.Box conversation_viewer_box;
-    [GtkChild] private unowned Components.ConversationActionBar conversation_viewer_action_bar;
+    [GtkChild] private unowned Gtk.Revealer conversation_viewer_actions_revealer;
+    [GtkChild] private unowned Components.ConversationActions conversation_viewer_actions;
     [GtkChild] private unowned Gtk.SizeGroup folder_size_group;
     [GtkChild] private unowned Gtk.SizeGroup folder_separator_size_group;
     [GtkChild] private unowned Gtk.SizeGroup conversations_size_group;
@@ -360,8 +363,6 @@ public class Application.MainWindow :
 
     [GtkChild] private unowned Gtk.Overlay overlay;
 
-    private Components.ConversationActionBar action_bar;
-
     private Components.InfoBarStack info_bars =
         new Components.InfoBarStack(SINGLE);
 
@@ -758,11 +759,9 @@ public class Application.MainWindow :
                 this.folder_list.deselect_folder();
             }
 
-            update_conversation_actions(NONE);
             update_title();
-            this.conversation_actions.update_trash_button(
-                !this.is_shift_down && this.selected_folder_supports_trash
-            );
+            update_conversation_actions(NONE);
+            update_trash_action();
 
             this.conversation_viewer.show_loading();
             this.previous_selection_was_interactive = is_interactive;
@@ -1293,19 +1292,8 @@ public class Application.MainWindow :
         this.conversation_viewer_box.add(this.conversation_viewer);
 
 
-        // Setup conversation actions
-        this.conversation_actions = new Components.ConversationActions();
-        this.conversation_actions.move_folder_menu.folder_selected.connect(on_move_conversation);
-        this.conversation_actions.copy_folder_menu.folder_selected.connect(on_copy_conversation);
-        this.conversation_actions.bind_property("find-open",
-                                                this.conversation_viewer.conversation_find_bar,
-                                                "search-mode-enabled",
-                                                BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
-
         // Main toolbar
-        this.main_toolbar = new Components.MainToolbar(
-            config, conversation_viewer_action_bar
-        );
+        this.main_toolbar = new Components.MainToolbar(config);
         this.main_toolbar.add_to_size_groups(this.folder_size_group,
                                              this.folder_separator_size_group,
                                              this.conversations_size_group,
@@ -1313,8 +1301,16 @@ public class Application.MainWindow :
                                              this.conversation_size_group);
         this.main_toolbar.add_to_swipe_groups(this.conversations_swipe_group,
                                               this.conversation_swipe_group);
-        this.main_toolbar.bind_property("search-open", this.search_bar, "search-mode-enabled",
-            BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
+        this.main_toolbar.bind_property(
+            "search-open",
+            this.search_bar, "search-mode-enabled",
+            SYNC_CREATE | BIDIRECTIONAL
+        );
+        this.main_toolbar.bind_property(
+            "find-open",
+            this.conversation_viewer.conversation_find_bar, "search-mode-enabled",
+            SYNC_CREATE | BIDIRECTIONAL
+        );
         if (config.desktop_environment == UNITY) {
             this.main_toolbar.show_close_button = false;
             this.main_layout.pack_start(main_toolbar, false, true, 0);
@@ -1322,8 +1318,6 @@ public class Application.MainWindow :
             this.main_layout.pack_start(main_toolbar, false, true, 0);
         }
 
-        this.main_toolbar.add_conversation_actions(this.conversation_actions);
-
         this.main_layout.pack_start(this.info_bars, false, true, 0);
 
         // Status bar
@@ -1333,12 +1327,6 @@ public class Application.MainWindow :
         this.spinner.set_progress_monitor(progress_monitor);
         this.status_bar.add(this.spinner);
         this.status_bar.show_all();
-
-        // Action bar
-        this.action_bar = new Components.ConversationActionBar();
-        this.conversation_list_box.add_with_properties(action_bar,
-                                                       "pack-type", Gtk.PackType.END,
-                                                       "position", 0);
     }
 
     /** {@inheritDoc} */
@@ -1538,7 +1526,9 @@ public class Application.MainWindow :
         // setting it again.
         this.conversation_list_view.select_conversations(to_select);
 
-        this.conversation_actions.selected_conversations = to_select.size;
+        this.conversation_list_actions.selected_conversations = to_select.size;
+        this.main_toolbar.conversation_actions.selected_conversations = to_select.size;
+
         if (this.selected_folder != null && !this.has_composer) {
             switch(to_select.size) {
             case 0:
@@ -1772,18 +1762,27 @@ public class Application.MainWindow :
 
         this.update_context_dependent_actions.begin(sensitive);
         switch (count) {
-            case NONE:
-                    conversation_actions.take_ownership(null);
-                break;
-            case SINGLE:
-                this.main_toolbar.add_conversation_actions(this.conversation_actions);
-                break;
-            case MULTIPLE:
-                this.action_bar.add_conversation_actions(this.conversation_actions);
-                break;
+        case NONE:
+            this.conversation_list_actions_revealer.reveal_child = false;
+            break;
+        case SINGLE:
+            this.conversation_list_actions_revealer.reveal_child = false;
+            break;
+        case MULTIPLE:
+            this.conversation_list_actions_revealer.reveal_child = true;
+            break;
         }
     }
 
+    private void update_trash_action() {
+        var show_trash = (
+            !this.is_shift_down &&
+            this.selected_folder_supports_trash
+        );
+        this.conversation_list_actions.update_trash_button(show_trash);
+        this.main_toolbar.conversation_actions.update_trash_button(show_trash);
+    }
+
     private async void update_context_dependent_actions(bool sensitive) {
         // Cancel any existing update that is running
         this.action_update_cancellable.cancel();
@@ -1837,9 +1836,7 @@ public class Application.MainWindow :
 
     private void set_shift_key_down(bool down) {
         this.is_shift_down = down;
-        this.conversation_actions.update_trash_button(
-            !down && this.selected_folder_supports_trash
-        );
+        update_trash_action();
     }
 
     private inline void check_shift_event(Gdk.EventKey event) {
@@ -1866,7 +1863,7 @@ public class Application.MainWindow :
                     conversations_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
                     focus = this.conversation_list_view;
                 } else {
-                    if (this.conversation_actions.selected_conversations == 1 &&
+                    if (this.conversation_list_view.get_selected().size == 1 &&
                         this.selected_folder.properties.email_total > 0) {
                         main_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
                         focus = this.conversation_viewer.visible_child;
diff --git a/src/client/components/components-conversation-action-bar.vala b/src/client/components/components-conversation-action-bar.vala
deleted file mode 100644
index 4b4cfacc..00000000
--- a/src/client/components/components-conversation-action-bar.vala
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright © 2016 Software Freedom Conservancy Inc.
- * Copyright © 2020 Purism SPC
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-// Draws the conversation action bar.
-[GtkTemplate (ui = "/org/gnome/Geary/components-conversation-action-bar.ui")]
-public class Components.ConversationActionBar : Gtk.Revealer {
-
-
-    [GtkChild] public unowned Gtk.Box action_box { get; }
-
-    private ulong owner_notify;
-
-
-    /**
-     * This takes ownership of the ConversationActions and places some of
-     * the buttons into the ActionBar.
-     */
-    public void add_conversation_actions(Components.ConversationActions actions) {
-        if (actions.owner == this)
-            return;
-
-        actions.take_ownership(this);
-        action_box.pack_start(actions.mark_copy_move_buttons, false, false);
-        action_box.pack_end(actions.archive_trash_delete_buttons, false, false);
-        reveal_child = true;
-        this.owner_notify = actions.notify["owner"].connect(() => {
-            if (actions.owner != this) {
-                reveal_child = false;
-                actions.disconnect (this.owner_notify);
-            }
-        });
-    }
-}
diff --git a/src/client/components/components-conversation-actions.vala b/src/client/components/components-conversation-actions.vala
index 91b1268c..51e6a145 100644
--- a/src/client/components/components-conversation-actions.vala
+++ b/src/client/components/components-conversation-actions.vala
@@ -1,34 +1,37 @@
-/* Copyright 2017 Software Freedom Conservancy Inc.
+/*
+ * Copyright © 2017 Software Freedom Conservancy Inc.
+ * Copyright © 2021 Michael Gratton <mike@vee.net>
  *
  * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
+ * (version 2.1 or later). See the COPYING file in this distribution.
  */
 
 /**
- * Container for actions for a conversation generally placed into the ActionBar or HeaderBar
- * The user of the actions needs to take ownership before they can place the actions in a container
+ * A container of conversation-related actions.
  */
-public class Components.ConversationActions : GLib.Object {
-    public Gtk.Widget? owner { get; private set; }
-    // Copy and Move popovers
+[GtkTemplate (ui = "/org/gnome/Geary/components-conversation-actions.ui")]
+public class Components.ConversationActions : Gtk.Box {
+
+    public bool show_conversation_actions { get; construct; }
+
+    public bool show_response_actions { get; construct; }
+
     public FolderPopover copy_folder_menu { get; private set; default = new FolderPopover(); }
+
     public FolderPopover move_folder_menu { get; private set; default = new FolderPopover(); }
-    // How many conversations are selected right now. Should automatically be updated.
+
     public int selected_conversations { get; set; }
-    public bool find_open { get; set; }
 
-    public Gtk.Box mark_copy_move_buttons { get; private set; }
-    public Gtk.MenuButton mark_message_button { get; private set; }
-    public Gtk.MenuButton copy_message_button { get; private set; }
-    public Gtk.MenuButton move_message_button { get; private set; }
+    [GtkChild] private unowned Gtk.Box response_buttons { get; }
 
-    public Gtk.Box reply_forward_buttons { get; private set; }
+    [GtkChild] private unowned Gtk.Box mark_copy_move_buttons { get; }
+    [GtkChild] private unowned Gtk.MenuButton mark_message_button { get; }
+    [GtkChild] private unowned Gtk.MenuButton copy_message_button { get;  }
+    [GtkChild] private unowned Gtk.MenuButton move_message_button { get;  }
 
-    public Gtk.Box archive_trash_delete_buttons { get; private set; }
-    private Gtk.Button archive_button;
-    private Gtk.Button trash_delete_button;
-
-    public Gtk.ToggleButton find_button { get; private set; }
+    [GtkChild] private unowned Gtk.Box archive_trash_delete_buttons { get; }
+    [GtkChild] private unowned Gtk.Button archive_button;
+    [GtkChild] private unowned Gtk.Button trash_delete_button;
 
     private bool show_trash_button = true;
 
@@ -36,47 +39,29 @@ public class Components.ConversationActions : GLib.Object {
     private Gtk.Image trash_image = new Gtk.Image.from_icon_name("user-trash-symbolic", Gtk.IconSize.MENU);
     private Gtk.Image delete_image = new Gtk.Image.from_icon_name("edit-delete-symbolic", Gtk.IconSize.MENU);
 
-    public ConversationActions() {
-        Gtk.Builder builder =
-            new Gtk.Builder.from_resource("/org/gnome/Geary/components-conversation-actions.ui");
+    static construct {
+        set_css_name("components-conversation-actions");
+    }
+
+    // GObject style constuction to support loading via GTK Builder files
+    construct {
+
         // Assemble the mark menus
-        Gtk.Builder menu_builder =
-            new Gtk.Builder.from_resource("/org/gnome/Geary/components-main-toolbar-menus.ui");
-        MenuModel mark_menu = (MenuModel) menu_builder.get_object("mark_message_menu");
+        Gtk.Builder menu_builder = new Gtk.Builder.from_resource(
+            "/org/gnome/Geary/components-main-toolbar-menus.ui"
+        );
+        GLib.MenuModel mark_menu = (MenuModel) menu_builder.get_object(
+            "mark_message_menu"
+        );
 
-        this.mark_copy_move_buttons = (Gtk.Box) builder.get_object("mark_copy_move_buttons");
-        this.mark_message_button = (Gtk.MenuButton) builder.get_object("mark_message_button");
-        this.copy_message_button = (Gtk.MenuButton) builder.get_object("copy_message_button");
-        this.move_message_button = (Gtk.MenuButton) builder.get_object("move_message_button");
-
-        this.reply_forward_buttons = (Gtk.Box) builder.get_object("reply_forward_buttons");
-
-        this.archive_trash_delete_buttons = (Gtk.Box) builder.get_object("archive_trash_delete_buttons");
-        this.archive_button = (Gtk.Button) builder.get_object("archive_button");
-        this.trash_delete_button = (Gtk.Button) builder.get_object("trash_delete_button");
-
-        this.find_button = (Gtk.ToggleButton) builder.get_object("find_button");
-
-        this.bind_property("find-open", this.find_button, "active",
-                           BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
         this.notify["selected-conversations"].connect(() => update_conversation_buttons());
         this.mark_message_button.popover = new Gtk.Popover.from_model(null, mark_menu);
         this.copy_message_button.popover = copy_folder_menu;
         this.move_message_button.popover = move_folder_menu;
-    }
 
-    /** Sets the new owner and removes the previous owner and parents of the single actions */
-    public void take_ownership(Gtk.Widget? new_owner) {
-        remove_parent(mark_copy_move_buttons);
-        remove_parent(reply_forward_buttons);
-        remove_parent(archive_trash_delete_buttons);
-        remove_parent(find_button);
-        owner = new_owner;
-    }
-
-    private void remove_parent (Gtk.Widget widget) {
-        if (widget.parent != null)
-            widget.parent.remove(widget);
+        this.response_buttons.set_visible(this.show_response_actions);
+        this.mark_copy_move_buttons.set_visible(this.show_conversation_actions);
+        this.archive_trash_delete_buttons.set_visible(this.show_conversation_actions);
     }
 
     public void update_trash_button(bool show_trash) {
diff --git a/src/client/components/components-conversation-header-bar.vala b/src/client/components/components-conversation-header-bar.vala
deleted file mode 100644
index 202cf7c4..00000000
--- a/src/client/components/components-conversation-header-bar.vala
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright © 2020 Purism SPC
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
-[GtkTemplate (ui = "/org/gnome/Geary/components-conversation-header-bar.ui")]
-public class Components.ConversationHeaderBar : Hdy.HeaderBar {
-    public Components.ConversationActionBar action_bar { get; set; }
-    public bool folded { get; set; }
-
-    private ulong owner_notify;
-    private Gtk.Widget? reply_forward_buttons;
-    private Gtk.Widget? archive_trash_delete_buttons;
-
-    public ConversationHeaderBar() {
-    }
-
-    public override void size_allocate(Gtk.Allocation allocation) {
-        update_action_bar();
-        base.size_allocate(allocation);
-    }
-
-    [GtkCallback]
-    private void update_action_bar () {
-        /* Only show the action_bar when the conversation_header is shown */
-        if (parent == null)
-            action_bar.reveal_child = false;
-        else if (reply_forward_buttons != null && archive_trash_delete_buttons != null)
-            if (action_bar.reveal_child && get_allocated_width() > 600) {
-                action_bar.reveal_child = false;
-                remove_action_parent();
-                pack_start(reply_forward_buttons);
-                pack_end(archive_trash_delete_buttons);
-            } else if (!action_bar.reveal_child && get_allocated_width() < 600) {
-                remove_action_parent();
-                action_bar.action_box.pack_start(reply_forward_buttons, false, false);
-                action_bar.action_box.pack_end(archive_trash_delete_buttons, false, false);
-                action_bar.reveal_child = true;
-            }
-    }
-
-    private void remove_action_parent() {
-        if (reply_forward_buttons != null && reply_forward_buttons.parent != null)
-            reply_forward_buttons.parent.remove(reply_forward_buttons);
-        if (archive_trash_delete_buttons != null && archive_trash_delete_buttons.parent != null)
-            archive_trash_delete_buttons.parent.remove(archive_trash_delete_buttons);
-    }
-
-    public void add_conversation_actions(Components.ConversationActions actions) {
-        if (actions.owner != this) {
-            actions.take_ownership(this);
-            pack_start(actions.mark_copy_move_buttons);
-            pack_end(actions.find_button);   
-
-            reply_forward_buttons = actions.reply_forward_buttons;
-            archive_trash_delete_buttons = actions.archive_trash_delete_buttons;
-            action_bar.reveal_child = get_allocated_width() > 600;
-            update_action_bar();
-            this.owner_notify = actions.notify["owner"].connect(() => {
-                if (actions.owner != this) {
-                    action_bar.reveal_child = false;
-                    reply_forward_buttons = null;
-                    archive_trash_delete_buttons = null;
-                    actions.disconnect (this.owner_notify);
-                }
-            });
-        }
-    }
-}
diff --git a/src/client/components/components-main-toolbar.vala b/src/client/components/components-main-toolbar.vala
index 32ad5eea..1edf9d4f 100644
--- a/src/client/components/components-main-toolbar.vala
+++ b/src/client/components/components-main-toolbar.vala
@@ -14,20 +14,18 @@
 [GtkTemplate (ui = "/org/gnome/Geary/components-main-toolbar.ui")]
 public class Components.MainToolbar : Hdy.Leaflet {
 
-    // How wide the left pane should be. Auto-synced with our settings
-    public int left_pane_width { get; set; }
 
-    // Used to form the title of the folder header
     public string account { get; set; }
+
     public string folder { get; set; }
 
-    // Close button settings
     public bool show_close_button { get; set; default = true; }
 
-    // Search bar
     public bool search_open { get; set; default = false; }
 
-    private ConversationActionBar conversation_viewer_action_bar;
+    public bool find_open { get; set; default = false; }
+
+    [GtkChild] public unowned ConversationActions conversation_actions;
 
     [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
 
@@ -37,36 +35,42 @@ public class Components.MainToolbar : Hdy.Leaflet {
 
     [GtkChild] private unowned Gtk.Separator folder_separator;
 
-    // Conversations header elements
+    // Conversation list header elements
     [GtkChild] private unowned Hdy.HeaderBar conversations_header;
-    [GtkChild] private unowned Gtk.ToggleButton search_conversations_button;
+    [GtkChild] private unowned Gtk.ToggleButton search_button;
 
     [GtkChild] private unowned Gtk.Separator conversations_separator;
 
-    // Conversation header elements
-    [GtkChild] private unowned ConversationHeaderBar conversation_header;
+    // Conversation viewer header elements
+    [GtkChild] private unowned Hdy.HeaderBar conversation_header;
+    [GtkChild] private unowned Gtk.ToggleButton find_button;
 
     [GtkChild] private unowned Hdy.HeaderGroup header_group;
 
-    Gtk.SizeGroup conversation_group;
+    private Gtk.SizeGroup conversation_group;
 
-    public MainToolbar(Application.Configuration config,
-                       ConversationActionBar action_bar) {
+
+    public MainToolbar(Application.Configuration config) {
         if (config.desktop_environment != UNITY) {
             this.bind_property("account", this.conversations_header, "title", BindingFlags.SYNC_CREATE);
             this.bind_property("folder", this.conversations_header, "subtitle", BindingFlags.SYNC_CREATE);
         }
-        this.conversation_viewer_action_bar = action_bar;
-        this.conversation_header.action_bar = action_bar;
 
         // Assemble the main/mark menus
         Gtk.Builder builder = new Gtk.Builder.from_resource("/org/gnome/Geary/components-main-toolbar-menus.ui");
         MenuModel main_menu = (MenuModel) builder.get_object("main_menu");
 
-        // Setup folder header elements
         this.main_menu_button.popover = new Gtk.Popover.from_model(null, main_menu);
-        this.bind_property("search-open", this.search_conversations_button, "active",
-            BindingFlags.SYNC_CREATE | BindingFlags.BIDIRECTIONAL);
+        this.bind_property(
+            "search-open",
+            this.search_button, "active",
+            SYNC_CREATE | BIDIRECTIONAL
+        );
+        this.bind_property(
+            "find-open",
+            this.find_button, "active",
+            SYNC_CREATE | BIDIRECTIONAL
+        );
     }
 
     public void set_conversation_header(Hdy.HeaderBar header) {
@@ -107,10 +111,6 @@ public class Components.MainToolbar : Hdy.Leaflet {
         conversation_group.add_swipeable(this);
     }
 
-    public void add_conversation_actions(ConversationActions actions) {
-        conversation_header.add_conversation_actions(actions);
-    }
-
     public void show_main_menu() {
         this.main_menu_button.clicked();
     }
diff --git a/src/client/meson.build b/src/client/meson.build
index 7262580b..ff3c8a6d 100644
--- a/src/client/meson.build
+++ b/src/client/meson.build
@@ -47,8 +47,6 @@ client_vala_sources = files(
 
   'components/components-attachment-pane.vala',
   'components/components-conversation-actions.vala',
-  'components/components-conversation-action-bar.vala',
-  'components/components-conversation-header-bar.vala',
   'components/components-entry-undo.vala',
   'components/components-info-bar-stack.vala',
   'components/components-info-bar.vala',
diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index d54d365a..371accea 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -98,6 +98,27 @@
                             <property name="position">1</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="GtkRevealer" id="conversation_list_actions_revealer">
+                            <property name="visible">True</property>
+                            <property name="reveal-child">True</property>
+                            <property name="transition_type">slide-up</property>
+                            <child>
+                              <object class="ComponentsConversationActions" id="conversation_list_actions">
+                                <property name="visible">True</property>
+                                <property name="show_conversation_actions">True</property>
+                                <property name="show_response_actions">False</property>
+                                <property name="hexpand">True</property>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="pack_type">end</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                       </object>
                       <packing>
                         <property name="name">conversations</property>
@@ -125,8 +146,18 @@
                     <property name="visible">True</property>
                     <property name="orientation">vertical</property>
                     <child>
-                      <object class="ComponentsConversationActionBar" id="conversation_viewer_action_bar">
+                      <object class="GtkRevealer" id="conversation_viewer_actions_revealer">
                         <property name="visible">True</property>
+                        <property name="reveal-child">True</property>
+                        <property name="transition_type">slide-up</property>
+                        <child>
+                          <object class="ComponentsConversationActions" id="conversation_viewer_actions">
+                            <property name="visible">True</property>
+                            <property name="show_conversation_actions">False</property>
+                            <property name="show_response_actions">True</property>
+                            <property name="hexpand">True</property>
+                          </object>
+                        </child>
                       </object>
                       <packing>
                         <property name="pack_type">end</property>
diff --git a/ui/components-conversation-action-bar.ui b/ui/components-conversation-action-bar.ui
deleted file mode 100644
index 74daca48..00000000
--- a/ui/components-conversation-action-bar.ui
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="archive_image">
-    <property name="visible">True</property>
-    <property name="icon_name">mail-archive-symbolic</property>
-  </object>
-  <template class="ComponentsConversationActionBar" parent="GtkRevealer">
-    <property name="visible">True</property>
-    <property name="transition_type">slide-up</property>
-    <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="hexpand">True</property>
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkSeparator">
-            <property name="visible">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox" id="action_box">
-            <property name="visible">True</property>
-            <property name="hexpand">True</property>
-            <property name="margin_top">6</property>
-            <property name="margin_bottom">6</property>
-            <property name="margin_start">6</property>
-            <property name="margin_end">6</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/ui/components-conversation-actions.ui b/ui/components-conversation-actions.ui
index f1423bdf..a64dfbd8 100644
--- a/ui/components-conversation-actions.ui
+++ b/ui/components-conversation-actions.ui
@@ -1,200 +1,213 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.22.1 -->
 <interface>
-    <requires lib="gtk+" version="3.20"/>
-    <object class="GtkBox" id="mark_copy_move_buttons">
+  <requires lib="gtk+" version="3.20"/>
+  <template class="ComponentsConversationActions" parent="GtkBox">
+    <property name="visible">True</property>
+    <property name="spacing">6</property>
+    <child>
+      <object class="GtkBox" id="response_buttons">
         <property name="visible">True</property>
         <child>
-            <object class="GtkMenuButton" id="mark_message_button">
+          <object class="GtkButton" id="reply_sender_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Reply</property>
+            <property name="action_name">win.reply-conversation</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="reply_sender_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="mark_message_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">marker-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-            </packing>
+                <property name="icon_name">mail-reply-sender-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
-            <object class="GtkMenuButton" id="copy_message_button">
+          <object class="GtkButton" id="reply_all_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Reply All</property>
+            <property name="action_name">win.reply-all-conversation</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="reply_all_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="copy_message_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">tag-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-            </packing>
+                <property name="icon_name">mail-reply-all-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
-            <object class="GtkMenuButton" id="move_message_button">
+          <object class="GtkButton" id="forward_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Forward</property>
+            <property name="action_name">win.forward-conversation</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="forward_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="move_message_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">folder-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-            </packing>
+                <property name="icon_name">mail-forward-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
         </child>
         <style>
-            <class name="raised"/>
-            <class name="linked"/>
+          <class name="raised"/>
+          <class name="linked"/>
         </style>
-    </object>
-    <object class="GtkBox" id="reply_forward_buttons">
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkBox" id="mark_copy_move_buttons">
         <property name="visible">True</property>
         <child>
-            <object class="GtkButton" id="reply_sender_button">
+          <object class="GtkMenuButton" id="mark_message_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="mark_message_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Reply</property>
-                <property name="action_name">win.reply-conversation</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="reply_sender_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">mail-reply-sender-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-            </packing>
+                <property name="icon_name">marker-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
-            <object class="GtkButton" id="reply_all_button">
+          <object class="GtkMenuButton" id="copy_message_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="copy_message_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Reply All</property>
-                <property name="action_name">win.reply-all-conversation</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="reply_all_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">mail-reply-all-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-            </packing>
+                <property name="icon_name">tag-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
         <child>
-            <object class="GtkButton" id="forward_button">
+          <object class="GtkMenuButton" id="move_message_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="move_message_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="tooltip_text" translatable="yes">Forward</property>
-                <property name="action_name">win.forward-conversation</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="forward_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">mail-forward-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">2</property>
-            </packing>
+                <property name="icon_name">folder-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
         </child>
         <style>
-            <class name="raised"/>
-            <class name="linked"/>
+          <class name="raised"/>
+          <class name="linked"/>
         </style>
-    </object>
-    <object class="GtkImage" id="archive_image">
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkImage" id="archive_image">
         <property name="visible">True</property>
         <property name="icon_name">mail-archive-symbolic</property>
-    </object>
-    <object class="GtkBox" id="archive_trash_delete_buttons">
+      </object>
+      <object class="GtkBox" id="archive_trash_delete_buttons">
         <property name="visible">True</property>
         <child>
-            <object class="GtkButton" id="archive_button">
-                <property name="label" translatable="yes">_Archive</property>
-                <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="action_name">win.archive-conversation</property>
-                <property name="image">archive_image</property>
-                <property name="use_underline">True</property>
-                <property name="always_show_image">True</property>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">0</property>
-            </packing>
+          <object class="GtkButton" id="archive_button">
+            <property name="label" translatable="yes">_Archive</property>
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="action_name">win.archive-conversation</property>
+            <property name="image">archive_image</property>
+            <property name="use_underline">True</property>
+            <property name="always_show_image">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
-            <object class="GtkButton" id="trash_delete_button">
+          <object class="GtkButton" id="trash_delete_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="action_name">win.trash-conversation</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="trash_delete_image">
                 <property name="visible">True</property>
-                <property name="focus_on_click">False</property>
-                <property name="receives_default">False</property>
-                <property name="action_name">win.trash-conversation</property>
-                <property name="always_show_image">True</property>
-                <child>
-                    <object class="GtkImage" id="trash_delete_image">
-                        <property name="visible">True</property>
-                        <property name="icon_name">user-trash-symbolic</property>
-                    </object>
-                </child>
-            </object>
-            <packing>
-                <property name="expand">False</property>
-                <property name="fill">True</property>
-                <property name="position">1</property>
-            </packing>
+                <property name="icon_name">user-trash-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
         </child>
         <style>
-            <class name="raised"/>
-            <class name="linked"/>
+          <class name="raised"/>
+          <class name="linked"/>
         </style>
-    </object>
-    <object class="GtkToggleButton" id="find_button">
-        <property name="visible">True</property>
-        <property name="focus_on_click">False</property>
-        <property name="receives_default">False</property>
-        <property name="tooltip_text" translatable="yes">Toggle find bar</property>
-        <property name="always_show_image">True</property>
-        <child>
-            <object class="GtkImage" id="find_image">
-                <property name="visible">True</property>
-                <property name="icon_name">preferences-system-search-symbolic</property>
-            </object>
-        </child>
-    </object>
+      </object>
+      <packing>
+        <property name="pack_type">end</property>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </template>
 </interface>
diff --git a/ui/components-conversation-header-bar.ui b/ui/components-conversation-header-bar.ui
deleted file mode 100644
index 965f1262..00000000
--- a/ui/components-conversation-header-bar.ui
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <requires lib="gtk+" version="3.20"/>
-  <template class="ComponentsConversationHeaderBar" parent="HdyHeaderBar">
-    <property name="visible">True</property>
-    <property name="hexpand">True</property>
-    <signal name="notify::parent" handler="update_action_bar" swapped="no"/>
-    <child>
-      <object class="GtkButton" id="conversation_back">
-        <property name="receives_default">False</property>
-        <property name="valign">center</property>
-        <property name="use-underline">True</property>
-        <property name="visible" bind-property="folded" bind-source="ComponentsConversationHeaderBar" bind-flags="sync-create"/>
-        <property name="action_name">win.navigation-back</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="a11y-conversation-back">
-            <property name="accessible-name" translatable="yes">Back</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage" id="conversation_back_image">
-            <property name="visible">True</property>
-            <property name="icon_name">go-previous-symbolic</property>
-            <property name="icon_size">1</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
diff --git a/ui/components-main-toolbar.ui b/ui/components-main-toolbar.ui
index 95c80838..00104224 100644
--- a/ui/components-main-toolbar.ui
+++ b/ui/components-main-toolbar.ui
@@ -2,10 +2,6 @@
 <!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
-  <object class="GtkImage" id="archive_image">
-    <property name="visible">True</property>
-    <property name="icon_name">mail-archive-symbolic</property>
-  </object>
   <template class="ComponentsMainToolbar" parent="HdyLeaflet">
     <property name="visible">True</property>
     <property name="can_swipe_back">True</property>
@@ -102,7 +98,7 @@
               </object>
             </child>
             <child>
-              <object class="GtkToggleButton" id="search_conversations_button">
+              <object class="GtkToggleButton" id="search_button">
                 <property name="visible">True</property>
                 <property name="focus_on_click">False</property>
                 <property name="receives_default">False</property>
@@ -143,9 +139,60 @@
       </packing>
     </child>
     <child>
-      <object class="ComponentsConversationHeaderBar" id="conversation_header">
+      <object class="HdyHeaderBar" id="conversation_header">
+        <property name="visible">True</property>
+        <property name="hexpand">True</property>
         <property name="show_close_button" bind-source="ComponentsMainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
-        <property name="folded" bind-source="ComponentsMainToolbar" bind-property="folded" bind-flags="sync-create"/>
+        <child>
+          <object class="GtkButton" id="conversation_back">
+            <property name="receives_default">False</property>
+            <property name="valign">center</property>
+            <property name="use-underline">True</property>
+            <property name="visible" bind-source="ComponentsMainToolbar" bind-property="folded" bind-flags="sync-create"/>
+            <property name="action_name">win.navigation-back</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-conversation-back">
+                <property name="accessible-name" translatable="yes">Back</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="conversation_back_image">
+                <property name="visible">True</property>
+                <property name="icon_name">go-previous-symbolic</property>
+                <property name="icon_size">1</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <child>
+          <object class="ComponentsConversationActions" id="conversation_actions">
+            <property name="visible">True</property>
+            <property name="show_conversation_actions">True</property>
+            <property name="show_response_actions">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkToggleButton" id="find_button">
+            <property name="visible">True</property>
+            <property name="focus_on_click">False</property>
+            <property name="receives_default">False</property>
+            <property name="tooltip_text" translatable="yes">Toggle find bar</property>
+            <property name="always_show_image">True</property>
+            <child>
+              <object class="GtkImage" id="find_image">
+                <property name="visible">True</property>
+                <property name="icon_name">preferences-system-search-symbolic</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="name">conversation</property>
diff --git a/ui/geary.css b/ui/geary.css
index 00428138..3c8045a7 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -18,6 +18,10 @@
   min-width: 250px;
 }
 
+geary-conversation-list revealer {
+  margin: 6px;
+}
+
 .geary-conversation-frame > border {
   border-left-width: 0;
   border-top-width: 0;
@@ -56,6 +60,10 @@ infobar flowboxchild {
 	padding: 0px;
 }
 
+revealer components-conversation-actions {
+  margin: 6px;
+}
+
 /* FolderPopover */
 
 row.geary-folder-popover-list-row {
diff --git a/ui/org.gnome.Geary.gresource.xml b/ui/org.gnome.Geary.gresource.xml
index 24b9803f..57b977a3 100644
--- a/ui/org.gnome.Geary.gresource.xml
+++ b/ui/org.gnome.Geary.gresource.xml
@@ -12,8 +12,6 @@
     <file compressed="true" preprocess="xml-stripblanks">components-attachment-pane.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-attachment-pane-menus.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-attachment-view.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">components-conversation-header-bar.ui</file>
-    <file compressed="true" preprocess="xml-stripblanks">components-conversation-action-bar.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-conversation-actions.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-in-app-notification.ui</file>
     <file compressed="true" preprocess="xml-stripblanks">components-info-bar.ui</file>

From 9e641600c3ce69a9bf58bb7d9d9f3570775c0e59 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sat, 10 Apr 2021 21:23:39 +1000
Subject: [PATCH 03/16] client: Convert to using HdySqueezer for managing main
 toolbar actions

---
 .../application/application-main-window.vala   |  6 ++++--
 .../components/components-main-toolbar.vala    |  3 ++-
 ui/components-main-toolbar.ui                  | 18 +++++++++++++++---
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index d47a1569..d124c583 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -1527,7 +1527,8 @@ public class Application.MainWindow :
         this.conversation_list_view.select_conversations(to_select);
 
         this.conversation_list_actions.selected_conversations = to_select.size;
-        this.main_toolbar.conversation_actions.selected_conversations = to_select.size;
+        this.main_toolbar.full_actions.selected_conversations = to_select.size;
+        this.main_toolbar.compact_actions.selected_conversations = to_select.size;
 
         if (this.selected_folder != null && !this.has_composer) {
             switch(to_select.size) {
@@ -1780,7 +1781,8 @@ public class Application.MainWindow :
             this.selected_folder_supports_trash
         );
         this.conversation_list_actions.update_trash_button(show_trash);
-        this.main_toolbar.conversation_actions.update_trash_button(show_trash);
+        this.main_toolbar.full_actions.update_trash_button(show_trash);
+        this.main_toolbar.compact_actions.update_trash_button(show_trash);
     }
 
     private async void update_context_dependent_actions(bool sensitive) {
diff --git a/src/client/components/components-main-toolbar.vala b/src/client/components/components-main-toolbar.vala
index 1edf9d4f..98a62730 100644
--- a/src/client/components/components-main-toolbar.vala
+++ b/src/client/components/components-main-toolbar.vala
@@ -25,7 +25,8 @@ public class Components.MainToolbar : Hdy.Leaflet {
 
     public bool find_open { get; set; default = false; }
 
-    [GtkChild] public unowned ConversationActions conversation_actions;
+    [GtkChild] public unowned ConversationActions full_actions;
+    [GtkChild] public unowned ConversationActions compact_actions;
 
     [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
 
diff --git a/ui/components-main-toolbar.ui b/ui/components-main-toolbar.ui
index 00104224..f593803b 100644
--- a/ui/components-main-toolbar.ui
+++ b/ui/components-main-toolbar.ui
@@ -168,10 +168,22 @@
           </object>
         </child>
         <child>
-          <object class="ComponentsConversationActions" id="conversation_actions">
+          <object class="HdySqueezer">
             <property name="visible">True</property>
-            <property name="show_conversation_actions">True</property>
-            <property name="show_response_actions">True</property>
+            <child>
+              <object class="ComponentsConversationActions" id="full_actions">
+                <property name="visible">True</property>
+                <property name="show_conversation_actions">True</property>
+                <property name="show_response_actions">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="ComponentsConversationActions" id="compact_actions">
+                <property name="visible">True</property>
+                <property name="show_conversation_actions">True</property>
+                <property name="show_response_actions">False</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>

From 4eefe3013eaa8cf19f44f12e3e321a0cf6ec663a Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sat, 10 Apr 2021 21:23:59 +1000
Subject: [PATCH 04/16] client: Fix packing of Component.ConversationActions

---
 .../components-conversation-actions.vala      |  8 ++++-
 ui/application-main-window.ui                 |  2 +-
 ui/components-conversation-actions.ui         | 30 ++++++-------------
 ui/components-main-toolbar.ui                 |  5 ++--
 4 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/client/components/components-conversation-actions.vala b/src/client/components/components-conversation-actions.vala
index 51e6a145..8c2fa32a 100644
--- a/src/client/components/components-conversation-actions.vala
+++ b/src/client/components/components-conversation-actions.vala
@@ -16,6 +16,8 @@ public class Components.ConversationActions : Gtk.Box {
 
     public bool show_response_actions { get; construct; }
 
+    public bool pack_justified { get; construct; }
+
     public FolderPopover copy_folder_menu { get; private set; default = new FolderPopover(); }
 
     public FolderPopover move_folder_menu { get; private set; default = new FolderPopover(); }
@@ -45,7 +47,6 @@ public class Components.ConversationActions : Gtk.Box {
 
     // GObject style constuction to support loading via GTK Builder files
     construct {
-
         // Assemble the mark menus
         Gtk.Builder menu_builder = new Gtk.Builder.from_resource(
             "/org/gnome/Geary/components-main-toolbar-menus.ui"
@@ -62,6 +63,11 @@ public class Components.ConversationActions : Gtk.Box {
         this.response_buttons.set_visible(this.show_response_actions);
         this.mark_copy_move_buttons.set_visible(this.show_conversation_actions);
         this.archive_trash_delete_buttons.set_visible(this.show_conversation_actions);
+
+        if (this.pack_justified) {
+            this.archive_trash_delete_buttons.hexpand = true;
+            this.archive_trash_delete_buttons.halign = END;
+        }
     }
 
     public void update_trash_button(bool show_trash) {
diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index 371accea..f9c35b65 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -108,6 +108,7 @@
                                 <property name="visible">True</property>
                                 <property name="show_conversation_actions">True</property>
                                 <property name="show_response_actions">False</property>
+                                <property name="pack_justified">True</property>
                                 <property name="hexpand">True</property>
                               </object>
                             </child>
@@ -155,7 +156,6 @@
                             <property name="visible">True</property>
                             <property name="show_conversation_actions">False</property>
                             <property name="show_response_actions">True</property>
-                            <property name="hexpand">True</property>
                           </object>
                         </child>
                       </object>
diff --git a/ui/components-conversation-actions.ui b/ui/components-conversation-actions.ui
index a64dfbd8..5471d284 100644
--- a/ui/components-conversation-actions.ui
+++ b/ui/components-conversation-actions.ui
@@ -3,6 +3,7 @@
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <template class="ComponentsConversationActions" parent="GtkBox">
+    <property name="orientation">horizontal</property>
     <property name="visible">True</property>
     <property name="spacing">6</property>
     <child>
@@ -25,7 +26,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -46,7 +47,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -67,7 +68,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -76,11 +77,6 @@
           <class name="linked"/>
         </style>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">0</property>
-      </packing>
     </child>
     <child>
       <object class="GtkBox" id="mark_copy_move_buttons">
@@ -100,7 +96,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -119,7 +115,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -138,7 +134,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">2</property>
           </packing>
         </child>
@@ -147,11 +143,6 @@
           <class name="linked"/>
         </style>
       </object>
-      <packing>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
-      </packing>
     </child>
     <child>
       <object class="GtkImage" id="archive_image">
@@ -173,7 +164,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">0</property>
           </packing>
         </child>
@@ -193,7 +184,7 @@
           </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">True</property>
+            <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -204,9 +195,6 @@
       </object>
       <packing>
         <property name="pack_type">end</property>
-        <property name="expand">False</property>
-        <property name="fill">True</property>
-        <property name="position">1</property>
       </packing>
     </child>
   </template>
diff --git a/ui/components-main-toolbar.ui b/ui/components-main-toolbar.ui
index f593803b..0b2dfb10 100644
--- a/ui/components-main-toolbar.ui
+++ b/ui/components-main-toolbar.ui
@@ -167,9 +167,10 @@
             </child>
           </object>
         </child>
-        <child>
-          <object class="HdySqueezer">
+        <child type="title">
+          <object class="HdySqueezer" id="actions_squeezer">
             <property name="visible">True</property>
+            <property name="hexpand">True</property>
             <child>
               <object class="ComponentsConversationActions" id="full_actions">
                 <property name="visible">True</property>

From 78b3fddb6f5b9d1708b13c064679358ab4c19fb4 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 10:39:56 +1000
Subject: [PATCH 05/16] client: Rename main window leafets and their children

Make them a bit easier to reason about.
---
 .../application/application-main-window.vala  | 65 +++++++++++--------
 ui/application-main-window.ui                 | 20 +++---
 2 files changed, 49 insertions(+), 36 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index d124c583..15e88222 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -71,10 +71,17 @@ public class Application.MainWindow :
         { ACTION_ZOOM, on_zoom, "s" },
     };
 
-    private const int STATUS_BAR_HEIGHT = 18;
-    private const int UPDATE_UI_INTERVAL = 60;
-    private const int MIN_CONVERSATION_COUNT = 50;
+    // Handy leaflet children names
+    private const string INNER_LEAFLET = "inner_leaflet";
+    private const string FOLDER_LIST = "folder_list";
+    private const string CONVERSATION_LIST = "conversation_list";
+    private const string CONVERSATION_VIEWER = "conversation_viewer";
 
+    private const int STATUS_BAR_HEIGHT = 18;
+
+    private const int UPDATE_UI_INTERVAL = 60;
+
+    private const int MIN_CONVERSATION_COUNT = 50;
 
     static construct {
         // Set up default keybindings
@@ -339,8 +346,12 @@ public class Application.MainWindow :
 
 
     [GtkChild] private unowned Gtk.Box main_layout;
-    [GtkChild] private unowned Hdy.Leaflet main_leaflet;
-    [GtkChild] private unowned Hdy.Leaflet conversations_leaflet;
+
+    // Folds the inner leaftlet and conversation viewer
+    [GtkChild] private unowned Hdy.Leaflet outer_leaflet;
+
+    // Folds the folder list and the conversation list
+    [GtkChild] private unowned Hdy.Leaflet inner_leaflet;
 
     [GtkChild] private unowned Gtk.Box folder_box;
     [GtkChild] private unowned Gtk.ScrolledWindow folder_list_scrolled;
@@ -892,11 +903,11 @@ public class Application.MainWindow :
 
     /** Shows the appopriate window menu, if any. */
     public void show_window_menu() {
-        if (this.main_leaflet.folded) {
-            this.main_leaflet.navigate(Hdy.NavigationDirection.BACK);
+        if (this.outer_leaflet.folded) {
+            this.outer_leaflet.navigate(Hdy.NavigationDirection.BACK);
         }
-        if (this.conversations_leaflet.folded) {
-            this.conversations_leaflet.navigate(Hdy.NavigationDirection.BACK);
+        if (this.inner_leaflet.folded) {
+            this.inner_leaflet.navigate(Hdy.NavigationDirection.BACK);
         }
         this.main_toolbar.show_main_menu();
     }
@@ -948,7 +959,7 @@ public class Application.MainWindow :
                 this.conversation_viewer.do_compose(composer);
             }
             // Show the correct leaflet
-            this.main_leaflet.set_visible_child_name("conversation");
+            this.outer_leaflet.set_visible_child_name(CONVERSATION_VIEWER);
         }
     }
 
@@ -1857,17 +1868,17 @@ public class Application.MainWindow :
     private void focus_next_pane() {
         var focus = get_focus();
 
-        if (main_leaflet.folded) {
-            if (main_leaflet.visible_child_name == "conversations") {
-                if (conversations_leaflet.folded &&
-                    conversations_leaflet.visible_child_name == "folder" ||
+        if (this.outer_leaflet.folded) {
+            if (this.outer_leaflet.visible_child_name == INNER_LEAFLET) {
+                if (this.inner_leaflet.folded &&
+                    this.inner_leaflet.visible_child_name == FOLDER_LIST ||
                     focus == this.folder_list) {
-                    conversations_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
+                    this.inner_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
                     focus = this.conversation_list_view;
                 } else {
                     if (this.conversation_list_view.get_selected().size == 1 &&
                         this.selected_folder.properties.email_total > 0) {
-                        main_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
+                        this.outer_leaflet.navigate(Hdy.NavigationDirection.FORWARD);
                         focus = this.conversation_viewer.visible_child;
                     }
                 }
@@ -1895,11 +1906,11 @@ public class Application.MainWindow :
     private void focus_previous_pane() {
         var focus = get_focus();
 
-        if (main_leaflet.folded) {
-            if (main_leaflet.visible_child_name == "conversations") {
-                if (conversations_leaflet.folded) {
-                    if (conversations_leaflet.visible_child_name == "conversations") {
-                        conversations_leaflet.navigate(Hdy.NavigationDirection.BACK);
+        if (this.outer_leaflet.folded) {
+            if (this.outer_leaflet.visible_child_name == INNER_LEAFLET) {
+                if (this.inner_leaflet.folded) {
+                    if (this.inner_leaflet.visible_child_name == CONVERSATION_LIST) {
+                        this.inner_leaflet.navigate(Hdy.NavigationDirection.BACK);
                         focus = this.folder_list;
                     }
                 } else {
@@ -1909,7 +1920,7 @@ public class Application.MainWindow :
                         focus = this.conversation_list_view;
                 }
             } else {
-                main_leaflet.navigate(Hdy.NavigationDirection.BACK);
+                this.outer_leaflet.navigate(Hdy.NavigationDirection.BACK);
                 focus = this.conversation_list_view;
             }
         } else if (focus != null) {
@@ -2013,11 +2024,12 @@ public class Application.MainWindow :
     }
 
     [GtkCallback]
-    private void on_main_leaflet_visible_child_changed() {
-        if (main_leaflet.child_transition_running)
+    private void on_outer_leaflet_visible_child_changed() {
+        if (this.outer_leaflet.child_transition_running)
             return;
 
-        if (main_leaflet.visible_child_name == "conversations" && main_leaflet.folded)
+        if (this.outer_leaflet.visible_child_name == INNER_LEAFLET &&
+            this.outer_leaflet.folded)
             if (this.conversation_viewer.current_composer != null) {
                 this.conversation_viewer.current_composer.activate_close_action();
             }
@@ -2230,8 +2242,9 @@ public class Application.MainWindow :
 
     private void on_conversation_activated(Geary.App.Conversation activated, bool single) {
         if (single) {
-            if (main_leaflet.folded)
+            if (this.outer_leaflet.folded) {
                 focus_next_pane();
+            }
         } else if (this.selected_folder != null) {
             if (this.selected_folder.used_as != DRAFTS) {
                 this.application.new_window.begin(
diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index f9c35b65..5b96e961 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -18,14 +18,14 @@
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <child>
-              <object class="HdyLeaflet" id="main_leaflet">
+              <object class="HdyLeaflet" id="outer_leaflet">
                 <property name="visible">True</property>
                 <property name="can_swipe_back">True</property>
                 <property name="transition_type">over</property>
-                <signal name="notify::visible-child" handler="on_main_leaflet_visible_child_changed" swapped="no"/>
-                <signal name="notify::child-transition-running" handler="on_main_leaflet_visible_child_changed" swapped="no"/>
+                <signal name="notify::visible-child" handler="on_outer_leaflet_visible_child_changed" swapped="no"/>
+                <signal name="notify::child-transition-running" handler="on_outer_leaflet_visible_child_changed" swapped="no"/>
                 <child>
-                  <object class="HdyLeaflet" id="conversations_leaflet">
+                  <object class="HdyLeaflet" id="inner_leaflet">
                     <property name="visible">True</property>
                     <property name="hexpand_set">True</property>
                     <property name="can_swipe_back">True</property>
@@ -57,7 +57,7 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="name">folder</property>
+                        <property name="name">folder_list</property>
                       </packing>
                     </child>
                     <child>
@@ -122,12 +122,12 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="name">conversations</property>
+                        <property name="name">conversation_list</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
-                    <property name="name">conversations</property>
+                    <property name="name">inner_leaflet</property>
                   </packing>
                 </child>
                 <child>
@@ -165,7 +165,7 @@
                     </child>
                   </object>
                   <packing>
-                    <property name="name">conversation</property>
+                    <property name="name">conversation_viewer</property>
                   </packing>
                 </child>
               </object>
@@ -222,12 +222,12 @@
   </object>
   <object class="HdySwipeGroup" id="conversations_swipe_group">
     <swipeables>
-      <swipeable name="conversations_leaflet"/>
+      <swipeable name="inner_leaflet"/>
     </swipeables>
   </object>
   <object class="HdySwipeGroup" id="conversation_swipe_group">
     <swipeables>
-      <swipeable name="main_leaflet"/>
+      <swipeable name="outer_leaflet"/>
     </swipeables>
   </object>
 </interface>

From ef4269e18b8977e1a2d6db8e279071e71faf6b5f Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 11:21:55 +1000
Subject: [PATCH 06/16] client: Add convenience accessors for conversation
 list/viewer being shown

---
 .../application/application-main-window.vala  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 15e88222..ec441619 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -282,6 +282,29 @@ public class Application.MainWindow :
         get; private set; default = null;
     }
 
+    /** Specifies if the conversation list is currently displayed. */
+    public bool is_conversation_list_shown {
+        get {
+            return (
+                (!this.outer_leaflet.folded ||
+                 this.outer_leaflet.visible_child_name == INNER_LEAFLET) &&
+                (!this.inner_leaflet.folded ||
+                 this.inner_leaflet.visible_child_name == CONVERSATION_LIST)
+            );
+        }
+    }
+
+    /** Specifies if the conversation viewer is currently displayed. */
+    public bool is_conversation_viewer_shown {
+        get {
+            return (
+                (!this.outer_leaflet.folded ||
+                 this.outer_leaflet.visible_child_name == CONVERSATION_VIEWER) &&
+                !this.has_composer
+            );
+        }
+    }
+
     /** The attachment manager for this window. */
     public AttachmentManager attachments { get; private set; }
 

From 5aea0ad10f10cd812f9eb1348f7e5f9a8519c093 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 11:20:04 +1000
Subject: [PATCH 07/16] client: Invoke the correct menu for move or copy
 shortcuts

---
 .../application/application-main-window.vala   | 18 ++++++++++++++++--
 .../components-conversation-actions.vala       |  8 ++++++++
 .../components/components-main-toolbar.vala    |  8 ++++++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index ec441619..41f02235 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -2332,11 +2332,25 @@ public class Application.MainWindow :
     }
 
     private void on_show_copy_menu() {
-        this.conversation_actions.copy_message_button.clicked();
+        if (this.is_conversation_list_shown &&
+            this.conversation_list_actions_revealer.child_revealed) {
+            this.conversation_list_actions.show_copy_menu();
+        } else if (this.is_conversation_viewer_shown) {
+            this.main_toolbar.shown_actions.show_copy_menu();
+        } else {
+            this.error_bell();
+        }
     }
 
     private void on_show_move_menu() {
-        this.conversation_actions.move_message_button.clicked();
+        if (this.is_conversation_list_shown &&
+            this.conversation_list_actions_revealer.child_revealed) {
+            this.conversation_list_actions.show_move_menu();
+        } else if (this.is_conversation_viewer_shown) {
+            this.main_toolbar.shown_actions.show_move_menu();
+        } else {
+            this.error_bell();
+        }
     }
 
     private void on_conversation_up() {
diff --git a/src/client/components/components-conversation-actions.vala b/src/client/components/components-conversation-actions.vala
index 8c2fa32a..a9e17c58 100644
--- a/src/client/components/components-conversation-actions.vala
+++ b/src/client/components/components-conversation-actions.vala
@@ -70,6 +70,14 @@ public class Components.ConversationActions : Gtk.Box {
         }
     }
 
+    public void show_copy_menu() {
+        this.copy_message_button.clicked();
+    }
+
+    public void show_move_menu() {
+        this.move_message_button.clicked();
+    }
+
     public void update_trash_button(bool show_trash) {
         this.show_trash_button = show_trash;
         update_conversation_buttons();
diff --git a/src/client/components/components-main-toolbar.vala b/src/client/components/components-main-toolbar.vala
index 98a62730..90e6f79d 100644
--- a/src/client/components/components-main-toolbar.vala
+++ b/src/client/components/components-main-toolbar.vala
@@ -1,5 +1,6 @@
 /*
  * Copyright © 2017 Software Freedom Conservancy Inc.
+ * Copyright © 2021 Michael Gratton <mike@vee.net>
  *
  * This software is licensed under the GNU Lesser General Public License
  * (version 2.1 or later). See the COPYING file in this distribution.
@@ -25,6 +26,12 @@ public class Components.MainToolbar : Hdy.Leaflet {
 
     public bool find_open { get; set; default = false; }
 
+    public ConversationActions shown_actions {
+        get {
+            return (ConversationActions) this.actions_squeezer.visible_child;
+        }
+    }
+
     [GtkChild] public unowned ConversationActions full_actions;
     [GtkChild] public unowned ConversationActions compact_actions;
 
@@ -44,6 +51,7 @@ public class Components.MainToolbar : Hdy.Leaflet {
 
     // Conversation viewer header elements
     [GtkChild] private unowned Hdy.HeaderBar conversation_header;
+    [GtkChild] private unowned Hdy.Squeezer actions_squeezer;
     [GtkChild] private unowned Gtk.ToggleButton find_button;
 
     [GtkChild] private unowned Hdy.HeaderGroup header_group;

From dbb9cc35e8ba1d6f0ba7702b898794146b5e46b3 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 11:58:55 +1000
Subject: [PATCH 08/16] client: Simplify main window outer leaflet state change
 handling

---
 .../application/application-main-window.vala  | 27 ++++++++++++-------
 ui/application-main-window.ui                 |  4 +--
 2 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 41f02235..14c0ab98 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -282,6 +282,18 @@ public class Application.MainWindow :
         get; private set; default = null;
     }
 
+    /** Specifies if the conversation list is currently displayed. */
+    public bool is_folder_list_shown {
+        get {
+            return (
+                (!this.outer_leaflet.folded ||
+                 this.outer_leaflet.visible_child_name == INNER_LEAFLET) &&
+                (!this.inner_leaflet.folded ||
+                 this.inner_leaflet.visible_child_name == FOLDER_LIST)
+            );
+        }
+    }
+
     /** Specifies if the conversation list is currently displayed. */
     public bool is_conversation_list_shown {
         get {
@@ -2047,15 +2059,12 @@ public class Application.MainWindow :
     }
 
     [GtkCallback]
-    private void on_outer_leaflet_visible_child_changed() {
-        if (this.outer_leaflet.child_transition_running)
-            return;
-
-        if (this.outer_leaflet.visible_child_name == INNER_LEAFLET &&
-            this.outer_leaflet.folded)
-            if (this.conversation_viewer.current_composer != null) {
-                this.conversation_viewer.current_composer.activate_close_action();
-            }
+    private void on_outer_leaflet_changed() {
+        if (this.has_composer &&
+            this.outer_leaflet.folded &&
+            (this.is_folder_list_shown || this.is_conversation_list_shown)) {
+            close_composer(false, false);
+        }
     }
 
     private void on_offline_infobar_response() {
diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index 5b96e961..4c3c71ec 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -22,8 +22,8 @@
                 <property name="visible">True</property>
                 <property name="can_swipe_back">True</property>
                 <property name="transition_type">over</property>
-                <signal name="notify::visible-child" handler="on_outer_leaflet_visible_child_changed" swapped="no"/>
-                <signal name="notify::child-transition-running" handler="on_outer_leaflet_visible_child_changed" swapped="no"/>
+                <signal name="notify::folded" handler="on_outer_leaflet_changed" swapped="no"/>
+                <signal name="notify::visible-child" handler="on_outer_leaflet_changed" swapped="no"/>
                 <child>
                   <object class="HdyLeaflet" id="inner_leaflet">
                     <property name="visible">True</property>

From d695f5b5fefdb6d24c6b171f3861bec1b0687f78 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 12:00:35 +1000
Subject: [PATCH 09/16] client: Ensure conversation list action bar shown when
 main window folded

---
 .../application/application-main-window.vala  | 26 +++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index 14c0ab98..b2cefcfa 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -262,7 +262,19 @@ public class Application.MainWindow :
     }
 
 
-    private enum ConversationCount { NONE, SINGLE, MULTIPLE; }
+    private enum ConversationCount {
+        NONE, SINGLE, MULTIPLE;
+
+        public static ConversationCount for_size(int size) {
+            return (
+                size == 0
+                ? NONE
+                : size == 1
+                ? SINGLE
+                : MULTIPLE
+            );
+        }
+    }
 
 
     /** Returns the window's associated client application instance. */
@@ -1808,12 +1820,18 @@ public class Application.MainWindow :
         );
 
         this.update_context_dependent_actions.begin(sensitive);
+        update_conversation_list_actions_revealer(count);
+    }
+
+    private void update_conversation_list_actions_revealer(ConversationCount count) {
         switch (count) {
         case NONE:
             this.conversation_list_actions_revealer.reveal_child = false;
             break;
         case SINGLE:
-            this.conversation_list_actions_revealer.reveal_child = false;
+            this.conversation_list_actions_revealer.reveal_child = (
+                this.outer_leaflet.folded
+            );
             break;
         case MULTIPLE:
             this.conversation_list_actions_revealer.reveal_child = true;
@@ -2060,6 +2078,10 @@ public class Application.MainWindow :
 
     [GtkCallback]
     private void on_outer_leaflet_changed() {
+        int selected = this.conversation_list_view.get_selected().size;
+        update_conversation_list_actions_revealer(
+            ConversationCount.for_size(selected)
+        );
         if (this.has_composer &&
             this.outer_leaflet.folded &&
             (this.is_folder_list_shown || this.is_conversation_list_shown)) {

From f097252e463565128cb5b7b1b72fb6dc5330e839 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 12:28:32 +1000
Subject: [PATCH 10/16] Client: Only show conversation viewer's actions when
 needed

The conversation viewer's actions are only needed when the main
toolbar's compact actions are being shown.
---
 src/client/application/application-main-window.vala | 9 ++++++++-
 src/client/components/components-main-toolbar.vala  | 4 ++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index b2cefcfa..e711d7c0 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -410,7 +410,6 @@ public class Application.MainWindow :
 
     [GtkChild] private unowned Gtk.Box conversation_viewer_box;
     [GtkChild] private unowned Gtk.Revealer conversation_viewer_actions_revealer;
-    [GtkChild] private unowned Components.ConversationActions conversation_viewer_actions;
     [GtkChild] private unowned Gtk.SizeGroup folder_size_group;
     [GtkChild] private unowned Gtk.SizeGroup folder_separator_size_group;
     [GtkChild] private unowned Gtk.SizeGroup conversations_size_group;
@@ -1369,6 +1368,14 @@ public class Application.MainWindow :
             this.conversation_viewer.conversation_find_bar, "search-mode-enabled",
             SYNC_CREATE | BIDIRECTIONAL
         );
+        this.main_toolbar.notify["shown-actions"].connect(
+            () => {
+                this.conversation_viewer_actions_revealer.reveal_child = (
+                    this.main_toolbar.shown_actions ==
+                    this.main_toolbar.compact_actions
+                );
+            }
+        );
         if (config.desktop_environment == UNITY) {
             this.main_toolbar.show_close_button = false;
             this.main_layout.pack_start(main_toolbar, false, true, 0);
diff --git a/src/client/components/components-main-toolbar.vala b/src/client/components/components-main-toolbar.vala
index 90e6f79d..a66e9888 100644
--- a/src/client/components/components-main-toolbar.vala
+++ b/src/client/components/components-main-toolbar.vala
@@ -80,6 +80,10 @@ public class Components.MainToolbar : Hdy.Leaflet {
             this.find_button, "active",
             SYNC_CREATE | BIDIRECTIONAL
         );
+
+        this.actions_squeezer.notify["visible-child"].connect_after(
+            () => { notify_property("shown-actions"); }
+        );
     }
 
     public void set_conversation_header(Hdy.HeaderBar header) {

From b7458dc24f80f5afe2d0986c7011cb4952b19972 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Sun, 11 Apr 2021 16:51:15 +1000
Subject: [PATCH 11/16] client: Ensure all folder-based conversation actions
 get updated

---
 .../application/application-main-window.vala  | 67 ++++++++++++-------
 .../components-conversation-actions.vala      | 12 +++-
 2 files changed, 53 insertions(+), 26 deletions(-)

diff --git a/src/client/application/application-main-window.vala b/src/client/application/application-main-window.vala
index e711d7c0..d37f8eff 100644
--- a/src/client/application/application-main-window.vala
+++ b/src/client/application/application-main-window.vala
@@ -420,6 +420,9 @@ public class Application.MainWindow :
 
     [GtkChild] private unowned Gtk.Overlay overlay;
 
+    private Components.ConversationActions[] folder_conversation_actions = {};
+    private FolderPopover[] folder_popovers = {};
+
     private Components.InfoBarStack info_bars =
         new Components.InfoBarStack(SINGLE);
 
@@ -770,12 +773,9 @@ public class Application.MainWindow :
             // selected model.
 
             if (this.selected_folder != null) {
-                this.conversation_actions.copy_folder_menu.enable_disable_folder(
-                    this.selected_folder, true
-                );
-                this.conversation_actions.move_folder_menu.enable_disable_folder(
-                    this.selected_folder, true
-                );
+                foreach (var menu in this.folder_popovers) {
+                    menu.enable_disable_folder(this.selected_folder, true);
+                }
 
                 this.progress_monitor.remove(this.selected_folder.opening_monitor);
                 this.selected_folder.properties.notify.disconnect(update_headerbar);
@@ -856,12 +856,9 @@ public class Application.MainWindow :
                 this.conversation_list_view.set_model(conversations_model);
 
                 // disable copy/move to the new folder
-                this.conversation_actions.copy_folder_menu.enable_disable_folder(
-                    to_select, false
-                );
-                this.conversation_actions.move_folder_menu.enable_disable_folder(
-                    to_select, false
-                );
+                foreach (var menu in this.folder_popovers) {
+                    menu.enable_disable_folder(to_select, false);
+                }
 
                 yield open_conversation_monitor(this.conversations, cancellable);
                 yield this.controller.process_pending_composers();
@@ -1176,8 +1173,9 @@ public class Application.MainWindow :
         foreach (var context in to_add) {
             this.folder_list.add_folder(context);
             if (context.folder.account == this.selected_account) {
-                this.conversation_actions.copy_folder_menu.add_folder(context.folder);
-                this.conversation_actions.move_folder_menu.add_folder(context.folder);
+                foreach (var menu in this.folder_popovers) {
+                    menu.add_folder(context.folder);
+                }
             }
             context.folder.use_changed.connect(on_use_changed);
         }
@@ -1197,8 +1195,9 @@ public class Application.MainWindow :
 
             folder.use_changed.disconnect(on_use_changed);
             if (folder.account == this.selected_account) {
-                this.conversation_actions.copy_folder_menu.remove_folder(folder);
-                this.conversation_actions.move_folder_menu.remove_folder(folder);
+                foreach (var menu in this.folder_popovers) {
+                    menu.remove_folder(folder);
+                }
             }
             this.folder_list.remove_folder(context);
         }
@@ -1348,7 +1347,6 @@ public class Application.MainWindow :
         this.conversation_size_group.add_widget(this.conversation_viewer);
         this.conversation_viewer_box.add(this.conversation_viewer);
 
-
         // Main toolbar
         this.main_toolbar = new Components.MainToolbar(config);
         this.main_toolbar.add_to_size_groups(this.folder_size_group,
@@ -1392,6 +1390,21 @@ public class Application.MainWindow :
         this.spinner.set_progress_monitor(progress_monitor);
         this.status_bar.add(this.spinner);
         this.status_bar.show_all();
+
+        this.folder_conversation_actions = {
+            this.main_toolbar.full_actions,
+            this.main_toolbar.compact_actions,
+            this.conversation_list_actions
+        };
+        foreach (var actions in folder_conversation_actions) {
+            var move = actions.move_folder_menu;
+            this.folder_popovers += move;
+            move.folder_selected.connect(on_move_conversation);
+
+            var copy = actions.copy_folder_menu;
+            this.folder_popovers += copy;
+            copy.folder_selected.connect(on_copy_conversation);
+        }
     }
 
     /** {@inheritDoc} */
@@ -1559,17 +1572,19 @@ public class Application.MainWindow :
     private void select_account(Geary.Account? account) {
         if (this.selected_account != account) {
             if (this.selected_account != null) {
-                this.conversation_actions.copy_folder_menu.clear();
-                this.conversation_actions.move_folder_menu.clear();
+                foreach (var menu in this.folder_popovers) {
+                    menu.clear();
+                }
             }
 
             this.selected_account = account;
             this.search_bar.set_account(account);
 
             if (account != null) {
-                foreach (Geary.Folder folder in account.list_folders()) {
-                    this.conversation_actions.copy_folder_menu.add_folder(folder);
-                    this.conversation_actions.move_folder_menu.add_folder(folder);
+                foreach (var menu in this.folder_popovers) {
+                    foreach (var folder in account.list_folders()) {
+                        menu.add_folder(folder);
+                    }
                 }
             }
 
@@ -1807,14 +1822,18 @@ public class Application.MainWindow :
         bool move_enabled = (
             sensitive && (selected_folder is Geary.FolderSupport.Move)
         );
-        this.conversation_actions.move_message_button.set_sensitive(move_enabled);
         get_window_action(ACTION_SHOW_MOVE_MENU).set_enabled(move_enabled);
+        foreach (var actions in this.folder_conversation_actions) {
+            actions.set_move_sensitive(move_enabled);
+        }
 
         bool copy_enabled = (
             sensitive && (selected_folder is Geary.FolderSupport.Copy)
         );
-        this.conversation_actions.copy_message_button.set_sensitive(copy_enabled);
         get_window_action(ACTION_SHOW_COPY_MENU).set_enabled(move_enabled);
+        foreach (var actions in this.folder_conversation_actions) {
+            actions.set_copy_sensitive(copy_enabled);
+        }
 
         get_window_action(ACTION_ARCHIVE_CONVERSATION).set_enabled(
             sensitive && (selected_folder is Geary.FolderSupport.Archive)
diff --git a/src/client/components/components-conversation-actions.vala b/src/client/components/components-conversation-actions.vala
index a9e17c58..f7df39fb 100644
--- a/src/client/components/components-conversation-actions.vala
+++ b/src/client/components/components-conversation-actions.vala
@@ -70,14 +70,22 @@ public class Components.ConversationActions : Gtk.Box {
         }
     }
 
-    public void show_copy_menu() {
-        this.copy_message_button.clicked();
+    public void set_move_sensitive(bool is_sensitive) {
+        this.move_message_button.sensitive = is_sensitive;
     }
 
     public void show_move_menu() {
         this.move_message_button.clicked();
     }
 
+    public void set_copy_sensitive(bool is_sensitive) {
+        this.copy_message_button.sensitive = is_sensitive;
+    }
+
+    public void show_copy_menu() {
+        this.copy_message_button.clicked();
+    }
+
     public void update_trash_button(bool show_trash) {
         this.show_trash_button = show_trash;
         update_conversation_buttons();

From c53063496ca3a133e0fcbf8549d3de4130cec381 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 12 Apr 2021 15:43:55 +0200
Subject: [PATCH 12/16] style: Style conversation action bars

Make them look a bit more like action bars by giving them a top border.
---
 ui/geary.css | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ui/geary.css b/ui/geary.css
index 3c8045a7..0f42c927 100644
--- a/ui/geary.css
+++ b/ui/geary.css
@@ -61,7 +61,9 @@ infobar flowboxchild {
 }
 
 revealer components-conversation-actions {
-  margin: 6px;
+  border: solid @borders;
+  border-top-width: 1px;
+  padding: 6px;
 }
 
 /* FolderPopover */

From b75a7f3baeb76560ee0632bb7e9a6dd34d3256d9 Mon Sep 17 00:00:00 2001
From: Adrien Plazas <kekun.plazas@laposte.net>
Date: Mon, 12 Apr 2021 15:52:03 +0200
Subject: [PATCH 13/16] conversation-actions: Keep the reply buttons in the
 headerbar

Move the other buttons to the actionbar is the window is too narrow.
---
 ui/application-main-window.ui | 4 ++--
 ui/components-main-toolbar.ui | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index 4c3c71ec..47036213 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -154,8 +154,8 @@
                         <child>
                           <object class="ComponentsConversationActions" id="conversation_viewer_actions">
                             <property name="visible">True</property>
-                            <property name="show_conversation_actions">False</property>
-                            <property name="show_response_actions">True</property>
+                            <property name="show_conversation_actions">True</property>
+                            <property name="show_response_actions">False</property>
                           </object>
                         </child>
                       </object>
diff --git a/ui/components-main-toolbar.ui b/ui/components-main-toolbar.ui
index 0b2dfb10..0a87acec 100644
--- a/ui/components-main-toolbar.ui
+++ b/ui/components-main-toolbar.ui
@@ -181,8 +181,8 @@
             <child>
               <object class="ComponentsConversationActions" id="compact_actions">
                 <property name="visible">True</property>
-                <property name="show_conversation_actions">True</property>
-                <property name="show_response_actions">False</property>
+                <property name="show_conversation_actions">False</property>
+                <property name="show_response_actions">True</property>
               </object>
             </child>
           </object>

From eb9cdb0c383ebf076d0c76956362d3e91aff5c9a Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Tue, 13 Apr 2021 18:13:13 +1000
Subject: [PATCH 14/16] client: Fix conversation viewer actions visible when
 unfolded at startup

Both leaflets are unfolded by default, and fold down if the window is
too small, hence the conversation list's and viewer's action bar
revealers must be hidden by default to match,
---
 ui/application-main-window.ui | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/application-main-window.ui b/ui/application-main-window.ui
index 47036213..289c6013 100644
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@@ -101,7 +101,7 @@
                         <child>
                           <object class="GtkRevealer" id="conversation_list_actions_revealer">
                             <property name="visible">True</property>
-                            <property name="reveal-child">True</property>
+                            <property name="reveal-child">False</property>
                             <property name="transition_type">slide-up</property>
                             <child>
                               <object class="ComponentsConversationActions" id="conversation_list_actions">
@@ -149,7 +149,7 @@
                     <child>
                       <object class="GtkRevealer" id="conversation_viewer_actions_revealer">
                         <property name="visible">True</property>
-                        <property name="reveal-child">True</property>
+                        <property name="reveal-child">False</property>
                         <property name="transition_type">slide-up</property>
                         <child>
                           <object class="ComponentsConversationActions" id="conversation_viewer_actions">

From a5d6ec03e5e7908c6e87d1de8457b856ed857f66 Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Tue, 13 Apr 2021 18:58:26 +1000
Subject: [PATCH 15/16] build: Bump libhandy requirement to 1.2.1

Needed to fix a conversation header bar spacing issue.

See GNOME/libhandy#431
---
 meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meson.build b/meson.build
index 99913845..85ec18a4 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@ icu_uc = dependency('icu-uc', version: '>=60')
 iso_codes = dependency('iso-codes')
 javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
 json_glib = dependency('json-glib-1.0', version: '>= 1.0')
-libhandy = dependency('libhandy-1', version: '>= 1.2')
+libhandy = dependency('libhandy-1', version: '>= 1.2.1')
 libmath = cc.find_library('m')
 libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
 libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')

From 11882a1055412199c26c12ca8932467910b6df2f Mon Sep 17 00:00:00 2001
From: Michael Gratton <mike@vee.net>
Date: Tue, 13 Apr 2021 19:08:39 +1000
Subject: [PATCH 16/16] build: Pull in libhandy as a submodule until 1.2.1 is
 packaged

---
 .gitlab-ci.yml            |  2 ++
 meson.build               | 22 +++++++++++++++++++++-
 org.gnome.Geary.json      | 18 ++++++++++++++++++
 org.gnome.Geary.yaml      | 13 +++++++++++++
 src/meson.build           |  9 ++++++++-
 subprojects/libhandy.wrap |  5 +++++
 6 files changed, 67 insertions(+), 2 deletions(-)
 create mode 100644 subprojects/libhandy.wrap

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2b02d93e..13f5defc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -29,6 +29,7 @@ variables:
     libappstream-glib-devel libgee-devel libhandy1-devel libicu-devel
     libpeas-devel libsecret-devel libstemmer-devel libunwind-devel
     libxml2-devel libytnef-devel sqlite-devel webkitgtk4-devel
+    git
   FEDORA_TEST_DEPS: glibc-langpack-en gnutls-utils tar Xvfb xz
 
   # Ubuntu packages
@@ -40,6 +41,7 @@ variables:
     libhandy-1-dev libicu-dev libjson-glib-dev libmessaging-menu-dev
     libpeas-dev libsecret-1-dev libsqlite3-dev libstemmer-dev
     libunwind-dev libwebkit2gtk-4.0-dev libxml2-dev libytnef0-dev
+    git ca-certificates
   UBUNTU_TEST_DEPS: gnutls-bin librsvg2-common locales xauth xvfb
 
 fedora:
diff --git a/meson.build b/meson.build
index 85ec18a4..5d826918 100644
--- a/meson.build
+++ b/meson.build
@@ -89,7 +89,7 @@ icu_uc = dependency('icu-uc', version: '>=60')
 iso_codes = dependency('iso-codes')
 javascriptcoregtk = dependency('javascriptcoregtk-4.0', version: '>=' + target_webkit)
 json_glib = dependency('json-glib-1.0', version: '>= 1.0')
-libhandy = dependency('libhandy-1', version: '>= 1.2.1')
+libhandy = dependency('libhandy-1', version: '>= 1.2.1', required: false)
 libmath = cc.find_library('m')
 libpeas = dependency('libpeas-1.0', version: '>= 1.24.0')
 libpeas_gtk = dependency('libpeas-gtk-1.0', version: '>= 1.24.0')
@@ -138,6 +138,26 @@ libstemmer = declare_dependency(
   ],
 )
 
+# Required until libhandy 1.2.1 is GA
+libhandy_vapi = ''
+if not libhandy.found()
+  libhandy_project = subproject(
+    'libhandy',
+    default_options: [
+      'examples=false',
+      'package_subdir=geary',
+      'tests=false',
+    ]
+  )
+  libhandy = declare_dependency(
+    dependencies: [
+      libhandy_project.get_variable('libhandy_dep'),
+      libhandy_project.get_variable('libhandy_vapi')
+    ]
+  )
+  libhandy_vapi = meson.build_root() / 'subprojects' / 'libhandy' / 'src'
+endif
+
 # Optional dependencies
 appstream_util = find_program('appstream-util', required: false)
 desktop_file_validate = find_program('desktop-file-validate', required: false)
diff --git a/org.gnome.Geary.json b/org.gnome.Geary.json
index 2d556511..83c79872 100644
--- a/org.gnome.Geary.json
+++ b/org.gnome.Geary.json
@@ -78,6 +78,24 @@
                 "/share"
             ]
         },
+        {
+            "name": "libhandy",
+            "buildsystem": "meson",
+            "config-opts": [
+                "-Dglade_catalog=disabled"
+            ],
+            "sources": [
+                {
+                    "type": "git",
+                    "url": "https://gitlab.gnome.org/GNOME/libhandy.git",
+                    "branch": "master"
+                }
+            ],
+            "cleanup": [
+                "/bin",
+                "/share"
+            ]
+        },
         {
             "name": "libical",
             "buildsystem": "cmake-ninja",
diff --git a/org.gnome.Geary.yaml b/org.gnome.Geary.yaml
index c3908a89..b7d06d52 100644
--- a/org.gnome.Geary.yaml
+++ b/org.gnome.Geary.yaml
@@ -111,6 +111,19 @@ modules:
       - /bin
       - /share
 
+  # Geary dependency
+  - name: libhandy
+    buildsystem: meson
+    config-opts:
+      - "-Dglade_catalog=disabled"
+    sources:
+      - type: git
+        url: "https://gitlab.gnome.org/GNOME/libhandy.git"
+        branch: master
+    cleanup:
+      - /bin
+      - /share
+
   # EDS dependency
   - name: libical
     buildsystem: cmake-ninja
diff --git a/src/meson.build b/src/meson.build
index d2b01803..a67336af 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -139,6 +139,9 @@ valadoc_vapi_dirs = [
   vapi_dir,
   meson.current_build_dir()
 ]
+if libhandy_vapi != ''
+  valadoc_vapi_dirs += libhandy_vapi
+endif
 
 # Hopefully Meson will get baked-in valadoc support, so we don't have
 # to resort to these kinds of hacks any more. See
@@ -147,7 +150,11 @@ valadoc_vapi_dirs = [
 valadoc_dep_args = []
 foreach dep : valadoc_dependencies
   valadoc_dep_args += '--pkg'
-  valadoc_dep_args += dep.name()
+  if dep != libhandy
+    valadoc_dep_args += dep.name()
+  else
+    valadoc_dep_args += 'libhandy-1'
+  endif
 endforeach
 valadoc_dep_args += [ '--pkg', 'icu-uc' ]
 valadoc_dep_args += [ '--pkg', 'libstemmer' ]
diff --git a/subprojects/libhandy.wrap b/subprojects/libhandy.wrap
new file mode 100644
index 00000000..2dfa9777
--- /dev/null
+++ b/subprojects/libhandy.wrap
@@ -0,0 +1,5 @@
+[wrap-git]
+directory = libhandy
+url = https://gitlab.gnome.org/GNOME/libhandy.git
+revision = 1.2.1
+