ui: Remove can_focus from GTK builder file definitions

GTK widgets set the default for this as needed, and some incorrect values for this have caused issues with keyboard focus. Fixes #1059
2021-01-27 21:43:23 +11:00 · 2021-01-27 21:43:23 +11:00 · f4d3c54110
commit f4d3c54110
parent e6ab0f754f
33 changed files with 0 additions and 486 deletions
--- a/ui/accounts_editor.ui
+++ b/ui/accounts_editor.ui
@ -3,7 +3,6 @@
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <template class="AccountsEditor" parent="GtkDialog">
    <property name="can_focus">False</property>
    <property name="modal">True</property>
    <property name="default_width">360</property>
    <property name="default_height">450</property>
@ -13,11 +12,9 @@
    </child>
    <child internal-child="vbox">
      <object class="GtkBox">
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child internal-child="action_area">
          <object class="GtkButtonBox">
            <property name="can_focus">False</property>
            <property name="layout_style">end</property>
            <child>
              <placeholder/>
@ -35,11 +32,9 @@
        <child>
          <object class="GtkOverlay" id="notifications_pane">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="GtkStack" id="editor_panes">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="transition_type">slide-left-right</property>
                <signal name="notify::visible-child" handler="on_pane_changed" swapped="no"/>
                <child>
--- a/ui/accounts_editor_add_pane.ui
+++ b/ui/accounts_editor_add_pane.ui
@ -4,23 +4,19 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkHeaderBar" id="header">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="title" translatable="yes">Add an account</property>
    <property name="has_subtitle">False</property>
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="back_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <signal name="clicked" handler="on_back_button_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="no_show_all">True</property>
                <property name="icon_name">go-previous-symbolic</property>
              </object>
@ -36,12 +32,10 @@
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="column_spacing">12</property>
        <child>
          <object class="GtkSpinner" id="create_spinner">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
          </object>
          <packing>
            <property name="left_attach">0</property>
@ -53,7 +47,6 @@
            <property name="label" translatable="yes">_Create</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="use_underline">True</property>
            <signal name="clicked" handler="on_create_button_clicked" swapped="no"/>
@ -80,11 +73,9 @@
  </object>
  <template class="AccountsEditorAddPane" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkScrolledWindow">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="hexpand">True</property>
        <property name="vexpand">True</property>
        <property name="vadjustment">pane_adjustment</property>
@ -92,27 +83,22 @@
        <child>
          <object class="GtkViewport">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="shadow_type">none</property>
            <child>
              <object class="HdyClamp">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin">24</property>
                <child>
                  <object class="GtkGrid" id="pane_content">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="details_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                          </object>
@ -126,11 +112,9 @@
                    <child>
                      <object class="GtkGrid" id="receiving_panel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkLabel">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="label" translatable="yes">Receiving</property>
                            <attributes>
@ -148,13 +132,11 @@
                        <child>
                          <object class="GtkFrame">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="label_xalign">0</property>
                            <property name="shadow_type">in</property>
                            <child>
                              <object class="GtkListBox" id="receiving_list">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="selection_mode">none</property>
                                <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                              </object>
@ -174,11 +156,9 @@
                    <child>
                      <object class="GtkGrid" id="sending_panel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkLabel">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="label" translatable="yes">Sending</property>
                            <attributes>
@ -196,13 +176,11 @@
                        <child>
                          <object class="GtkFrame">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="label_xalign">0</property>
                            <property name="shadow_type">in</property>
                            <child>
                              <object class="GtkListBox" id="sending_list">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="selection_mode">none</property>
                                <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                              </object>
--- a/ui/accounts_editor_edit_pane.ui
+++ b/ui/accounts_editor_edit_pane.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkHeaderBar" id="header">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="title" translatable="yes">Edit Account</property>
    <property name="subtitle" translatable="yes">Account Name</property>
    <property name="has_subtitle">False</property>
@ -12,17 +11,14 @@
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="back_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <signal name="clicked" handler="on_back_button_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="no_show_all">True</property>
                <property name="icon_name">go-previous-symbolic</property>
              </object>
@ -38,17 +34,14 @@
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="undo_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="action_name">edt.undo</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="no_show_all">True</property>
                <property name="icon_name">edit-undo-symbolic</property>
              </object>
@ -73,11 +66,9 @@
  </object>
  <template class="AccountsEditorEditPane" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkScrolledWindow">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="hexpand">True</property>
        <property name="vexpand">True</property>
        <property name="vadjustment">pane_adjustment</property>
@ -86,27 +77,22 @@
        <child>
          <object class="GtkViewport">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="HdyClamp">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin">24</property>
                <child>
                  <object class="GtkGrid" id="pane_content">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="details_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
@ -124,7 +110,6 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Email addresses</property>
                        <style>
@ -139,14 +124,12 @@
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="senders_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
@ -164,7 +147,6 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Signature</property>
                        <style>
@ -179,7 +161,6 @@
                    <child>
                      <object class="GtkFrame" id="signature_frame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
@ -201,7 +182,6 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Settings</property>
                        <style>
@ -216,14 +196,12 @@
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="settings_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_setting_activated" swapped="no"/>
@ -241,13 +219,11 @@
                    <child>
                      <object class="GtkButtonBox">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="layout_style">end</property>
                        <child>
                          <object class="GtkButton">
                            <property name="label" translatable="yes" comments="This is a button in the account settings to show server settings.">Server Settings</property>
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="receives_default">False</property>
                            <signal name="clicked" handler="on_server_settings_clicked" swapped="no"/>
                          </object>
@ -262,7 +238,6 @@
                          <object class="GtkButton" id="remove_button">
                            <property name="label" translatable="yes" comments="This is the remove account button in the account settings.">Remove Account</property>
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Remove this account from Geary</property>
                            <signal name="clicked" handler="on_remove_account_clicked" swapped="no"/>
--- a/ui/accounts_editor_list_pane.ui
+++ b/ui/accounts_editor_list_pane.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkHeaderBar" id="header">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="title" translatable="yes">Accounts</property>
    <property name="has_subtitle">False</property>
    <property name="show_close_button">True</property>
@ -16,11 +15,9 @@
  </object>
  <template class="AccountsEditorListPane" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkScrolledWindow">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="hexpand">True</property>
        <property name="vexpand">True</property>
        <property name="vadjustment">pane_adjustment</property>
@ -29,26 +26,21 @@
        <child>
          <object class="GtkViewport">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="HdyClamp">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin">24</property>
                <child>
                  <object class="GtkGrid" id="pane_content">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <child>
                      <object class="GtkGrid" id="welcome_panel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">center</property>
                        <property name="column_spacing">12</property>
                        <child>
                          <object class="GtkImage" id="welcome_icon">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="pixel_size">64</property>
                            <property name="use_fallback">True</property>
                          </object>
@ -61,7 +53,6 @@
                        <child>
                          <object class="GtkLabel">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="valign">start</property>
                            <property name="wrap">True</property>
@ -77,7 +68,6 @@
                        <child>
                          <object class="GtkLabel">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="valign">end</property>
                            <property name="label" translatable="yes">Welcome to Geary</property>
@ -104,7 +94,6 @@
                    <child>
                      <object class="GtkFrame" id="accounts_list_frame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="valign">start</property>
                        <property name="hexpand">True</property>
                        <property name="vexpand">True</property>
@ -113,7 +102,6 @@
                        <child>
                          <object class="GtkListBox" id="accounts_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_row_activated" swapped="no"/>
@ -130,7 +118,6 @@
                    <child>
                      <object class="GtkLabel" id="add_service_label">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Add an account</property>
                        <attributes>
@ -148,7 +135,6 @@
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="valign">start</property>
                        <property name="hexpand">True</property>
                        <property name="vexpand">True</property>
@ -158,7 +144,6 @@
                          <object class="GtkListBox" id="service_list">
                            <property name="width_request">0</property>
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="valign">start</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
--- a/ui/accounts_editor_servers_pane.ui
+++ b/ui/accounts_editor_servers_pane.ui
@ -4,19 +4,16 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkHeaderBar" id="header">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="title" translatable="yes">Server Settings</property>
    <property name="subtitle" translatable="yes">Account Name</property>
    <property name="show_close_button">False</property>
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="cancel_button">
            <property name="label" translatable="yes">Cancel</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/>
          </object>
@ -30,12 +27,10 @@
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="column_spacing">12</property>
        <child>
          <object class="GtkSpinner" id="apply_spinner">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
          </object>
          <packing>
            <property name="left_attach">0</property>
@ -47,7 +42,6 @@
            <property name="label" translatable="yes">Apply</property>
            <property name="visible">True</property>
            <property name="sensitive">False</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <signal name="clicked" handler="on_apply_button_clicked" swapped="no"/>
            <style>
@ -74,11 +68,9 @@
  <template class="AccountsEditorServersPane" parent="GtkGrid">
    <property name="name">1</property>
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkScrolledWindow">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="hexpand">True</property>
        <property name="vexpand">True</property>
        <property name="vadjustment">pane_adjustment</property>
@ -87,27 +79,22 @@
        <child>
          <object class="GtkViewport">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="HdyClamp">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin">24</property>
                <child>
                  <object class="GtkGrid" id="pane_content">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="receiving_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_activate" swapped="no"/>
@ -124,7 +111,6 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Receiving</property>
                        <style>
@ -139,14 +125,12 @@
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="sending_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_activate" swapped="no"/>
@ -163,7 +147,6 @@
                    <child>
                      <object class="GtkLabel">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="label" translatable="yes">Sending</property>
                        <style>
