[geary/mjog/fix-composer-actions: 1/2] ui/composer-widget.ui: Make action bars child of the editor box

[Michael Gratton <mjog src gnome org>]

commit 12826960488b27dcfeb78174369a280253964533
Author: Michael Gratton <mike vee net>
Date:   Fri Aug 28 14:06:27 2020 +1000

    ui/composer-widget.ui: Make action bars child of the editor box
    
    Editor actions are defined on the editor box, so action bars need to be
    decedents of that to pick up the actions.

 ui/composer-widget.ui | 911 +++++++++++++++++++++++++-------------------------
 1 file changed, 453 insertions(+), 458 deletions(-)
---
diff --git a/ui/composer-widget.ui b/ui/composer-widget.ui
index 2f86903da..68f6e53c3 100644
--- a/ui/composer-widget.ui
+++ b/ui/composer-widget.ui
@@ -576,655 +576,650 @@
                 </style>
               </object>
             </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">True</property>
-            <property name="position">3</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkBox" id="action_bar_box">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkRevealer" id="formatting">
+              <object class="GtkBox" id="action_bar_box">
                 <property name="visible">True</property>
-                <property name="transition_type">slide-up</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkActionBar">
+                  <object class="GtkRevealer" id="formatting">
                     <property name="visible">True</property>
+                    <property name="transition_type">slide-up</property>
                     <child>
-                      <object class="ComponentsReflowBox" id="toolbar_box">
+                      <object class="GtkActionBar">
                         <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">
+                          <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="GtkToggleButton" id="bold_button">
+                              <object class="GtkBox" id="font_style_buttons">
                                 <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>
-                                <property name="action_name">edt.bold</property>
-                                <property name="always_show_image">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkImage" id="bold_image">
+                                  <object class="GtkToggleButton" id="bold_button">
                                     <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>
+                                    <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>
+                                    <property name="action_name">edt.bold</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <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>
-                                <property name="action_name">edt.italic</property>
-                                <property name="always_show_image">True</property>
                                 <child>
-                                  <object class="GtkImage" id="italics_image">
+                                  <object class="GtkToggleButton" id="italics_button">
                                     <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>
+                                    <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>
+                                    <property name="action_name">edt.italic</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <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>
-                                <property name="action_name">edt.underline</property>
-                                <property name="always_show_image">True</property>
                                 <child>
-                                  <object class="GtkImage" id="underline_image">
+                                  <object class="GtkToggleButton" id="underline_button">
                                     <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>
+                                    <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>
+                                    <property name="action_name">edt.underline</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <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>
+                                    <property name="action_name">edt.strikethrough</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
                                 </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">2</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkToggleButton" id="strikethrough_button">
+                              <object class="GtkBox" id="list_buttons">
                                 <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>
-                                <property name="action_name">edt.strikethrough</property>
-                                <property name="always_show_image">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkImage" id="strikethrough_image">
+                                  <object class="GtkButton" id="ulist_button">
                                     <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>
+                                    <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>
+                                    <property name="action_name">edt.ulist</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkButton" id="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>
+                                    <property name="action_name">edt.olist</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">3</property>
-                              </packing>
                             </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
-                          </object>
-                        </child>
-                        <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">
+                              <object class="GtkBox" id="indentation_buttons">
                                 <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>
-                                <property name="action_name">edt.ulist</property>
-                                <property name="always_show_image">True</property>
+                                <property name="can_focus">False</property>
                                 <child>
-                                  <object class="GtkImage" id="ulist_image">
+                                  <object class="GtkButton" id="indent_button">
                                     <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>
+                                    <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>
+                                    <property name="action_name">edt.indent</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
+                                <child>
+                                  <object class="GtkButton" id="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>
+                                    <property name="action_name">edt.outdent</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="olist_button">
+                              <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">Insert numbered 
list</property>
-                                <property name="action_name">edt.olist</property>
+                                <property name="tooltip_text" translatable="yes">Remove text 
formatting</property>
+                                <property name="action_name">edt.remove-format</property>
                                 <property name="always_show_image">True</property>
                                 <child>
-                                  <object class="GtkImage" id="olist_image">
+                                  <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-ordered-list-symbolic</property>
+                                    <property name="icon_name">format-text-remove-symbolic</property>
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
-                          </object>
-                        </child>
-                        <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">
+                              <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="receives_default">False</property>
-                                <property name="tooltip_text" translatable="yes">Indent or quote 
text</property>
-                                <property name="action_name">edt.indent</property>
-                                <property name="always_show_image">True</property>
+                                <property name="menu_model">font_menu</property>
+                                <property name="tooltip_text" translatable="yes">Change font type</property>
+                                <property name="direction">up</property>
                                 <child>
