diff --git a/mail/mail-config.ui b/mail/mail-config.ui
index 93cecf03ae..a8712ccdbf 100644
--- a/mail/mail-config.ui
+++ b/mail/mail-config.ui
@@ -257,8 +257,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity-required-header"/>
                       <relation type="labelled-by" target="identity_address_label"/>
+                      <relation type="labelled-by" target="identity-required-header"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -303,8 +303,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity_full_name_label"/>
                       <relation type="labelled-by" target="identity-required-header"/>
+                      <relation type="labelled-by" target="identity_full_name_label"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -419,8 +419,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="identity-optional-header"/>
                       <relation type="labelled-by" target="identity_organization_label"/>
+                      <relation type="labelled-by" target="identity-optional-header"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -452,8 +452,8 @@ For example: "Work" or "Personal"</property>
                     <property name="can_focus">True</property>
                     <property name="invisible_char">&#x25CF;</property>
                     <accessibility>
-                      <relation type="labelled-by" target="reply_to_label"/>
                       <relation type="labelled-by" target="identity-optional-header"/>
+                      <relation type="labelled-by" target="reply_to_label"/>
                     </accessibility>
                   </object>
                   <packing>
@@ -2377,15 +2377,15 @@ For example: "Work" or "Personal"</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkVBox" id="message-fonts-section">
+          <object class="GtkVBox" id="message-display-section">
             <property name="visible">True</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
-              <object class="GtkLabel" id="message-fonts-header">
+              <object class="GtkLabel" id="message-display-header">
                 <property name="visible">True</property>
                 <property name="xalign">0</property>
-                <property name="label" translatable="yes">Message Fonts</property>
+                <property name="label" translatable="yes">Message Display</property>
                 <attributes>
                   <attribute name="weight" value="bold"/>
                 </attributes>
@@ -2397,34 +2397,33 @@ For example: "Work" or "Personal"</property>
               </packing>
             </child>
             <child>
-              <object class="GtkAlignment" id="message-fonts-alignment">
+              <object class="GtkAlignment" id="message-display-alignment">
                 <property name="visible">True</property>
                 <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkTable" id="message-fonts-table">
+                  <object class="GtkVBox" id="message-display-vbox">
                     <property name="visible">True</property>
-                    <property name="column_spacing">6</property>
-                    <property name="row_spacing">2</property>
+                    <property name="orientation">vertical</property>
+                    <property name="spacing">6</property>
                     <child>
-                      <object class="GtkVBox" id="vboxMessageFonts">
+                      <object class="GtkCheckButton" id="radFontUseSame">
+                        <property name="label" translatable="yes">_Use the same fonts as other applications</property>
                         <property name="visible">True</property>
-                        <property name="orientation">vertical</property>
-                        <property name="spacing">6</property>
-                        <child>
-                          <object class="GtkCheckButton" id="radFontUseSame">
-                            <property name="label" translatable="yes">_Use the same fonts as other applications</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_underline">True</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkAlignment" id="custom-font-alignment">
+                        <property name="visible">True</property>
+                        <property name="left_padding">24</property>
                         <child>
                           <object class="GtkTable" id="tblScreen">
                             <property name="visible">True</property>
@@ -2435,7 +2434,7 @@ For example: "Work" or "Personal"</property>
                             <child>
                               <object class="GtkLabel" id="lblScreenVariable">
                                 <property name="visible">True</property>
-                                <property name="xalign">0</property>
+                                <property name="xalign">1</property>
                                 <property name="label" translatable="yes">S_tandard Font:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">right</property>
@@ -2481,8 +2480,8 @@ For example: "Work" or "Personal"</property>
                             <child>
                               <object class="GtkLabel" id="label444">
                                 <property name="visible">True</property>
-                                <property name="xalign">0</property>
-                                <property name="label" translatable="yes">Fix_ed width Font:</property>
+                                <property name="xalign">1</property>
+                                <property name="label" translatable="yes">Fix_ed Width Font:</property>
                                 <property name="use_underline">True</property>
                                 <property name="justify">right</property>
                                 <property name="mnemonic_widget">FontFixed</property>
@@ -2495,55 +2494,12 @@ For example: "Work" or "Personal"</property>
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="position">1</property>
-                          </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="position">1</property>
+                      </packing>
                     </child>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkVBox" id="message-display-section">
-            <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkLabel" id="message-display-header">
-                <property name="visible">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">Message Display</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                </attributes>
-              </object>
-              <packing>
-                <property name="expand">False</property>
-                <property name="fill">False</property>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkAlignment" id="message-display-alignment">
-                <property name="visible">True</property>
-                <property name="left_padding">12</property>
-                <child>
-                  <object class="GtkVBox" id="message-display-vbox">
-                    <property name="visible">True</property>
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">6</property>
                     <child>
                       <object class="GtkHBox" id="hboxHighlightColor">
                         <property name="visible">True</property>
@@ -2592,7 +2548,7 @@ For example: "Work" or "Personal"</property>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">0</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
@@ -2617,7 +2573,7 @@ For example: "Work" or "Personal"</property>
                         </child>
                       </object>
                       <packing>
-                        <property name="position">1</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
@@ -2630,7 +2586,7 @@ For example: "Work" or "Personal"</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
@@ -2644,7 +2600,7 @@ For example: "Work" or "Personal"</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -2741,7 +2697,7 @@ For example: "Work" or "Personal"</property>
           <packing>
             <property name="expand">False</property>
             <property name="fill">False</property>
-            <property name="position">2</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -2797,7 +2753,7 @@ For example: "Work" or "Personal"</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkCheckButton" id="chkShowAnimatedImages">
-                        <property name="label" translatable="yes" comments="If enabled, show animation; if disabled, only display a static image without any animation">_Show image animations</property>
+                        <property name="label" translatable="yes" comments="If enabled, show animation; if disabled, only display a static image without any animation">_Show animated images</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
@@ -2886,13 +2842,13 @@ For example: "Work" or "Personal"</property>
                     </child>
                     <child>
                       <object class="GtkRadioButton" id="radImagesSometimes">
-                        <property name="label" translatable="yes">_Load images in messages from contacts</property>
+                        <property name="label" translatable="yes">_Load images only in messages from contacts</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radImagesNever</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -2907,8 +2863,8 @@ For example: "Work" or "Personal"</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
+                        <property name="active">True</property>
                         <property name="draw_indicator">True</property>
-                        <property name="group">radImagesNever</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -4998,15 +4954,15 @@ for display purposes only. </property>
   </object>
   <object class="GtkSizeGroup" id="composer-label-size-group">
     <widgets>
-      <widget name="lblForwardStyle"/>
-      <widget name="lblReplyStyle"/>
       <widget name="lblCharset"/>
+      <widget name="lblReplyStyle"/>
+      <widget name="lblForwardStyle"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup" id="composer-combo-box-size-group">
     <widgets>
-      <widget name="comboboxForwardStyle"/>
       <widget name="comboboxReplyStyle"/>
+      <widget name="comboboxForwardStyle"/>
     </widgets>
   </object>
 </interface>