@ -178,14 +161,12 @@
                    <child>
                      <object class="GtkFrame">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="label_xalign">0</property>
                        <property name="shadow_type">in</property>
                        <child>
                          <object class="GtkListBox" id="details_list">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="selection_mode">none</property>
                            <signal name="keynav-failed" handler="on_list_keynav_failed" swapped="no"/>
                            <signal name="row-activated" handler="on_activate" swapped="no"/>
--- a/ui/application-main-window.ui
+++ b/ui/application-main-window.ui
@ -3,7 +3,6 @@
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <template class="ApplicationMainWindow" parent="GtkApplicationWindow">
    <property name="can_focus">False</property>
    <property name="events">GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK</property>
    <property name="show_menubar">False</property>
    <signal name="delete-event" handler="on_delete_event" swapped="no"/>
@ -17,16 +16,13 @@
    <child>
      <object class="GtkOverlay" id="overlay">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkBox" id="main_layout">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <child>
              <object class="HdyLeaflet" id="main_leaflet">
                <property name="visible">True</property>
                <property name="can_focus">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"/>
@ -34,26 +30,22 @@
                <child>
                  <object class="HdyLeaflet" id="conversations_leaflet">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="hexpand_set">True</property>
                    <property name="can_swipe_back">True</property>
                    <property name="transition_type">over</property>
                    <child>
                      <object class="GtkBox" id="folder_box">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="orientation">vertical</property>
                        <child>
                          <object class="GtkFrame" id="folder_frame">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="vexpand">True</property>
                            <property name="label_xalign">0</property>
                            <property name="shadow_type">none</property>
                            <child>
                              <object class="GtkScrolledWindow" id="folder_list_scrolled">
                                <property name="visible">True</property>
                                <property name="can_focus">True</property>
                                <property name="hscrollbar_policy">never</property>
                              </object>
                            </child>
@ -74,7 +66,6 @@
                    <child>
                      <object class="GtkSeparator" id="folder_separator">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="orientation">vertical</property>
                        <style>
                          <class name="sidebar"/>
@ -87,19 +78,16 @@
                    <child>
                      <object class="GtkBox" id="conversation_list_box">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="orientation">vertical</property>
                        <child>
                          <object class="GtkFrame" id="conversation_frame">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="label_xalign">0</property>
                            <property name="shadow_type">none</property>
                            <child>
                              <object class="GtkScrolledWindow" id="conversation_list_scrolled">
                                <property name="width_request">250</property>
                                <property name="visible">True</property>
                                <property name="can_focus">True</property>
                              </object>
                            </child>
                            <style>
@ -126,7 +114,6 @@
                <child>
                  <object class="GtkSeparator" id="conversations_separator">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="orientation">vertical</property>
                    <style>
                      <class name="geary-sidebar-pane-separator"/>
@ -139,7 +126,6 @@
                <child>
                  <object class="GtkBox" id="conversation_viewer_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <object class="ComponentsConversationActionBar" id="conversation_viewer_action_bar">
--- a/ui/certificate_warning_dialog.glade
+++ b/ui/certificate_warning_dialog.glade
@ -3,7 +3,6 @@
 <interface>
  <requires lib="gtk+" version="3.14"/>
  <object class="GtkDialog" id="CertificateWarningDialog">
    <property name="can_focus">False</property>
    <property name="title" translatable="yes">Untrusted Connection</property>
    <property name="modal">True</property>
    <property name="destroy_with_parent">True</property>
@ -11,7 +10,6 @@
    <property name="urgency_hint">True</property>
    <child internal-child="vbox">
      <object class="GtkBox" id="dialog-vbox1">
        <property name="can_focus">False</property>
        <property name="margin_start">12</property>
        <property name="margin_end">12</property>
        <property name="margin_top">12</property>
@ -20,7 +18,6 @@
        <property name="spacing">2</property>
        <child internal-child="action_area">
          <object class="GtkButtonBox" id="dialog-action_area1">
            <property name="can_focus">False</property>
            <property name="valign">end</property>
            <property name="margin_top">8</property>
            <property name="layout_style">end</property>
@ -28,7 +25,6 @@
              <object class="GtkButton" id="always_trust_button">
                <property name="label" translatable="yes">_Always Trust This Server</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="use_underline">True</property>
              </object>
@ -42,7 +38,6 @@
              <object class="GtkButton" id="trust_button">
                <property name="label" translatable="yes">_Trust This Server</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="use_underline">True</property>
              </object>
@ -56,7 +51,6 @@
              <object class="GtkButton" id="dont_trust_button">
                <property name="label" translatable="yes">_Don’t Trust This Server</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="use_underline">True</property>
              </object>
@ -77,18 +71,15 @@
        <child>
          <object class="GtkBox" id="box1">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <property name="spacing">8</property>
            <child>
              <object class="GtkBox" id="box2">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="spacing">6</property>
                <child>
                  <object class="GtkImage" id="image1">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">security-high-symbolic</property>
                    <property name="icon_size">6</property>
                  </object>
@ -101,7 +92,6 @@
                <child>
                  <object class="GtkLabel" id="untrusted_connection_label">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="label">(empty)</property>
                    <attributes>
                      <attribute name="weight" value="bold"/>
@ -123,7 +113,6 @@
            <child>
              <object class="GtkLabel" id="top_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin_top">8</property>
                <property name="xalign">0</property>
                <property name="label">(empty)</property>
@ -138,7 +127,6 @@
            <child>
              <object class="GtkLabel" id="warnings_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin_start">16</property>
                <property name="xalign">0</property>
                <property name="label">(empty)</property>
@ -154,7 +142,6 @@
            <child>
              <object class="GtkLabel" id="contact_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="xalign">0</property>
                <property name="label">(empty)</property>
                <property name="wrap">True</property>
@ -169,7 +156,6 @@
            <child>
              <object class="GtkLabel" id="dont_trust_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="valign">end</property>
                <property name="xalign">0</property>
                <property name="label">(empty)</property>
@ -186,7 +172,6 @@
            <child>
              <object class="GtkLabel" id="trust_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="xalign">0</property>
                <property name="label">(empty)</property>
                <property name="wrap">True</property>
--- a/ui/components-attachment-pane.ui
+++ b/ui/components-attachment-pane.ui
@ -5,12 +5,10 @@
  <template class="ComponentsAttachmentPane" parent="GtkGrid">
    <property name="name">box</property>
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="orientation">vertical</property>
    <child>
      <object class="GtkSeparator">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
      </object>
      <packing>
        <property name="left_attach">0</property>
@ -20,18 +18,15 @@
    <child>
      <object class="GtkActionBar" id="attachments_actions">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="select_all_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Select all attachments</property>
            <property name="action_name">cap.select-all</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-select-all-symbolic</property>
              </object>
            </child>
@ -42,14 +37,12 @@
        </child>
        <child>
          <object class="GtkButton" id="remove_button">
            <property name="can_focus">True</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Select all attachments</property>
            <property name="action_name">cap.remove-selected</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">list-remove-symbolic</property>
              </object>
            </child>
@ -61,14 +54,12 @@
        <child>
          <object class="GtkButton" id="save_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Save selected attachments</property>
            <property name="action_name">cap.save-selected</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">document-save-symbolic</property>
              </object>
            </child>
@ -80,14 +71,12 @@
        <child>
          <object class="GtkButton" id="open_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Open selected attachments</property>
            <property name="action_name">cap.open-selected</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">document-open-symbolic</property>
              </object>
            </child>
@ -108,7 +97,6 @@
    <child>
      <object class="GtkGrid" id="attachments_container">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
--- a/ui/components-attachment-view.ui
+++ b/ui/components-attachment-view.ui
@ -4,12 +4,10 @@
  <requires lib="gtk+" version="3.14"/>
  <template class="ComponentsAttachmentPaneView" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="column_spacing">6</property>
    <child>
      <object class="GtkImage" id="icon">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="valign">center</property>
        <property name="vexpand">True</property>
        <property name="pixel_size">32</property>
@ -24,7 +22,6 @@
    <child>
      <object class="GtkLabel" id="filename">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="valign">end</property>
        <property name="label">filename.ext</property>
        <property name="ellipsize">middle</property>
@ -38,7 +35,6 @@
    <child>
      <object class="GtkLabel" id="description">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="valign">start</property>
        <property name="label">type (size)</property>
        <property name="xalign">0</property>
--- a/ui/components-conversation-action-bar.ui
+++ b/ui/components-conversation-action-bar.ui
@ -3,29 +3,24 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkImage" id="archive_image">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">mail-archive-symbolic</property>
  </object>
  <template class="ComponentsConversationActionBar" parent="GtkRevealer">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="transition_type">slide-up</property>
    <child>
      <object class="GtkBox">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="hexpand">True</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkSeparator">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
          </object>
        </child>
        <child>
          <object class="GtkBox" id="action_box">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>
            <property name="margin_top">6</property>
            <property name="margin_bottom">6</property>
--- a/ui/components-conversation-actions.ui
+++ b/ui/components-conversation-actions.ui
@ -4,18 +4,15 @@
    <requires lib="gtk+" version="3.20"/>
    <object class="GtkBox" id="mark_copy_move_buttons">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
            <object class="GtkMenuButton" id="mark_message_button">
                <property name="visible">True</property>
                <property name="can_focus">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="can_focus">False</property>
                        <property name="icon_name">marker-symbolic</property>
                    </object>
                </child>
@ -29,14 +26,12 @@
        <child>
            <object class="GtkMenuButton" id="copy_message_button">
                <property name="visible">True</property>
                <property name="can_focus">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="can_focus">False</property>
                        <property name="icon_name">tag-symbolic</property>
                    </object>
                </child>