-                                  <object class="GtkImage" id="indent_image">
+                                  <object class="GtkBox">
                                     <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>
+                                    <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>
+                                          <packing>
+                                            <property name="name">sans</property>
+                                          </packing>
+                                        </child>
+                                        <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>
+                                          <packing>
+                                            <property name="name">serif</property>
+                                          </packing>
+                                        </child>
+                                        <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>
+                                          <packing>
+                                            <property name="name">monospace</property>
+                                          </packing>
+                                        </child>
+                                      </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>
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
                             </child>
                             <child>
-                              <object class="GtkButton" id="outdent_button">
+                              <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">Un-indent or unquote 
text</property>
-                                <property name="action_name">edt.outdent</property>
-                                <property name="always_show_image">True</property>
+                                <property name="action_name">edt.color</property>
+                                <property name="tooltip_text" translatable="yes">Change font color</property>
                                 <child>
-                                  <object class="GtkImage" id="outdent_image">
+                                  <object class="GtkImage" id="font_color_icon">
                                     <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>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
-                            </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
-                          </object>
-                        </child>
-                        <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>
-                            <property name="action_name">edt.remove-format</property>
-                            <property name="always_show_image">True</property>
-                            <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>
                             </child>
-                          </object>
-                        </child>
-                        <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>
-                            <property name="direction">up</property>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkMenuButton" id="font_size_button">
                                 <property name="visible">True</property>
-                                <property name="can_focus">False</property>
-                                <property name="orientation">horizontal</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>
+                                <property name="direction">up</property>
                                 <child>
-                                  <object class="GtkStack" id="font_button_stack">
+                                  <object class="GtkBox">
                                     <property name="visible">True</property>
                                     <property name="can_focus">False</property>
+                                    <property name="orientation">horizontal</property>
                                     <child>
-                                      <object class="GtkLabel">
+                                      <object class="GtkImage">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Sans Serif</property>
-                                        <property name="halign">start</property>
+                                        <property name="icon-name">font-size-symbolic</property>
                                       </object>
-                                      <packing>
-                                        <property name="name">sans</property>
-                                      </packing>
                                     </child>
                                     <child>
-                                      <object class="GtkLabel">
+                                      <object class="GtkImage">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Serif</property>
-                                        <property name="halign">start</property>
+                                        <property name="icon-name">pan-down</property>
                                       </object>
-                                      <packing>
-                                        <property name="name">serif</property>
-                                      </packing>
                                     </child>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
+                            <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>
+                                    <property name="action_name">edt.insert-link</property>
+                                    <property name="always_show_image">True</property>
                                     <child>
-                                      <object class="GtkLabel">
+                                      <object class="GtkImage" id="insert_link_image">
                                         <property name="visible">True</property>
                                         <property name="can_focus">False</property>
-                                        <property name="label" translatable="yes">Fixed Width</property>
-                                        <property name="halign">start</property>
+                                        <property name="pixel_size">16</property>
+                                        <property name="icon_name">insert-link-symbolic</property>
                                       </object>
-                                      <packing>
-                                        <property name="name">monospace</property>
-                                      </packing>
                                     </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkImage">
+                                  <object class="GtkButton" id="insert_image_button">
                                     <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="icon-name">pan-down</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>
+                                    <property name="action_name">edt.insert-image</property>
+                                    <property name="always_show_image">True</property>
+                                    <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>
+                                    </child>
                                   </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
                                 </child>
+                                <style>
+                                  <class name="linked"/>
+                                </style>
                               </object>
                             </child>
                           </object>
                         </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+                <child>
+                  <object class="GtkActionBar">
+                    <property name="visible">True</property>
+                    <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="action_name">edt.color</property>
-                            <property name="tooltip_text" translatable="yes">Change font color</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Undo last edit</property>
+                            <property name="action_name">edt.undo</property>
+                            <property name="always_show_image">True</property>
                             <child>
-                              <object class="GtkImage" id="font_color_icon">
+                              <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>
                             </child>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
                         </child>
                         <child>
-                          <object class="GtkMenuButton" id="font_size_button">
+                          <object class="GtkButton">
                             <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>
-                            <property name="direction">up</property>
+                            <property name="receives_default">False</property>
+                            <property name="tooltip_text" translatable="yes">Redo last edit</property>
+                            <property name="action_name">edt.redo</property>
+                            <property name="always_show_image">True</property>
                             <child>
-                              <object class="GtkBox">
+                              <object class="GtkImage">
                                 <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>