@ -50,14 +45,12 @@
        <child>
            <object class="GtkMenuButton" id="move_message_button">
                <property name="visible">True</property>
                <property name="can_focus">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="can_focus">False</property>
                        <property name="icon_name">folder-symbolic</property>
                    </object>
                </child>
@ -75,11 +68,9 @@
    </object>
    <object class="GtkBox" id="reply_forward_buttons">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
            <object class="GtkButton" id="reply_sender_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Reply</property>
@ -88,7 +79,6 @@
                <child>
                    <object class="GtkImage" id="reply_sender_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">mail-reply-sender-symbolic</property>
                    </object>
                </child>
@ -102,7 +92,6 @@
        <child>
            <object class="GtkButton" id="reply_all_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Reply All</property>
@ -111,7 +100,6 @@
                <child>
                    <object class="GtkImage" id="reply_all_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">mail-reply-all-symbolic</property>
                    </object>
                </child>
@ -125,7 +113,6 @@
        <child>
            <object class="GtkButton" id="forward_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Forward</property>
@ -134,7 +121,6 @@
                <child>
                    <object class="GtkImage" id="forward_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">mail-forward-symbolic</property>
                    </object>
                </child>
@ -152,17 +138,14 @@
    </object>
    <object class="GtkImage" id="archive_image">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="icon_name">mail-archive-symbolic</property>
    </object>
    <object class="GtkBox" id="archive_trash_delete_buttons">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
            <object class="GtkButton" id="archive_button">
                <property name="label" translatable="yes">_Archive</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="action_name">win.archive-conversation</property>
@ -179,7 +162,6 @@
        <child>
            <object class="GtkButton" id="trash_delete_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="action_name">win.trash-conversation</property>
@ -187,7 +169,6 @@
                <child>
                    <object class="GtkImage" id="trash_delete_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">user-trash-symbolic</property>
                    </object>
                </child>
@ -205,7 +186,6 @@
    </object>
    <object class="GtkToggleButton" id="find_button">
        <property name="visible">True</property>
        <property name="can_focus">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>
@ -213,7 +193,6 @@
        <child>
            <object class="GtkImage" id="find_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">preferences-system-search-symbolic</property>
            </object>
        </child>
--- a/ui/components-conversation-header-bar.ui
+++ b/ui/components-conversation-header-bar.ui
@ -3,12 +3,10 @@
  <requires lib="gtk+" version="3.20"/>
  <template class="ComponentsConversationHeaderBar" parent="GtkHeaderBar">
    <property name="visible">True</property>
    <property name="can_focus">False</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="can_focus">False</property>
        <property name="receives_default">False</property>
        <property name="valign">center</property>
        <property name="use-underline">True</property>
@ -25,7 +23,6 @@
        <child>
          <object class="GtkImage" id="conversation_back_image">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="icon_name">go-previous-symbolic</property>
            <property name="icon_size">1</property>
          </object>
--- a/ui/components-in-app-notification.ui
+++ b/ui/components-in-app-notification.ui
@ -25,14 +25,12 @@
        <child>
          <object class="GtkButton" id="action_button">
            <property name="visible">False</property>
            <property name="can_focus">False</property>
            <property name="valign">center</property>
          </object>
        </child>
        <child>
          <object class="GtkButton" id="close_button">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="valign">center</property>
            <signal name="clicked" handler="close" swapped="no"/>
            <style>
@ -41,7 +39,6 @@
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">window-close-symbolic</property>
              </object>
            </child>
--- a/ui/components-info-bar.ui
+++ b/ui/components-info-bar.ui
@ -3,20 +3,16 @@
  <requires lib="gtk+" version="3.20"/>
  <template class="ComponentsInfoBar" parent="GtkBox">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkRevealer" id="revealer">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="transition_type">slide-down</property>
        <child>
          <object class="GtkBox">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="GtkFlowBox">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="hexpand">True</property>
                <property name="selection-mode">none</property>
                <property name="max_children_per_line">2</property>
@ -24,11 +20,9 @@
                <child>
                  <object class="GtkFlowBoxChild">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <child>
                      <object class="GtkBox" id="content_area">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="spacing">16</property>
                      </object>
                    </child>
@ -37,11 +31,9 @@
                <child>
                  <object class="GtkFlowBoxChild">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <child>
                      <object class="GtkButtonBox" id="action_area">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="layout_style">end</property>
                        <property name="spacing">6</property>
                      </object>
@ -52,7 +44,6 @@
            </child>
            <child>
              <object class="GtkButton" id="close_button">
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="halign">end</property>
                <property name="valign">center</property>
@ -66,7 +57,6 @@
                <child>
                  <object class="GtkImage">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">window-close-symbolic</property>
                  </object>
                </child>
--- a/ui/components-inspector-error-view.ui
+++ b/ui/components-inspector-error-view.ui
@ -5,11 +5,9 @@
  <requires lib="libhandy" version="0.0"/>
  <template class="ComponentsInspectorErrorView" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="HdyClamp">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_left">16</property>
        <property name="margin_right">16</property>
        <property name="margin_top">32</property>
@ -17,13 +15,11 @@
        <child>
          <object class="GtkGrid">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="row_spacing">6</property>
            <property name="column_spacing">12</property>
            <child>
              <object class="GtkLabel">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="halign">start</property>
                <property name="valign">baseline</property>
                <property name="margin_bottom">12</property>
@ -41,7 +37,6 @@
            <child>
              <object class="GtkLabel">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="halign">start</property>
                <property name="valign">baseline</property>
                <property name="label" translatable="yes">Details:</property>
@ -55,14 +50,12 @@
            <child>
              <object class="GtkScrolledWindow">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="hexpand">True</property>
                <property name="vexpand">True</property>
                <property name="shadow_type">in</property>
                <child>
                  <object class="GtkTextView" id="problem_text">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="hexpand">True</property>
                    <property name="vexpand">True</property>
                    <property name="editable">False</property>
--- a/ui/components-inspector-log-view.ui
+++ b/ui/components-inspector-log-view.ui
@ -5,17 +5,14 @@
  <requires lib="libhandy" version="0.0"/>
  <template class="ComponentsInspectorLogView" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="HdySearchBar" id="search_bar">
        <property name="name">search_bar</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="hexpand">True</property>
        <child>
          <object class="GtkSearchEntry" id="search_entry">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="primary_icon_name">edit-find-symbolic</property>
            <property name="primary_icon_activatable">False</property>
            <property name="primary_icon_sensitive">False</property>
@ -31,21 +28,17 @@
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkScrolledWindow">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="hscrollbar_policy">never</property>
            <property name="shadow_type">none</property>
            <child>
              <object class="GtkViewport">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkListBox" id="sidebar">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="hexpand">False</property>
                    <property name="selection_mode">none</property>
                    <signal name="row-activated" handler="on_sidebar_row_activated" swapped="no"/>
@ -65,14 +58,12 @@
        <child>
          <object class="GtkScrolledWindow" id="logs_scroller">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="hexpand">True</property>
            <property name="vexpand">True</property>
            <property name="shadow_type">none</property>
            <child>
              <object class="GtkTreeView" id="logs_view">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="headers_visible">False</property>
                <property name="enable_search">False</property>
                <property name="show_expanders">False</property>
--- a/ui/components-inspector-system-view.ui
+++ b/ui/components-inspector-system-view.ui
@ -5,11 +5,9 @@
  <requires lib="libhandy" version="0.0"/>
  <template class="ComponentsInspectorSystemView" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child>
      <object class="GtkScrolledWindow">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="hscrollbar_policy">never</property>
        <property name="shadow_type">in</property>
        <property name="max_content_width">600</property>
@ -17,11 +15,9 @@
        <child>
          <object class="GtkViewport">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="HdyClamp">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin_left">16</property>
                <property name="margin_right">16</property>
                <property name="margin_top">32</property>
@ -29,13 +25,11 @@
                <child>
                  <object class="GtkFrame">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="label_xalign">0</property>
                    <child>
                      <object class="GtkListBox" id="system_list">
                        <property name="name">system_list</property>
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="selection_mode">none</property>
                        <property name="activate_on_single_click">False</property>
                      </object>
--- a/ui/components-inspector.ui
+++ b/ui/components-inspector.ui
@ -3,25 +3,21 @@
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <template class="ComponentsInspector" parent="GtkApplicationWindow">
    <property name="can_focus">False</property>
    <property name="default_width">800</property>
    <property name="default_height">500</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header_bar">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="show_close_button">True</property>
        <child>
          <object class="GtkToggleButton" id="search_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Search for matching log entries</property>
            <property name="action_name">win.toggle-search</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-find-symbolic</property>
              </object>
            </child>
@ -30,7 +26,6 @@
        <child>
          <object class="GtkToggleButton" id="play_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Toggle appending new log entries</property>
            <property name="action_name">win.toggle-play</property>
@ -38,7 +33,6 @@
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">media-playback-start-symbolic</property>
              </object>
            </child>
@ -50,14 +44,12 @@
        <child>
          <object class="GtkButton" id="mark_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Add a marker entry to the log</property>
            <signal name="clicked" handler="on_mark_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">marker-symbolic</property>
              </object>
            </child>
@ -69,21 +61,18 @@
        <child type="title">
          <object class="GtkStackSwitcher">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="stack">stack</property>
          </object>
        </child>
        <child>
          <object class="GtkButton" id="save_as_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Save logs entries and details</property>
            <signal name="clicked" handler="on_save_as_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">document-save-as-symbolic</property>
              </object>
            </child>
@ -96,14 +85,12 @@
        <child>
          <object class="GtkButton" id="copy_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Copy to clipboard</property>
            <property name="action_name">edt.copy</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-copy-symbolic</property>
              </object>
            </child>
@ -116,14 +103,12 @@
        <child>
          <object class="GtkButton" id="clear_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for inspector button">Clears all log entries</property>
            <signal name="clicked" handler="on_clear_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-clear-all-symbolic</property>
              </object>
            </child>
@ -138,7 +123,6 @@
    <child>
      <object class="GtkStack" id="stack">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <signal name="notify::visible-child" handler="on_visible_child_changed" swapped="no"/>
        <child>
          <placeholder/>
--- a/ui/components-placeholder-pane.ui
+++ b/ui/components-placeholder-pane.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.14"/>
  <template class="ComponentsPlaceholderPane" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="halign">center</property>
    <property name="valign">center</property>
    <property name="hexpand">True</property>
@ -12,7 +11,6 @@
    <child>
      <object class="GtkImage" id="placeholder_image">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="pixel_size">72</property>
        <property name="icon_name">image-x-generic-symbolic</property>
        <property name="icon_size">6</property>
@ -25,7 +23,6 @@
    <child>
      <object class="GtkLabel" id="title_label">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="label">Mea navis volitans</property>
        <style>
          <class name="title"/>
@ -39,7 +36,6 @@
    <child>
      <object class="GtkLabel" id="subtitle_label">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="label">Mea navis volitans anguillis plena est.</property>
        <property name="wrap">True</property>
        <style>
--- a/ui/composer-editor.ui
+++ b/ui/composer-editor.ui
@ -3,27 +3,22 @@
  <requires lib="gtk+" version="3.20"/>
  <template class="ComposerEditor" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="orientation">vertical</property>
    <child>
      <object class="GtkFrame">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="label_xalign">0</property>
        <property name="shadow_type">in</property>
        <child>
          <object class="GtkBox" id="message_area">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="GtkOverlay" id="message_overlay">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkGrid" id="body_container">
                    <property name="height_request">250</property>
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                  </object>
                  <packing>
                    <property name="index">-1</property>
@ -31,7 +26,6 @@
                </child>
                <child type="overlay">
                  <object class="GtkLabel" id="message_overlay_label">
                    <property name="can_focus">False</property>
                    <property name="no_show_all">True</property>
                    <property name="halign">start</property>
                    <property name="valign">end</property>
@ -43,7 +37,6 @@
                </child>
                <child type="overlay">
                  <object class="GtkProgressBar" id="background_progress">
                    <property name="can_focus">False</property>
                    <property name="valign">start</property>
                    <style>
                      <class name="osd"/>
@ -68,7 +61,6 @@
    <child>
      <object class="GtkBox" id="action_bar_box">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <style>
          <class name="background"/>
@ -83,18 +75,15 @@
                <child>
                  <object class="ComponentsReflowBox" id="toolbar_box">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="spacing">6</property>
                    <property name="row_spacing">6</property>
                    <property name="hexpand">True</property>
                    <child>
                      <object class="GtkBox" id="font_style_buttons">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkToggleButton" id="bold_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Bold text</property>
@ -103,7 +92,6 @@
                            <child>
                              <object class="GtkImage" id="bold_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-text-bold-symbolic</property>
                              </object>
@ -118,7 +106,6 @@
                        <child>
                          <object class="GtkToggleButton" id="italics_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Italic text</property>
@ -127,7 +114,6 @@
                            <child>
                              <object class="GtkImage" id="italics_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-text-italic-symbolic</property>
                              </object>
@ -142,7 +128,6 @@
                        <child>
                          <object class="GtkToggleButton" id="underline_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Underline text</property>
@ -151,7 +136,6 @@
                            <child>
                              <object class="GtkImage" id="underline_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-text-underline-symbolic</property>
                              </object>
@ -166,7 +150,6 @@
                        <child>
                          <object class="GtkToggleButton" id="strikethrough_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Strikethrough text</property>
@ -175,7 +158,6 @@
                            <child>
                              <object class="GtkImage" id="strikethrough_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-text-strikethrough-symbolic</property>
                              </object>
@ -195,11 +177,9 @@
                    <child>
                      <object class="GtkBox" id="list_buttons">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkButton" id="ulist_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Insert bulleted list</property>
@ -208,7 +188,6 @@
                            <child>
                              <object class="GtkImage" id="ulist_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-unordered-list-symbolic</property>
                              </object>
@ -223,7 +202,6 @@
                        <child>
                          <object class="GtkButton" id="olist_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Insert numbered list</property>
@ -232,7 +210,6 @@
                            <child>
                              <object class="GtkImage" id="olist_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-ordered-list-symbolic</property>
                              </object>
@ -252,11 +229,9 @@
                    <child>
                      <object class="GtkBox" id="indentation_buttons">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkButton" id="indent_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Indent or quote text</property>
@ -265,7 +240,6 @@
                            <child>
                              <object class="GtkImage" id="indent_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-indent-more-symbolic</property>
                              </object>
@ -280,7 +254,6 @@
                        <child>
                          <object class="GtkButton" id="outdent_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Un-indent or unquote text</property>
@ -289,7 +262,6 @@
                            <child>
                              <object class="GtkImage" id="outdent_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">format-indent-less-symbolic</property>
                              </object>
@ -309,7 +281,6 @@
                    <child>
                      <object class="GtkButton" id="remove_format_button">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="focus_on_click">False</property>
                        <property name="receives_default">False</property>
                        <property name="tooltip_text" translatable="yes">Remove text formatting</property>
@ -318,7 +289,6 @@
                        <child>
                          <object class="GtkImage" id="remove_format_image">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="pixel_size">16</property>
                            <property name="icon_name">format-text-remove-symbolic</property>
                          </object>
@ -328,7 +298,6 @@
                    <child>
                      <object class="GtkMenuButton" id="font_button">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="focus_on_click">False</property>
                        <property name="menu_model">font_menu</property>
                        <property name="tooltip_text" translatable="yes">Change font type</property>
@ -336,16 +305,13 @@
                        <child>
                          <object class="GtkBox">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="orientation">horizontal</property>
                            <child>
                              <object class="GtkStack" id="font_button_stack">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <child>
                                  <object class="GtkLabel">
                                    <property name="visible">True</property>
                                    <property name="can_focus">False</property>
                                    <property name="label" translatable="yes">Sans Serif</property>
                                    <property name="halign">start</property>
                                  </object>
@ -356,7 +322,6 @@
                                <child>
                                  <object class="GtkLabel">
                                    <property name="visible">True</property>
                                    <property name="can_focus">False</property>
                                    <property name="label" translatable="yes">Serif</property>
                                    <property name="halign">start</property>
                                  </object>
@ -367,7 +332,6 @@
                                <child>
                                  <object class="GtkLabel">
                                    <property name="visible">True</property>
                                    <property name="can_focus">False</property>
                                    <property name="label" translatable="yes">Fixed Width</property>
                                    <property name="halign">start</property>
                                  </object>
@ -380,7 +344,6 @@
                            <child>
                              <object class="GtkImage">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="icon-name">pan-down</property>
                              </object>
                            </child>
@ -391,14 +354,12 @@
                    <child>
                      <object class="GtkButton">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="focus_on_click">False</property>
                        <property name="action_name">edt.color</property>
                        <property name="tooltip_text" translatable="yes">Change font color</property>
                        <child>
                          <object class="GtkImage" id="font_color_icon">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                          </object>
                        </child>
                      </object>
@ -406,7 +367,6 @@
                    <child>
                      <object class="GtkMenuButton" id="font_size_button">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="focus_on_click">False</property>
                        <property name="menu_model">font_size_menu</property>
                        <property name="tooltip_text" translatable="yes">Change font size</property>
@ -414,19 +374,16 @@
                        <child>
                          <object class="GtkBox">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="orientation">horizontal</property>
                            <child>
                              <object class="GtkImage">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="icon-name">font-size-symbolic</property>
                              </object>
                            </child>
                            <child>
                              <object class="GtkImage">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="icon-name">pan-down</property>
                              </object>
                            </child>
@ -437,11 +394,9 @@
                    <child>
                      <object class="GtkBox" id="insert_buttons">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkButton" id="insert_link_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Insert or update text link</property>
@ -450,7 +405,6 @@
                            <child>
                              <object class="GtkImage" id="insert_link_image">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">insert-link-symbolic</property>
                              </object>
@ -465,7 +419,6 @@
                        <child>
                          <object class="GtkButton" id="insert_image_button">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="focus_on_click">False</property>
                            <property name="receives_default">False</property>
                            <property name="tooltip_text" translatable="yes">Insert an image</property>
@ -474,7 +427,6 @@
                            <child>
                              <object class="GtkImage">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="pixel_size">16</property>
                                <property name="icon_name">insert-image-symbolic</property>
                              </object>
@ -503,11 +455,9 @@
            <child>
              <object class="GtkBox" id="command_buttons">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkButton">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="focus_on_click">False</property>
                    <property name="receives_default">False</property>
                    <property name="tooltip_text" translatable="yes">Undo last edit</property>
@ -516,7 +466,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="pixel_size">16</property>
                        <property name="icon_name">edit-undo-symbolic</property>
                      </object>
@ -531,7 +480,6 @@
                <child>
                  <object class="GtkButton">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="focus_on_click">False</property>
                    <property name="receives_default">False</property>
                    <property name="tooltip_text" translatable="yes">Redo last edit</property>
@ -540,7 +488,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="pixel_size">16</property>
                        <property name="icon_name">edit-redo-symbolic</property>
                      </object>
@ -560,7 +507,6 @@
            <child>
              <object class="GtkButton" id="new_message_attach_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Attach a file</property>
@ -569,7 +515,6 @@
                <child>
                  <object class="GtkImage" id="new_message_attach_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="pixel_size">16</property>
                    <property name="icon_name">mail-attachment-symbolic</property>
                  </object>