-                              </object>
-                            </child>
-                          </object>
-                        </child>
-                        <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>
-                                <property name="action_name">edt.insert-link</property>
-                                <property name="always_show_image">True</property>
-                                <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>
-                                </child>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="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>
-                                <property name="action_name">edt.insert-image</property>
-                                <property name="always_show_image">True</property>
-                                <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>
-                                </child>
+                                <property name="pixel_size">16</property>
+                                <property name="icon_name">edit-redo-symbolic</property>
                               </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">1</property>
-                              </packing>
                             </child>
-                            <style>
-                              <class name="linked"/>
-                            </style>
                           </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
                         </child>
+                        <style>
+                          <class name="linked"/>
+                        </style>
                       </object>
                     </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkActionBar">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkBox" id="command_buttons">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkButton">
+                      <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">Undo last edit</property>
-                        <property name="action_name">edt.undo</property>
+                        <property name="tooltip_text" translatable="yes">Attach a file</property>
+                        <property name="action_name">win.add-attachment</property>
                         <property name="always_show_image">True</property>
                         <child>
-                          <object class="GtkImage">
+                          <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">edit-undo-symbolic</property>
+                            <property name="icon_name">mail-attachment-symbolic</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton">
+                      <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>
+                            <property name="action_name">win.add-attachment</property>
+                            <property name="always_show_image">True</property>
+                            <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>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkButton" id="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>
+                            <property name="action_name">win.add-original-attachments</property>
+                            <property name="always_show_image">True</property>
+                            <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>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                        <style>
+                          <class name="linked"/>
+                        </style>
+                      </object>
+                      <packing>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <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>
+                        <style>
+                          <class name="dim-label"/>
+                        </style>
+                      </object>
+                    </child>
+                    <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="tooltip_text" translatable="yes">Redo last edit</property>
-                        <property name="action_name">edt.redo</property>
-                        <property name="always_show_image">True</property>
+                        <property name="menu_model">more_options_menu</property>
+                        <property name="tooltip_text" translatable="yes">More options</property>
+                        <property name="direction">up</property>
                         <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>
+                            <property name="icon_name">view-more-symbolic</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="pack_type">end</property>
                       </packing>
                     </child>
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                  </object>
-                </child>
-                <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>
-                    <property name="action_name">win.add-attachment</property>
-                    <property name="always_show_image">True</property>
                     <child>
-                      <object class="GtkImage" id="new_message_attach_image">
+                      <object class="GtkToggleButton" id="show_formatting_button">
                         <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>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="position">1</property>
-                  </packing>
-                </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>
-                        <property name="action_name">win.add-attachment</property>
-                        <property name="always_show_image">True</property>
+                        <property name="action_name">win.show-formatting</property>
+                        <property name="tooltip_text" translatable="yes">Show formatting toolbar</property>
                         <child>
-                          <object class="GtkImage" id="conversation_attach_new_image">
+                          <object class="GtkImage">
                             <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>
+                            <property name="icon_name">format-toolbar-toggle-symbolic</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">0</property>
+                        <property name="pack_type">end</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="conversation_attach_original_button">
+                      <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">Add original attachments</property>
-                        <property name="action_name">win.add-original-attachments</property>
+                        <property name="tooltip_text" translatable="yes">Select spell checking 
languages</property>
+                        <property name="action_name">win.select-dictionary</property>
                         <property name="always_show_image">True</property>
                         <child>
-                          <object class="GtkImage" id="conversation_attach_original_image">
+                          <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">edit-copy-symbolic</property>
+                            <property name="icon_name">tools-check-spelling-symbolic</property>
                           </object>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="pack_type">end</property>
                       </packing>
                     </child>
-                    <style>
-                      <class name="linked"/>
-                    </style>
-                  </object>
-                  <packing>
-                    <property name="position">2</property>
-                  </packing>
-                </child>
-                <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>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <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>
-                    <property name="tooltip_text" translatable="yes">More options</property>
-                    <property name="direction">up</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon_name">view-more-symbolic</property>
-                      </object>
-                    </child>
                   </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                  </packing>
-                </child>
-                <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">win.show-formatting</property>
-                    <property name="tooltip_text" translatable="yes">Show formatting toolbar</property>
-                    <child>
-                      <object class="GtkImage">
-                        <property name="visible">True</property>
-                        <property name="icon_name">format-toolbar-toggle-symbolic</property>
-                      </object>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                  </packing>
-                </child>
-                <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>
-                    <property name="action_name">win.select-dictionary</property>
-                    <property name="always_show_image">True</property>
-                    <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>
-                    </child>
-                  </object>
-                  <packing>
-                    <property name="pack_type">end</property>
-                  </packing>
                 </child>
               </object>
             </child>
@@ -1232,7 +1227,7 @@
           <packing>
             <property name="expand">False</property>
             <property name="fill">True</property>
-            <property name="position">4</property>
+            <property name="position">3</property>
           </packing>
         </child>
         <child>