@ -581,11 +526,9 @@
            </child>
            <child>
              <object class="GtkBox" id="conversation_attach_buttons">
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkButton" id="conversation_attach_new_button">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="focus_on_click">False</property>
                    <property name="receives_default">False</property>
                    <property name="tooltip_text" translatable="yes">Attach a file</property>
@ -594,7 +537,6 @@
                    <child>
                      <object class="GtkImage" id="conversation_attach_new_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="pixel_size">16</property>
                        <property name="icon_name">mail-attachment-symbolic</property>
                      </object>
@ -609,7 +551,6 @@
                <child>
                  <object class="GtkButton" id="conversation_attach_original_button">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="focus_on_click">False</property>
                    <property name="receives_default">False</property>
                    <property name="tooltip_text" translatable="yes">Add original attachments</property>
@ -618,7 +559,6 @@
                    <child>
                      <object class="GtkImage" id="conversation_attach_original_image">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="pixel_size">16</property>
                        <property name="icon_name">edit-copy-symbolic</property>
                      </object>
@ -641,7 +581,6 @@
            <child type="center">
              <object class="GtkLabel" id="info_label">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="ellipsize">end</property>
                <property name="width_chars">6</property>
                <property name="xalign">0</property>
@ -653,7 +592,6 @@
            <child>
              <object class="GtkMenuButton" id="more_options_button">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="menu_model">more_options_menu</property>
@ -673,7 +611,6 @@
            <child>
              <object class="GtkToggleButton" id="show_formatting_button">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="action_name">edt.show-formatting</property>
@ -692,7 +629,6 @@
            <child>
              <object class="GtkMenuButton" id="select_dictionary_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Select spell checking languages</property>
@ -701,7 +637,6 @@
                <child>
                  <object class="GtkImage" id="select_dictionary_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="pixel_size">16</property>
                    <property name="icon_name">tools-check-spelling-symbolic</property>
                  </object>
--- a/ui/composer-headerbar.ui
+++ b/ui/composer-headerbar.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.20"/>
  <template class="ComposerHeaderbar" parent="GtkHeaderBar">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <child type="title">
      <object class="GtkBox">
        <property name="visible">False</property>
@ -13,11 +12,9 @@
    <child>
      <object class="GtkBox" id="detach_start">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="detach_start_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="focus_on_click">False</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Detach the composer from the window</property>
@ -28,7 +25,6 @@
            <child>
              <object class="GtkImage" id="detach_start_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="pixel_size">16</property>
                <property name="icon_name">detach-symbolic</property>
              </object>
@ -43,7 +39,6 @@
        <child>
          <object class="GtkSeparator" id="detach_start_separator">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
          </object>
          <packing>
@ -57,7 +52,6 @@
    <child>
      <object class="GtkButton">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="label" translatable="yes">Cancel</property>
        <property name="action_name">cmh.composer-close</property>
      </object>
@ -65,7 +59,6 @@
    <child>
      <object class="GtkButton" id="recipients_button">
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="focus_on_click">False</property>
        <property name="receives_default">False</property>
        <property name="relief">none</property>
@ -73,7 +66,6 @@
        <child>
          <object class="GtkLabel" id="recipients_label">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="ellipsize">end</property>
          </object>
        </child>
@ -85,11 +77,9 @@
    <child>
      <object class="GtkBox" id="detach_end">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkSeparator" id="detach_end_separator">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
          </object>
          <packing>
@ -101,7 +91,6 @@
        <child>
          <object class="GtkButton" id="detach_end_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="focus_on_click">False</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Detach the composer from the window</property>
@ -112,7 +101,6 @@
            <child>
              <object class="GtkImage" id="detach_end_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="pixel_size">16</property>
                <property name="icon_name">detach-symbolic</property>
              </object>
@ -134,7 +122,6 @@
      <object class="GtkButton" id="send_button">
        <property name="label" translatable="yes">_Send</property>
        <property name="visible">True</property>
        <property name="can_focus">True</property>
        <property name="focus_on_click">False</property>
        <property name="receives_default">False</property>
        <property name="action_name">cmh.send</property>
@ -152,11 +139,9 @@
    <child>
      <object class="GtkBox" id="close_buttons">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <child>
          <object class="GtkButton" id="discard_and_close_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="focus_on_click">False</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Discard and Close</property>
@ -165,7 +150,6 @@
            <child>
              <object class="GtkImage" id="discard_and_close_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="pixel_size">16</property>
                <property name="icon_name">user-trash-symbolic</property>
              </object>
@ -180,7 +164,6 @@
        <child>
          <object class="GtkButton" id="save_and_close_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="focus_on_click">False</property>
            <property name="receives_default">False</property>
            <property name="tooltip_text" translatable="yes">Save and Close</property>
@ -189,7 +172,6 @@
            <child>
              <object class="GtkImage" id="save_and_close_image">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="pixel_size">16</property>
                <property name="icon_name">document-save-symbolic</property>
              </object>
--- a/ui/composer-link-popover.ui
+++ b/ui/composer-link-popover.ui
@ -3,13 +3,11 @@
 <interface>
  <requires lib="gtk+" version="3.14"/>
  <template class="ComposerLinkPopover" parent="GtkPopover">
    <property name="can_focus">False</property>
    <property name="position">top</property>
    <property name="width-request">360</property>
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_left">6</property>
        <property name="margin_right">6</property>
        <property name="margin_top">6</property>
@ -19,7 +17,6 @@
        <child>
          <object class="GtkEntry" id="url">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="can_default">True</property>
            <property name="hexpand">True</property>
            <property name="primary_icon_activatable">False</property>
@ -37,7 +34,6 @@
        <child>
          <object class="GtkButton" id="insert">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Note that this button and the Update button will never be shown at the same time to the user.">Insert the new link with this URL</property>
            <property name="label" translatable="yes">Add</property>
@ -56,7 +52,6 @@
        <child>
          <object class="GtkButton" id="update">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Note that this button and the Insert button will never be shown at the same time to the user.">Update this link’s URL</property>
            <property name="label" translatable="yes">Update</property>
@ -70,14 +65,12 @@
        <child>
          <object class="GtkButton" id="remove">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes">Delete this link</property>
            <signal name="clicked" handler="on_remove_clicked" swapped="no"/>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">user-trash-symbolic</property>
              </object>
            </child>
--- a/ui/composer-widget.ui
+++ b/ui/composer-widget.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.20"/>
  <template class="ComposerWidget" parent="GtkEventBox">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <signal name="drag-data-received" handler="on_drag_data_received" swapped="no"/>
    <signal name="drag-drop" handler="on_drag_drop" swapped="no"/>
    <signal name="drag-leave" handler="on_drag_leave" swapped="no"/>
@ -13,12 +12,10 @@
    <child>
      <object class="GtkBox" id="composer_container">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkBox" id="header_container">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <placeholder/>
            </child>
@ -32,22 +29,18 @@
        <child>
          <object class="GtkBox" id="hidden_on_attachment_drag_over">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="GtkBox" id="hidden_on_attachment_drag_over_child">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="orientation">vertical</property>
                <property name="spacing">6</property>
                <child>
                  <object class="GtkGrid" id="email_headers">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <object class="GtkBox" id="filled_headers">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="margin_top">6</property>
                        <property name="orientation">vertical</property>
                        <child>
@ -68,11 +61,9 @@
                    <child>
                      <object class="GtkRevealer" id="extended_headers_revealer">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <child>
                          <object class="GtkBox" id="extended_headers">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="orientation">vertical</property>
                            <child>
                              <placeholder/>
@ -115,18 +106,15 @@
        <child>
          <object class="GtkBox" id="visible_on_attachment_drag_over">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="GtkBox" id="visible_on_attachment_drag_over_child">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="valign">center</property>
                <property name="orientation">vertical</property>
                <property name="spacing">6</property>
                <child>
                  <object class="GtkLabel" id="label1">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="valign">center</property>
                    <property name="label" translatable="yes">Drop files here</property>
                    <attributes>
@ -142,7 +130,6 @@
                <child>
                  <object class="GtkLabel" id="label2">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="valign">center</property>
                    <property name="label" translatable="yes">To add them as attachments</property>
                  </object>
@ -169,7 +156,6 @@
        <child>
          <object class="GtkGrid" id="editor_container">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
@ -208,7 +194,6 @@
        <child>
          <object class="GtkBox" id="attachments_box">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <child>
              <placeholder/>
@ -228,14 +213,12 @@
  </template>
  <object class="GtkToggleButton" id="show_extended_headers">
    <property name="visible">True</property>
    <property name="can_focus">True</property>
    <property name="receives_default">True</property>
    <property name="tooltip_text" translatable="yes">Show Cc, Bcc, and Reply-To fields</property>
    <property name="action_name">win.show-extended-headers</property>
    <child>
      <object class="GtkImage">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="icon_name">view-more-horizontal-symbolic</property>
      </object>
    </child>
--- a/ui/conversation-contact-popover.ui
+++ b/ui/conversation-contact-popover.ui
@ -3,17 +3,14 @@
 <interface>
  <requires lib="gtk+" version="3.20"/>
  <template class="ConversationContactPopover" parent="GtkPopover">
    <property name="can_focus">False</property>
    <signal name="closed" handler="after_closed" after="yes" swapped="no"/>
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkGrid" id="contact_pane">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="margin_left">10</property>
            <property name="margin_right">10</property>
            <property name="margin_top">10</property>
@ -22,12 +19,10 @@
            <child>
              <object class="GtkGrid">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="margin_bottom">6</property>
                <property name="column_spacing">12</property>
                <child>
                  <object class="GtkButton" id="unstarred_button">
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
                    <property name="halign">end</property>
                    <property name="valign">center</property>
@ -36,7 +31,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">non-starred-symbolic</property>
                      </object>
                    </child>
@ -48,7 +42,6 @@
                </child>
                <child>
                  <object class="GtkButton" id="starred_button">
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
                    <property name="halign">end</property>
                    <property name="valign">center</property>
@ -57,7 +50,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">starred-symbolic</property>
                      </object>
                    </child>
@ -70,7 +62,6 @@
                <child>
                  <object class="GtkImage" id="avatar">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="pixel_size">48</property>
                  </object>
                  <packing>
@ -81,12 +72,10 @@
                <child>
                  <object class="GtkGrid">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <object class="GtkLabel" id="contact_name">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="valign">end</property>
                        <property name="vexpand">True</property>
@ -99,7 +88,6 @@
                    <child>
                      <object class="GtkLabel" id="contact_address">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="halign">start</property>
                        <property name="valign">start</property>
                        <property name="margin_top">2</property>
@ -130,7 +118,6 @@
            <child>
              <object class="GtkSeparator">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
              </object>
              <packing>
                <property name="left_attach">0</property>
@ -140,7 +127,6 @@
            <child>
              <object class="GtkModelButton">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.new-conversation</property>
                <property name="text" translatable="yes">New Conversation…</property>
@ -153,7 +139,6 @@
            <child>
              <object class="GtkModelButton">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.copy-email</property>
                <property name="text" translatable="yes">Copy Email Address</property>
@ -166,7 +151,6 @@
            <child>
              <object class="GtkSeparator">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
              </object>
              <packing>
                <property name="left_attach">0</property>
@ -176,7 +160,6 @@
            <child>
              <object class="GtkModelButton" id="save_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.save</property>
                <property name="text" translatable="yes">Save in Contacts…</property>
@ -189,7 +172,6 @@
            <child>
              <object class="GtkModelButton">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.show-conversations</property>
                <property name="text" translatable="yes">Show Conversations</property>
@ -202,7 +184,6 @@
            <child>
              <object class="GtkModelButton" id="open_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.open</property>
                <property name="text" translatable="yes">Open in Contacts</property>
@ -215,7 +196,6 @@
            <child>
              <object class="GtkModelButton" id="load_remote_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">True</property>
                <property name="action_name">con.load-remote</property>
                <property name="text" translatable="yes">Always Load Remote Images</property>
@ -233,7 +213,6 @@
        </child>
        <child>
          <object class="GtkGrid" id="deceptive_pane">
            <property name="can_focus">False</property>
            <property name="margin_left">10</property>
            <property name="margin_right">10</property>
            <property name="margin_top">10</property>
@ -243,12 +222,10 @@
            <child>
              <object class="GtkGrid">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="column_spacing">12</property>
                <child>
                  <object class="GtkImage">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="pixel_size">24</property>
                    <property name="icon_name">dialog-warning-symbolic</property>
                  </object>
@ -260,7 +237,6 @@
                <child>
                  <object class="GtkLabel">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="label" translatable="yes" comments="Title label on contact popover">Deceptive email address</property>
                    <style>
                      <class name="title"/>
@ -280,7 +256,6 @@
            <child>
              <object class="GtkSeparator">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
              </object>
              <packing>
                <property name="left_attach">0</property>
@ -290,7 +265,6 @@
            <child>
              <object class="GtkLabel">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="label" translatable="yes" comments="Contact popover label">This email address is:</property>
                <property name="xalign">0</property>
              </object>
@ -302,7 +276,6 @@
            <child>
              <object class="GtkLabel" id="actual_email_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <style>
                  <class name="geary-deceptive"/>
                </style>
@ -315,7 +288,6 @@
            <child>
              <object class="GtkLabel">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="label" translatable="yes" comments="Contact popover label">But was forged as:</property>
                <property name="xalign">0</property>
              </object>
@ -327,7 +299,6 @@
            <child>
              <object class="GtkLabel" id="forged_email_label">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <style>
                  <class name="geary-deceptive"/>
                </style>
@ -340,7 +311,6 @@
            <child>
              <object class="GtkLabel">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="label" translatable="yes" comments="Contact popover label">The sender may not be trustworthy</property>
                <property name="xalign">0</property>
              </object>
--- a/ui/conversation-email.ui
+++ b/ui/conversation-email.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.14"/>
  <template class="ConversationEmail" parent="GtkBox">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="hexpand">True</property>
    <property name="orientation">vertical</property>
    <child>
@ -16,13 +15,11 @@
  </template>
  <object class="GtkGrid" id="actions">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="halign">end</property>
    <property name="valign">start</property>
    <child>
      <object class="GtkButton" id="attachments_button">
        <property name="sensitive">False</property>
        <property name="can_focus">True</property>
        <property name="receives_default">True</property>
        <property name="tooltip_text" translatable="yes">Save all attachments</property>
        <property name="valign">start</property>
@ -31,7 +28,6 @@
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="icon_name">mail-attachment-symbolic</property>
          </object>
        </child>
@ -45,7 +41,6 @@
      <object class="GtkButton" id="star_button">
        <property name="visible">True</property>
        <property name="sensitive">False</property>
        <property name="can_focus">True</property>
        <property name="receives_default">True</property>
        <property name="tooltip_text" translatable="yes" comments="Note: The application will never show this button at the same time as unstar_button, one will always be hidden.">Mark this message as starred</property>
        <property name="valign">start</property>
@ -54,7 +49,6 @@
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="icon_name">non-starred-symbolic</property>
          </object>
        </child>
@ -67,7 +61,6 @@
    <child>
      <object class="GtkButton" id="unstar_button">
        <property name="sensitive">False</property>
        <property name="can_focus">True</property>
        <property name="receives_default">True</property>
        <property name="tooltip_text" translatable="yes" comments="Note: The application will never show this button at the same time as star_button, one will always be hidden.">Mark this message as not starred</property>
        <property name="valign">start</property>
@ -76,7 +69,6 @@
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="icon_name">starred-symbolic</property>
          </object>
        </child>
@ -90,7 +82,6 @@
      <object class="GtkMenuButton" id="email_menubutton">
        <property name="visible">True</property>
        <property name="sensitive">False</property>
        <property name="can_focus">True</property>
        <property name="receives_default">True</property>
        <property name="valign">start</property>
        <property name="relief">none</property>
@ -98,7 +89,6 @@
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="icon_name">view-more-symbolic</property>
          </object>
        </child>
@ -111,7 +101,6 @@
  </object>
  <object class="GtkGrid" id="sub_messages">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="hexpand">True</property>
    <property name="orientation">vertical</property>
    <child>
--- a/ui/conversation-message-link-popover.ui
+++ b/ui/conversation-message-link-popover.ui
@ -3,12 +3,10 @@
 <interface>
  <requires lib="gtk+" version="3.14"/>
  <object class="GtkPopover" id="link_popover">
    <property name="can_focus">False</property>
    <property name="position">bottom</property>
    <child>
      <object class="GtkGrid">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_left">12</property>
        <property name="margin_right">12</property>
        <property name="margin_top">12</property>
@ -17,7 +15,6 @@
        <child>
          <object class="GtkImage">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">center</property>
            <property name="margin_right">12</property>
            <property name="vexpand">True</property>
@ -33,7 +30,6 @@
        <child>
          <object class="GtkLabel" id="bad_link_label">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="margin_left">12</property>
            <property name="label">&lt;a href="http://badlink.com"&gt;http://badlink.com&lt;/a&gt;</property>
@ -49,7 +45,6 @@
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="label" translatable="yes">But actually goes to:</property>
          </object>
@ -61,7 +56,6 @@
        <child>
          <object class="GtkLabel" id="good_link_label">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="margin_left">12</property>
            <property name="margin_bottom">6</property>
@ -78,7 +72,6 @@
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="margin_top">12</property>
            <property name="label" translatable="yes">The link appears to go to:</property>
@ -91,7 +84,6 @@
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="label" translatable="yes">Deceptive link found</property>
            <attributes>
@ -106,7 +98,6 @@
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="label" translatable="yes">The email sender may be leading you to the wrong web site.</property>
          </object>
@ -118,7 +109,6 @@
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="halign">start</property>
            <property name="margin_top">12</property>
            <property name="label" translatable="yes">If unsure, contact the sender and ask before continuing.</property>
--- a/ui/conversation-message.ui
+++ b/ui/conversation-message.ui
@ -4,12 +4,10 @@
  <requires lib="gtk+" version="3.14"/>
  <template class="ConversationMessage" parent="GtkGrid">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="orientation">vertical</property>
    <child>
      <object class="GtkGrid" id="summary">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="hexpand">True</property>
        <property name="column_spacing">6</property>
        <child>
@ -17,7 +15,6 @@
            <property name="width_request">18</property>
            <property name="height_request">18</property>
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="valign">start</property>
            <property name="pixel_size">48</property>
          </object>
@ -29,36 +26,30 @@
        <child>
          <object class="GtkGrid">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>
            <property name="orientation">vertical</property>
            <child>
              <object class="GtkRevealer" id="compact_revealer">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="hexpand">True</property>
                <property name="transition_type">none</property>
                <property name="reveal_child">True</property>
                <child>
                  <object class="GtkGrid">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="hexpand">True</property>
                    <child>
                      <object class="GtkGrid">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="orientation">vertical</property>
                        <child>
                          <object class="GtkGrid">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="hexpand">True</property>
                            <child>
                              <object class="GtkLabel" id="compact_from">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="hexpand">True</property>
                                <property name="label" translatable="yes">From &lt;email&gt;</property>
                                <property name="ellipsize">end</property>
@ -75,7 +66,6 @@
                            <child>
                              <object class="GtkLabel" id="compact_date">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">1/1/1970	</property>
                                <property name="ellipsize">end</property>
                                <style>
@ -96,7 +86,6 @@
                        <child>
                          <object class="GtkLabel" id="compact_body">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="hexpand">True</property>
                            <property name="label" translatable="yes">Preview body text.</property>
@ -131,29 +120,24 @@
            <child>
              <object class="GtkRevealer" id="header_revealer">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="hexpand">True</property>
                <property name="transition_type">none</property>
                <child>
                  <object class="GtkGrid">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="hexpand">True</property>
                    <child>
                      <object class="GtkGrid" id="headers">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="hexpand">True</property>
                        <property name="orientation">vertical</property>
                        <child>
                          <object class="GtkGrid" id="from_header">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="hexpand">True</property>
                            <child>
                              <object class="GtkFlowBox" id="from">
                                <property name="visible">True</property>
                                <property name="can_focus">True</property>
                                <property name="valign">baseline</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -172,7 +156,6 @@
                            <child>
                              <object class="GtkLabel" id="date">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">baseline</property>
                                <property name="label" translatable="yes">1/1/1970	</property>
                                <property name="ellipsize">end</property>
@ -193,11 +176,9 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="sender_header">
                            <property name="can_focus">False</property>
                            <child>
                              <object class="GtkLabel" id="sender_label">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">Sent by:</property>
                                <property name="yalign">0</property>
                                <style>
@ -213,7 +194,6 @@
                            <child>
                              <object class="GtkFlowBox" id="sender_address">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">start</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -237,11 +217,9 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="reply_to_header">
                            <property name="can_focus">False</property>
                            <child>
                              <object class="GtkLabel" id="reply_to_label">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">Reply to:</property>
                                <property name="yalign">0</property>
                                <style>
@ -257,7 +235,6 @@
                            <child>
                              <object class="GtkFlowBox" id="reply_to_addresses">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">start</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -282,7 +259,6 @@
                        <child>
                          <object class="GtkLabel" id="subject">
                            <property name="visible">True</property>
                            <property name="can_focus">True</property>
                            <property name="halign">start</property>
                            <property name="hexpand">True</property>
                            <property name="label" translatable="yes">Subject</property>
@ -301,11 +277,9 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="to_header">
                            <property name="can_focus">False</property>
                            <child>
                              <object class="GtkLabel" id="to_label">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">To:</property>
                                <property name="yalign">0</property>
                                <style>
@ -321,7 +295,6 @@
                            <child>
                              <object class="ConversationMessageContactList" id="to">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">start</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -345,11 +318,9 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="cc_header">
                            <property name="can_focus">False</property>
                            <child>
                              <object class="GtkLabel" id="cc_label">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">Cc:</property>
                                <property name="yalign">0</property>
                                <style>
@ -365,7 +336,6 @@
                            <child>
                              <object class="ConversationMessageContactList" id="cc">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">start</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -389,11 +359,9 @@
                        </child>
                        <child>
                          <object class="GtkGrid" id="bcc_header">
                            <property name="can_focus">False</property>
                            <child>
                              <object class="GtkLabel" id="bcc_label">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="label" translatable="yes">Bcc:</property>
                                <property name="yalign">0</property>
                                <style>
@ -409,7 +377,6 @@
                            <child>
                              <object class="ConversationMessageContactList" id="bcc">
                                <property name="visible">True</property>
                                <property name="can_focus">False</property>
                                <property name="valign">start</property>
                                <property name="hexpand">True</property>
                                <property name="column_spacing">2</property>
@ -466,16 +433,13 @@
    <child>
      <object class="GtkRevealer" id="body_revealer">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="transition_type">slide-up</property>
        <child>
          <object class="GtkGrid">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <child>
              <object class="ComponentsInfoBarStack" id="info_bars">
                <property name="visible">False</property>
                <property name="can_focus">False</property>
                <property name="shadow_type">none</property>
                <property name="algorithm">priority-queue</property>
              </object>
@ -488,11 +452,9 @@
              <object class="GtkOverlay">
                <property name="height_request">6</property>
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkGrid" id="body_container">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="orientation">vertical</property>
                    <child>
                      <placeholder/>
@ -531,7 +493,6 @@
                </child>
                <child type="overlay">
                  <object class="GtkProgressBar" id="body_progress">
                    <property name="can_focus">False</property>
                    <property name="valign">start</property>
                    <style>
                      <class name="osd"/>
--- a/ui/conversation-viewer.ui
+++ b/ui/conversation-viewer.ui
@ -5,14 +5,12 @@
  <template class="ConversationViewer" parent="GtkStack">
    <property name="name">conversation_viewer</property>
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="transition_type">crossfade</property>
    <child>
      <object class="GtkSpinner" id="loading_page">
        <property name="width_request">32</property>
        <property name="height_request">32</property>
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="halign">center</property>
        <property name="valign">center</property>
      </object>
@ -23,7 +21,6 @@
    <child>
      <object class="GtkGrid" id="no_conversations_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
@ -37,23 +34,19 @@
    <child>
      <object class="GtkGrid" id="conversation_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkSearchBar" id="conversation_find_bar">
            <property name="visible">True</property>
            <property name="app_paintable">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>
            <signal name="notify::search-mode-enabled" handler="on_find_mode_changed" swapped="no"/>
            <child>
              <object class="GtkGrid">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <child>
                  <object class="GtkSearchEntry" id="conversation_find_entry">
                    <property name="visible">True</property>
                    <property name="can_focus">True</property>
                    <property name="primary_icon_name">edit-find-symbolic</property>
                    <property name="primary_icon_activatable">False</property>
                    <property name="primary_icon_sensitive">False</property>
@ -69,7 +62,6 @@
                <child>
                  <object class="GtkButton" id="conversation_find_prev">
                    <property name="sensitive">False</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
                    <property name="no_show_all">True</property>
                    <property name="tooltip_text" translatable="yes">Find the previous occurrence of the search string.</property>
@ -77,7 +69,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">go-up-symbolic</property>
                      </object>
                    </child>
@ -90,7 +81,6 @@
                <child>
                  <object class="GtkButton" id="conversation_find_next">
                    <property name="sensitive">False</property>
                    <property name="can_focus">True</property>
                    <property name="receives_default">True</property>
                    <property name="no_show_all">True</property>
                    <property name="tooltip_text" translatable="yes">Find the next occurrence of the search string.</property>
@ -98,7 +88,6 @@
                    <child>
                      <object class="GtkImage">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="icon_name">go-down-symbolic</property>
                      </object>
                    </child>
@ -131,7 +120,6 @@
    <child>
      <object class="GtkGrid" id="multiple_conversations_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
@ -145,7 +133,6 @@
    <child>
      <object class="GtkGrid" id="empty_folder_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
@ -159,7 +146,6 @@
    <child>
      <object class="GtkGrid" id="empty_search_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
@ -173,7 +159,6 @@
    <child>
      <object class="GtkGrid" id="composer_page">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <placeholder/>
--- a/ui/find_bar.glade
+++ b/ui/find_bar.glade
@ -3,28 +3,23 @@
  <!-- interface-requires gtk+ 3.14 -->
  <object class="GtkImage" id="image1">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">go-down-symbolic</property>
  </object>
  <object class="GtkImage" id="image2">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">window-close-symbolic</property>
    <property name="icon-size">1</property>
  </object>
  <object class="GtkImage" id="image3">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">go-up-symbolic</property>
  </object>
  <object class="GtkBox" id="box: contents">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="orientation">vertical</property>
    <child>
      <object class="GtkSeparator" id="separator1">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
      </object>
      <packing>
        <property name="expand">False</property>
@ -35,7 +30,6 @@
    <child>
      <object class="GtkBox" id="box: controls">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_top">2</property>
        <property name="margin_bottom">2</property>
        <style>
@ -44,7 +38,6 @@
        <child>
          <object class="GtkButton" id="button: close">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="margin_end">6</property>
            <property name="image">image2</property>
@ -60,7 +53,6 @@
        <child>
          <object class="GtkLabel" id="label: find">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="margin_end">2</property>
            <property name="yalign">0.4699999988079071</property>
            <property name="label" translatable="yes">Find:</property>
@ -74,7 +66,6 @@
        <child>
          <object class="GtkEntry" id="entry: find">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="invisible_char">●</property>
            <property name="invisible_char_set">True</property>
          </object>
@ -88,7 +79,6 @@
          <object class="GtkButton" id="button: previous">
            <property name="label" translatable="yes">_Previous</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="margin_start">2</property>
            <property name="image">image3</property>
@ -106,7 +96,6 @@
          <object class="GtkButton" id="button: next">
            <property name="label" translatable="yes">_Next</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="image">image1</property>
            <property name="relief">none</property>
@ -124,7 +113,6 @@
          <object class="GtkCheckButton" id="check: case_sensitive">
            <property name="label" translatable="yes">_Case sensitive</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">False</property>
            <property name="margin_start">8</property>
            <property name="margin_end">8</property>
@ -141,7 +129,6 @@
        </child>
        <child>
          <object class="GtkLabel" id="label: result">
            <property name="can_focus">False</property>
            <property name="label" translatable="yes">label</property>
          </object>
          <packing>
--- a/ui/folder-popover.ui
+++ b/ui/folder-popover.ui
@ -3,11 +3,9 @@
 <interface>
  <requires lib="gtk+" version="3.14"/>
  <template class="FolderPopover" parent="GtkPopover">
    <property name="can_focus">False</property>
    <child>
      <object class="GtkBox" id="container">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="margin_start">6</property>
        <property name="margin_end">6</property>
        <property name="margin_top">6</property>
@ -17,7 +15,6 @@
        <child>
          <object class="GtkSearchEntry" id="search_entry">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="primary_icon_name">edit-find-symbolic</property>
            <property name="primary_icon_activatable">False</property>
            <property name="primary_icon_sensitive">False</property>
@ -35,13 +32,11 @@
            <property name="min_content_width">200</property>
            <property name="min_content_height">320</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="shadow_type">in</property>
            <property name="hscrollbar_policy">never</property>
            <child>
              <object class="GtkListBox" id="list_box">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="activate_on_single_click">True</property>
                <signal name="row_activated" handler="on_row_activated" swapped="no"/>
                <style>
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@ -4,38 +4,32 @@
  <requires lib="gtk+" version="3.20"/>
  <object class="GtkImage" id="archive_image">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="icon_name">mail-archive-symbolic</property>
  </object>
  <template class="MainToolbar" parent="HdyLeaflet">
    <property name="visible">True</property>
    <property name="can_focus">False</property>
    <property name="can_swipe_back">True</property>
    <property name="transition_type">over</property>
    <child>
      <object class="HdyLeaflet" id="conversations_leaflet">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="can_swipe_back">True</property>
        <property name="transition_type">over</property>
        <property name="hexpand_set">True</property>
        <child>
          <object class="GtkHeaderBar" id="folder_header">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
            <property name="title">Mail</property>
            <child>
              <object class="GtkMenuButton" id="main_menu_button">
                <property name="visible">True</property>
                <property name="can_focus">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="main_menu_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">open-menu-symbolic</property>
                  </object>
                </child>
@ -53,7 +47,6 @@
        <child>
          <object class="GtkSeparator" id="folder_separator">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="orientation">vertical</property>
            <style>
              <class name="sidebar"/>
@ -66,12 +59,10 @@
        <child>
          <object class="GtkHeaderBar" id="conversations_header">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="hexpand">True</property>
            <property name="show_close_button" bind-source="MainToolbar" bind-property="show_close_button" bind-flags="sync-create"/>
            <child>
              <object class="GtkButton" id="conversations_back">
                <property name="can_focus">False</property>
                <property name="receives_default">False</property>
                <property name="valign">center</property>
                <property name="use-underline">True</property>
@ -88,7 +79,6 @@
                <child>
                  <object class="GtkImage" id="conversations_back_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">go-previous-symbolic</property>
                    <property name="icon_size">1</property>
                  </object>
@ -98,7 +88,6 @@
            <child>
              <object class="GtkButton" id="compose_new_message_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes" context="tooltip">Compose Message</property>
@ -107,7 +96,6 @@
                <child>
                  <object class="GtkImage" id="compose_new_message_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">text-editor-symbolic</property>
                  </object>
                </child>
@ -116,7 +104,6 @@
            <child>
              <object class="GtkToggleButton" id="search_conversations_button">
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="focus_on_click">False</property>
                <property name="receives_default">False</property>
                <property name="tooltip_text" translatable="yes">Toggle search bar</property>
@ -124,7 +111,6 @@
                <child>
                  <object class="GtkImage" id="search_conversations_image">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="icon_name">preferences-system-search-symbolic</property>
                  </object>
                </child>
@ -147,7 +133,6 @@
    <child>
      <object class="GtkSeparator" id="conversations_separator">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <style>
          <class name="sidebar"/>
--- a/ui/password-dialog.glade
+++ b/ui/password-dialog.glade
@ -3,7 +3,6 @@
 <interface>
  <requires lib="gtk+" version="3.10"/>
  <object class="GtkDialog" id="PasswordDialog">
    <property name="can_focus">False</property>
    <property name="border_width">6</property>
    <property name="resizable">False</property>
    <property name="modal">True</property>
@ -11,20 +10,17 @@
    <property name="has_resize_grip">False</property>
    <child internal-child="vbox">
      <object class="GtkBox" id="dialog-vbox1">
        <property name="can_focus">False</property>
        <property name="margin_top">6</property>
        <property name="orientation">vertical</property>
        <property name="spacing">12</property>
        <child>
          <object class="GtkBox" id="box1">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="border_width">6</property>
            <property name="spacing">15</property>
            <child>
              <object class="GtkImage" id="image1">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="yalign">0</property>
                <property name="icon_name">dialog-password-symbolic</property>
                <property name="use_fallback">True</property>
@ -39,13 +35,11 @@
            <child>
              <object class="GtkBox" id="box2">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="orientation">vertical</property>
                <property name="spacing">12</property>
                <child>
                  <object class="GtkLabel" id="primary_text_label">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="xalign">2.2351741291171123e-10</property>
                    <property name="yalign">0</property>
                    <property name="label">(set in password-dialog.vala)</property>
@ -62,12 +56,10 @@
                <child>
                  <object class="GtkGrid" id="grid">
                    <property name="visible">True</property>
                    <property name="can_focus">False</property>
                    <property name="row_spacing">6</property>
                    <property name="column_spacing">6</property>
                    <child>
                      <object class="GtkLabel" id="label: smtp">
                        <property name="can_focus">False</property>
                        <property name="no_show_all">True</property>
                        <property name="margin_bottom">4</property>
                        <property name="xalign">0</property>
@ -86,7 +78,6 @@
                    <child>
                      <object class="GtkLabel" id="label for: username">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="xalign">1</property>
                        <property name="label" translatable="yes">Username</property>
                        <style>
@ -103,7 +94,6 @@
                    <child>
                      <object class="GtkLabel" id="label for: password">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="xalign">1</property>
                        <property name="label" translatable="yes">Password</property>
                        <style>
@ -120,7 +110,6 @@
                    <child>
                      <object class="GtkLabel" id="label: username">
                        <property name="visible">True</property>
                        <property name="can_focus">False</property>
                        <property name="xalign">0</property>
                        <property name="label">(set in password-dialog.vala)</property>
                      </object>
@ -134,7 +123,6 @@
                    <child>
                      <object class="GtkEntry" id="entry: password">
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="hexpand">True</property>
                        <property name="visibility">False</property>
                        <property name="invisible_char">•</property>
@ -151,7 +139,6 @@
                      <object class="GtkCheckButton" id="check: remember_password">
                        <property name="label" translatable="yes">_Remember password</property>
                        <property name="visible">True</property>
                        <property name="can_focus">True</property>
                        <property name="receives_default">False</property>
                        <property name="halign">end</property>
                        <property name="use_underline">True</property>
@ -188,14 +175,12 @@
        </child>
        <child internal-child="action_area">
          <object class="GtkButtonBox" id="dialog-action_area1">
            <property name="can_focus">False</property>
            <property name="valign">end</property>
            <property name="layout_style">end</property>
            <child>
              <object class="GtkButton" id="cancel_button">
                <property name="label" translatable="yes">_Cancel</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="receives_default">False</property>
                <property name="use_underline">True</property>
              </object>
@ -209,7 +194,6 @@
              <object class="GtkButton" id="authenticate_button">
                <property name="label" translatable="yes">_Authenticate</property>
                <property name="visible">True</property>
                <property name="can_focus">True</property>
                <property name="can_default">True</property>
                <property name="receives_default">True</property>
                <property name="use_underline">True</property>
--- a/ui/problem-details-dialog.ui
+++ b/ui/problem-details-dialog.ui
@ -4,7 +4,6 @@
  <requires lib="gtk+" version="3.20"/>
  <requires lib="libhandy" version="0.0"/>
  <template class="DialogsProblemDetailsDialog" parent="GtkDialog">
    <property name="can_focus">False</property>
    <property name="default_width">800</property>
    <property name="default_height">500</property>
    <property name="modal">True</property>
@ -13,20 +12,17 @@
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <property name="visible">True</property>
        <property name="can_focus">False</property>
        <property name="title" translatable="yes" comments="Dialog title for displaying technical details of a problem. Same as the button that invokes it.">Details</property>
        <property name="show_close_button">True</property>
        <child>
          <object class="GtkToggleButton" id="search_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for problem report button">Search for matching log entries</property>
            <property name="action_name">win.toggle-search</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-find-symbolic</property>
              </object>
            </child>
@ -38,7 +34,6 @@
        <child type="title">
          <object class="GtkStackSwitcher">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <property name="stack">stack</property>
          </object>
        </child>
@ -46,7 +41,6 @@
          <object class="GtkButton" id="save_as_button">
            <property name="label" translatable="yes" comments="Button label for saving problem report information">Save As</property>
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for problem report button">Save logs entries and details</property>
            <signal name="clicked" handler="on_save_as_clicked" swapped="no"/>
@ -62,14 +56,12 @@
        <child>
          <object class="GtkButton" id="copy_button">
            <property name="visible">True</property>
            <property name="can_focus">True</property>
            <property name="receives_default">True</property>
            <property name="tooltip_text" translatable="yes" comments="Tooltip for problem report button">Copy to clipboard</property>
            <property name="action_name">win.copy</property>
            <child>
              <object class="GtkImage">
                <property name="visible">True</property>
                <property name="can_focus">False</property>
                <property name="icon_name">edit-copy-symbolic</property>
              </object>
            </child>
@ -85,12 +77,10 @@
      <object class="GtkBox">
        <property name="visible">True</property>
        <property name="border_width">0</property>
        <property name="can_focus">False</property>
        <property name="orientation">vertical</property>
        <child>
          <object class="GtkStack" id="stack">
            <property name="visible">True</property>
            <property name="can_focus">False</property>
            <signal name="notify::visible-child" handler="on_visible_child_changed" swapped="no"/>
          </object>
          <packing>