* some renaming in the glade file

[modest] / src / gtk-glade / modest.glade

diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 79c398d..0e6a27a 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -22,7 +22,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox1">
+    <widget class="GtkVBox" id="main_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -34,13 +34,13 @@
          <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
 
          <child>
-           <widget class="GtkMenuItem" id="menuitem1">
+           <widget class="GtkMenuItem" id="MessageMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Message</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="menuitem1_menu">
+               <widget class="GtkMenu" id="Message_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="new_e-mail1">
@@ -130,13 +130,13 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="menuitem2">
+           <widget class="GtkMenuItem" id="EditMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Edit</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="menuitem2_menu">
+               <widget class="GtkMenu" id="Edit_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="undo1">
@@ -231,13 +231,13 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="menuitem3">
+           <widget class="GtkMenuItem" id="FoldersMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Folders</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="menuitem3_menu">
+               <widget class="GtkMenu" id="Folders_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="new_folder1">
@@ -302,7 +302,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Outbox</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_outbox1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -313,7 +313,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Drafts</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_drafts1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -324,7 +324,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Sent</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_sent1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -335,7 +335,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Archive</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">inbox1</property>
                      <signal name="activate" handler="on_archive1_activate" last_modification_time="Fri, 28 Apr 2006 12:15:47 GMT"/>
                    </widget>
@@ -346,13 +346,13 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="menuitem4">
+           <widget class="GtkMenuItem" id="ViewMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_View</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="menuitem4_menu">
+               <widget class="GtkMenu" id="View_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="sort1">
@@ -428,14 +428,14 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="e-mail1">
+           <widget class="GtkMenuItem" id="EMailMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">E-m_ail</property>
              <property name="use_underline">True</property>
              <signal name="activate" handler="on_e-mail1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
              <child>
-               <widget class="GtkMenu" id="e-mail1_menu">
+               <widget class="GtkMenu" id="EMail_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="send_&amp;_receive1">
@@ -469,17 +469,17 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="tools1">
+           <widget class="GtkMenuItem" id="ToolsMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Tools</property>
              <property name="use_underline">True</property>
              <signal name="activate" handler="on_tools1_activate" last_modification_time="Fri, 28 Apr 2006 12:12:02 GMT"/>
 
              <child>
-               <widget class="GtkMenu" id="tools1_menu">
+               <widget class="GtkMenu" id="Tools_menu">
 
                  <child>
-                   <widget class="GtkMenuItem" id="open_contacts1">
+                   <widget class="GtkMenuItem" id="OpenContactsMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Open contacts...</property>
                      <property name="use_underline">True</property>
@@ -494,7 +494,7 @@
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="new_account1">
+                   <widget class="GtkMenuItem" id="NewAccountWizzardMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">New account...</property>
                      <property name="use_underline">True</property>
@@ -503,7 +503,7 @@
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="account_settings1">
+                   <widget class="GtkMenuItem" id="AccountSettingsMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Account settings...</property>
                      <property name="use_underline">True</property>
@@ -512,7 +512,7 @@
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="options1">
+                   <widget class="GtkMenuItem" id="OptionsMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Options</property>
                      <property name="use_underline">True</property>
@@ -527,7 +527,7 @@
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="search_e-mails1">
+                   <widget class="GtkMenuItem" id="SearchEMailsMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Search e-mails...</property>
                      <property name="use_underline">True</property>
@@ -542,7 +542,7 @@
                  </child>
 
                  <child>
-                   <widget class="GtkMenuItem" id="help1">
+                   <widget class="GtkMenuItem" id="HelpMenuItem">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Help</property>
                      <property name="use_underline">True</property>
@@ -555,13 +555,13 @@
          </child>
 
          <child>
-           <widget class="GtkMenuItem" id="close1">
+           <widget class="GtkMenuItem" id="CloseMenuItem">
              <property name="visible">True</property>
              <property name="label" translatable="yes">_Close</property>
              <property name="use_underline">True</property>
 
              <child>
-               <widget class="GtkMenu" id="close1_menu">
+               <widget class="GtkMenu" id="Close_menu">
 
                  <child>
                    <widget class="GtkMenuItem" id="about1">
@@ -815,7 +815,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox2">
+    <widget class="GtkVBox" id="new_mail_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -1334,7 +1334,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Encrypt</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">none1</property>
                      <signal name="activate" handler="on_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
                    </widget>
@@ -1345,7 +1345,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Digitally sign</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">none1</property>
                      <signal name="activate" handler="on_digitally_sign1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
                    </widget>
@@ -1356,7 +1356,7 @@
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Digitally sign and encrypt</property>
                      <property name="use_underline">True</property>
-                     <property name="active">True</property>
+                     <property name="active">False</property>
                      <property name="group">none1</property>
                      <signal name="activate" handler="on_digitally_sign_and_encrypt1_activate" last_modification_time="Fri, 28 Apr 2006 13:32:29 GMT"/>
                    </widget>
@@ -1585,7 +1585,7 @@
              </child>
            </widget>
            <packing>
-             <property name="shrink">True</property>
+             <property name="shrink">False</property>
              <property name="resize">False</property>
            </packing>
          </child>
@@ -1654,7 +1654,7 @@
   <property name="urgency_hint">False</property>
 
   <child>
-    <widget class="GtkVBox" id="vbox3">
+    <widget class="GtkVBox" id="viewer_top_container">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
@@ -2474,7 +2474,7 @@
              </child>
            </widget>
            <packing>
-             <property name="shrink">True</property>
+             <property name="shrink">False</property>
              <property name="resize">False</property>
            </packing>
          </child>
@@ -2524,13 +2524,11 @@
   </child>
 </widget>
 
-<widget class="GtkDialog" id="mailbox_setup_1">
+<widget class="GtkDialog" id="mailbox_setup_advanced">
   <property name="border_width">10</property>
-  <property name="width_request">400</property>
-  <property name="height_request">350</property>
-  <property name="title" translatable="yes">Mailbox setup 1/4</property>
+  <property name="title" translatable="yes">Advanced E-mail settings</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
   <property name="modal">False</property>
   <property name="default_width">500</property>
   <property name="default_height">400</property>
@@ -2546,48 +2544,22 @@
   <property name="has_separator">True</property>
 
   <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox4">
+    <widget class="GtkVBox" id="vbox7">
       <property name="visible">True</property>
       <property name="homogeneous">False</property>
       <property name="spacing">0</property>
 
       <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox1">
+       <widget class="GtkHButtonBox" id="hbuttonbox3">
          <property name="visible">True</property>
          <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkButton" id="button6">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Finish</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button7">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Back</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button8">
+           <widget class="GtkButton" id="button16">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Next</property>
+             <property name="label" translatable="yes">Ok</property>
              <property name="use_underline">True</property>
              <property name="relief">GTK_RELIEF_NORMAL</property>
              <property name="focus_on_click">True</property>
@@ -2596,7 +2568,7 @@
          </child>
 
          <child>
-           <widget class="GtkButton" id="button9">
+           <widget class="GtkButton" id="button17">
              <property name="visible">True</property>
              <property name="can_default">True</property>
              <property name="can_focus">True</property>
@@ -2617,34 +2589,169 @@
       </child>
 
       <child>
-       <widget class="GtkVBox" id="vbox5">
+       <widget class="GtkComboBox" id="account_selector">
          <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">10</property>
+         <property name="add_tearoffs">False</property>
+         <property name="focus_on_click">True</property>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
+       </packing>
+      </child>
+
+      <child>
+       <widget class="GtkNotebook" id="notebook1">
+         <property name="visible">True</property>
+         <property name="can_focus">True</property>
+         <property name="show_tabs">True</property>
+         <property name="show_border">True</property>
+         <property name="tab_pos">GTK_POS_TOP</property>
+         <property name="scrollable">False</property>
+         <property name="enable_popup">False</property>
 
          <child>
-           <widget class="GtkHBox" id="hbox17">
+           <widget class="GtkVBox" id="vbox10">
+             <property name="border_width">10</property>
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
+             <property name="spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="label53">
+               <widget class="GtkTable" id="table6">
+                 <property name="border_width">10</property>
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Mailbox setup wizard allows you to define mailboxes for use on your device.</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">10</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
+                 <property name="n_rows">2</property>
+                 <property name="n_columns">2</property>
+                 <property name="homogeneous">False</property>
+                 <property name="row_spacing">10</property>
+                 <property name="column_spacing">10</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label46">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Default e-mail format:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">0</property>
+                     <property name="right_attach">1</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkLabel" id="label47">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Sending e-mail:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">0</property>
+                     <property name="right_attach">1</property>
+                     <property name="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options"></property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkComboBox" id="combobox6">
+                     <property name="visible">True</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                     <property name="y_options">fill</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkComboBox" id="combobox7">
+                     <property name="visible">True</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+                     <property name="top_attach">1</property>
+                     <property name="bottom_attach">2</property>
+                     <property name="x_options">fill</property>
+                     <property name="y_options">fill</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkCheckButton" id="checkbutton12">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Include original in reply</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkCheckButton" id="checkbutton13">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Request read report</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
@@ -2654,90 +2761,82 @@
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">False</property>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkHSeparator" id="hseparator6">
+           <widget class="GtkLabel" id="label24">
              <property name="visible">True</property>
+             <property name="label" translatable="yes">Sending</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+             <property name="width_chars">-1</property>
+             <property name="single_line_mode">False</property>
+             <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
+             <property name="type">tab</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkTable" id="table3">
+           <widget class="GtkTable" id="table5">
+             <property name="border_width">10</property>
              <property name="visible">True</property>
-             <property name="n_rows">2</property>
+             <property name="n_rows">3</property>
              <property name="n_columns">2</property>
              <property name="homogeneous">False</property>
              <property name="row_spacing">10</property>
              <property name="column_spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="label14">
+               <widget class="GtkComboBox" id="combobox5">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Mailbox name:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
+                 <property name="add_tearoffs">False</property>
+                 <property name="focus_on_click">True</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
                  <property name="top_attach">0</property>
                  <property name="bottom_attach">1</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="y_options">fill</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label15">
+               <widget class="GtkEntry" id="entry9">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Mailbox type:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
+                 <property name="can_focus">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
                  <property name="top_attach">1</property>
                  <property name="bottom_attach">2</property>
-                 <property name="x_options">fill</property>
                  <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkEntry" id="entry4">
+               <widget class="GtkEntry" id="entry10">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
                  <property name="editable">True</property>
@@ -2751,46 +2850,72 @@
                <packing>
                  <property name="left_attach">1</property>
                  <property name="right_attach">2</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
                  <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkComboBoxEntry" id="comboboxentry1">
+               <widget class="GtkLabel" id="label45">
                  <property name="visible">True</property>
-                 <property name="add_tearoffs">False</property>
-                 <property name="has_frame">True</property>
-                 <property name="focus_on_click">True</property>
+                 <property name="label" translatable="yes">Password:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+                 <property name="x_options"></property>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkLabel" id="label44">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes">Username:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
                  <property name="top_attach">1</property>
                  <property name="bottom_attach">2</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options">fill</property>
+                 <property name="x_options"></property>
+                 <property name="y_options"></property>
                </packing>
              </child>
-           </widget>
-           <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkHBox" id="hbox18">
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">0</property>
 
              <child>
-               <widget class="GtkLabel" id="label13">
+               <widget class="GtkLabel" id="label40">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">! Note: You cannot edit mailbox type once setup is complete</property>
+                 <property name="label" translatable="yes">SMTP authentication:</property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2799,175 +2924,38 @@
                  <property name="xalign">0.5</property>
                  <property name="yalign">0.5</property>
                  <property name="xpad">0</property>
-                 <property name="ypad">10</property>
+                 <property name="ypad">0</property>
                  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                  <property name="width_chars">-1</property>
                  <property name="single_line_mode">False</property>
                  <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options"></property>
+                 <property name="y_options"></property>
                </packing>
              </child>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">False</property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="mailbox_setup_2">
-  <property name="border_width">10</property>
-  <property name="width_request">400</property>
-  <property name="height_request">350</property>
-  <property name="title" translatable="yes">Mailbox setup 2/4</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">500</property>
-  <property name="default_height">400</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox6">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox2">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-         <child>
-           <widget class="GtkButton" id="button11">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Finish</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button12">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Back</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button13">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Next</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button14">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Cancel</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkTable" id="table4">
-         <property name="visible">True</property>
-         <property name="n_rows">4</property>
-         <property name="n_columns">2</property>
-         <property name="homogeneous">False</property>
-         <property name="row_spacing">10</property>
-         <property name="column_spacing">0</property>
-
-         <child>
-           <widget class="GtkLabel" id="label16">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Name:</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">0</property>
-             <property name="bottom_attach">1</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">False</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label17">
+           <widget class="GtkLabel" id="label25">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">User name:</property>
+             <property name="label" translatable="yes">SMTP server</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
-             <property name="xalign">0</property>
+             <property name="xalign">0.5</property>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
@@ -2977,352 +2965,396 @@
              <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">1</property>
-             <property name="bottom_attach">2</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
+             <property name="type">tab</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkEntry" id="entry5">
+           <widget class="GtkVBox" id="vbox8">
+             <property name="border_width">10</property>
              <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">True</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">0</property>
-             <property name="bottom_attach">1</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
+             <property name="homogeneous">False</property>
+             <property name="spacing">10</property>
 
-         <child>
-           <widget class="GtkComboBoxEntry" id="comboboxentry2">
-             <property name="visible">True</property>
-             <property name="add_tearoffs">False</property>
-             <property name="has_frame">True</property>
-             <property name="focus_on_click">True</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">1</property>
-             <property name="bottom_attach">2</property>
-             <property name="x_options">fill</property>
-             <property name="y_options">fill</property>
-           </packing>
-         </child>
+             <child>
+               <widget class="GtkHBox" id="hbox2">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">10</property>
 
-         <child>
-           <widget class="GtkLabel" id="label19">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Password:</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">2</property>
-             <property name="bottom_attach">3</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
+                 <child>
+                   <widget class="GtkLabel" id="label29">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Security:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
 
-         <child>
-           <widget class="GtkLabel" id="label20">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">E-mail address:</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">3</property>
-             <property name="bottom_attach">4</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
+                 <child>
+                   <widget class="GtkComboBox" id="combobox3">
+                     <property name="visible">True</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkEntry" id="entry6">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">False</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">2</property>
-             <property name="bottom_attach">3</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
+             <child>
+               <widget class="GtkHBox" id="hbox4">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">10</property>
 
-         <child>
-           <widget class="GtkEntry" id="entry7">
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="editable">True</property>
-             <property name="visibility">True</property>
-             <property name="max_length">0</property>
-             <property name="text" translatable="yes"></property>
-             <property name="has_frame">True</property>
-             <property name="invisible_char">*</property>
-             <property name="activates_default">False</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">3</property>
-             <property name="bottom_attach">4</property>
-             <property name="y_options"></property>
-           </packing>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
+                 <child>
+                   <widget class="GtkLabel" id="label31">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Incoming e-mail port:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
 
-<widget class="GtkDialog" id="mailbox_setup_advanced">
-  <property name="border_width">10</property>
-  <property name="title" translatable="yes">Advanced E-mail settings</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
-  <property name="modal">False</property>
-  <property name="default_width">500</property>
-  <property name="default_height">400</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+                 <child>
+                   <widget class="GtkSpinButton" id="spinbutton1">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="climb_rate">1</property>
+                     <property name="digits">0</property>
+                     <property name="numeric">False</property>
+                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                     <property name="snap_to_ticks">False</property>
+                     <property name="wrap">False</property>
+                     <property name="adjustment">2 0 100 1 10 10</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
 
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox7">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+             <child>
+               <widget class="GtkHBox" id="hbox3">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">10</property>
 
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox3">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
+                 <child>
+                   <widget class="GtkLabel" id="label30">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Security:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
 
-         <child>
-           <widget class="GtkButton" id="button16">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Ok</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
+                 <child>
+                   <widget class="GtkComboBox" id="combobox4">
+                     <property name="visible">True</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="button17">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Cancel</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
+             <child>
+               <widget class="GtkHBox" id="hbox5">
+                 <property name="visible">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">10</property>
 
-      <child>
-       <widget class="GtkComboBox" id="accountselector">
-         <property name="visible">True</property>
-         <property name="add_tearoffs">False</property>
-         <property name="focus_on_click">True</property>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
+                 <child>
+                   <widget class="GtkLabel" id="label32">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Outgoing e-mail port:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
 
-      <child>
-       <widget class="GtkNotebook" id="notebook1">
-         <property name="visible">True</property>
-         <property name="can_focus">True</property>
-         <property name="show_tabs">True</property>
-         <property name="show_border">True</property>
-         <property name="tab_pos">GTK_POS_TOP</property>
-         <property name="scrollable">False</property>
-         <property name="enable_popup">False</property>
+                 <child>
+                   <widget class="GtkSpinButton" id="spinbutton2">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="climb_rate">1</property>
+                     <property name="digits">0</property>
+                     <property name="numeric">False</property>
+                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                     <property name="snap_to_ticks">False</property>
+                     <property name="wrap">False</property>
+                     <property name="adjustment">1 0 100 1 10 10</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkTable" id="table7">
-             <property name="border_width">10</property>
-             <property name="visible">True</property>
-             <property name="n_rows">4</property>
-             <property name="n_columns">2</property>
-             <property name="homogeneous">False</property>
-             <property name="row_spacing">10</property>
-             <property name="column_spacing">10</property>
+             <child>
+               <widget class="GtkHSeparator" id="hseparator2">
+                 <property name="visible">True</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
 
              <child>
-               <widget class="GtkLabel" id="label48">
+               <widget class="GtkCheckButton" id="checkbutton2">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Retrieve:</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Use specific connection</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label51">
+               <widget class="GtkHBox" id="hbox1">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Password authentication</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">10</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label28">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Connection:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkEntry" id="entry8">
+                     <property name="visible">True</property>
+                     <property name="can_focus">True</property>
+                     <property name="editable">True</property>
+                     <property name="visibility">True</property>
+                     <property name="max_length">0</property>
+                     <property name="text" translatable="yes"></property>
+                     <property name="has_frame">True</property>
+                     <property name="invisible_char">*</property>
+                     <property name="activates_default">False</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">True</property>
+                     <property name="fill">True</property>
+                   </packing>
+                 </child>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">3</property>
-                 <property name="bottom_attach">4</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label49">
+               <widget class="GtkHSeparator" id="hseparator1">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">No of e-mails to retrieve</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">2</property>
-                 <property name="bottom_attach">3</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">True</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkCheckButton" id="checkbutton1">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Set as default mailbox</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
+           </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">False</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label26">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes">Other</property>
+             <property name="use_underline">False</property>
+             <property name="use_markup">False</property>
+             <property name="justify">GTK_JUSTIFY_LEFT</property>
+             <property name="wrap">False</property>
+             <property name="selectable">False</property>
+             <property name="xalign">0.5</property>
+             <property name="yalign">0.5</property>
+             <property name="xpad">0</property>
+             <property name="ypad">0</property>
+             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+             <property name="width_chars">-1</property>
+             <property name="single_line_mode">False</property>
+             <property name="angle">0</property>
+           </widget>
+           <packing>
+             <property name="type">tab</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkVBox" id="vbox9">
+             <property name="border_width">10</property>
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="label52">
+               <widget class="GtkLabel" id="label33">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">E-mail size limit:</property>
+                 <property name="label" translatable="yes">These security settings will be applied to %s</property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                  <property name="wrap">False</property>
                  <property name="selectable">False</property>
-                 <property name="xalign">0</property>
+                 <property name="xalign">0.5</property>
                  <property name="yalign">0.5</property>
                  <property name="xpad">0</property>
                  <property name="ypad">0</property>
@@ -3332,242 +3364,134 @@
                  <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">1</property>
-                 <property name="bottom_attach">2</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkComboBox" id="combobox8">
+               <widget class="GtkHSeparator" id="hseparator4">
                  <property name="visible">True</property>
-                 <property name="add_tearoffs">False</property>
-                 <property name="focus_on_click">True</property>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="y_options">fill</property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkComboBox" id="combobox9">
+               <widget class="GtkCheckButton" id="checkbutton5">
                  <property name="visible">True</property>
-                 <property name="add_tearoffs">False</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Encrypt mails by default</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">2</property>
-                 <property name="bottom_attach">3</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options">fill</property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkComboBox" id="combobox10">
+               <widget class="GtkCheckButton" id="checkbutton8">
                  <property name="visible">True</property>
-                 <property name="add_tearoffs">False</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Digitally sign e-mails by default</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">3</property>
-                 <property name="bottom_attach">4</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options">fill</property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHBox" id="hbox16">
+               <widget class="GtkHSeparator" id="hseparator3">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
-
-                 <child>
-                   <widget class="GtkSpinButton" id="spinbutton4">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">False</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">False</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100 1 10 10</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
                </widget>
                <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">1</property>
-                 <property name="bottom_attach">2</property>
-                 <property name="x_options">fill</property>
-                 <property name="y_options"></property>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
-           </widget>
-           <packing>
-             <property name="tab_expand">False</property>
-             <property name="tab_fill">True</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label23">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">Retrieval</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">tab</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox10">
-             <property name="border_width">10</property>
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">10</property>
 
              <child>
-               <widget class="GtkTable" id="table6">
-                 <property name="border_width">10</property>
+               <widget class="GtkHBox" id="hbox11">
                  <property name="visible">True</property>
-                 <property name="n_rows">2</property>
-                 <property name="n_columns">2</property>
                  <property name="homogeneous">False</property>
-                 <property name="row_spacing">10</property>
-                 <property name="column_spacing">10</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label46">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Default e-mail format:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
+                 <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label47">
+                   <widget class="GtkLabel" id="label39">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Sending e-mail:</property>
+                     <property name="label" translatable="yes">Display security indication for:</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">False</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
                      <property name="wrap">False</property>
                      <property name="selectable">False</property>
-                     <property name="xalign">0</property>
+                     <property name="xalign">0.5</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
                      <property name="ypad">0</property>
                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
+                     <property name="single_line_mode">True</property>
                      <property name="angle">0</property>
                    </widget>
                    <packing>
-                     <property name="left_attach">0</property>
-                     <property name="right_attach">1</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options"></property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkComboBox" id="combobox6">
-                     <property name="visible">True</property>
-                     <property name="add_tearoffs">False</property>
-                     <property name="focus_on_click">True</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
-                     <property name="top_attach">0</property>
-                     <property name="bottom_attach">1</property>
-                     <property name="y_options">fill</property>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
                    </packing>
                  </child>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
 
-                 <child>
-                   <widget class="GtkComboBox" id="combobox7">
-                     <property name="visible">True</property>
-                     <property name="add_tearoffs">False</property>
-                     <property name="focus_on_click">True</property>
-                   </widget>
-                   <packing>
-                     <property name="left_attach">1</property>
-                     <property name="right_attach">2</property>
-                     <property name="top_attach">1</property>
-                     <property name="bottom_attach">2</property>
-                     <property name="x_options">fill</property>
-                     <property name="y_options">fill</property>
-                   </packing>
-                 </child>
+             <child>
+               <widget class="GtkCheckButton" id="checkbutton3">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">All encrypted and digitally signed messages</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">False</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
                  <property name="expand">False</property>
-                 <property name="fill">True</property>
+                 <property name="fill">False</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton12">
+               <widget class="GtkCheckButton" id="checkbutton9">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Include original in reply</property>
+                 <property name="label" translatable="yes">All untrusted digital IDs</property>
                  <property name="use_underline">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
@@ -3583,10 +3507,10 @@
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton13">
+               <widget class="GtkCheckButton" id="checkbutton10">
                  <property name="visible">True</property>
                  <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Request read report</property>
+                 <property name="label" translatable="yes">All expired or invalid digital IDs</property>
                  <property name="use_underline">True</property>
                  <property name="relief">GTK_RELIEF_NORMAL</property>
                  <property name="focus_on_click">True</property>
@@ -3608,9 +3532,9 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label24">
+           <widget class="GtkLabel" id="label27">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Sending</property>
+             <property name="label" translatable="yes">Security</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3631,82 +3555,25 @@
          </child>
 
          <child>
-           <widget class="GtkTable" id="table5">
+           <widget class="GtkTable" id="table7">
              <property name="border_width">10</property>
              <property name="visible">True</property>
-             <property name="n_rows">3</property>
+             <property name="n_rows">4</property>
              <property name="n_columns">2</property>
              <property name="homogeneous">False</property>
              <property name="row_spacing">10</property>
              <property name="column_spacing">10</property>
 
              <child>
-               <widget class="GtkComboBox" id="combobox5">
-                 <property name="visible">True</property>
-                 <property name="add_tearoffs">False</property>
-                 <property name="focus_on_click">True</property>
-               </widget>
-               <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="y_options">fill</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkEntry" id="entry9">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
-               </widget>
-               <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">1</property>
-                 <property name="bottom_attach">2</property>
-                 <property name="y_options"></property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkEntry" id="entry10">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="editable">True</property>
-                 <property name="visibility">True</property>
-                 <property name="max_length">0</property>
-                 <property name="text" translatable="yes"></property>
-                 <property name="has_frame">True</property>
-                 <property name="invisible_char">*</property>
-                 <property name="activates_default">False</property>
-               </widget>
-               <packing>
-                 <property name="left_attach">1</property>
-                 <property name="right_attach">2</property>
-                 <property name="top_attach">2</property>
-                 <property name="bottom_attach">3</property>
-                 <property name="y_options"></property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkLabel" id="label45">
+               <widget class="GtkLabel" id="label48">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Password:</property>
+                 <property name="label" translatable="yes">Retrieve:</property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                  <property name="wrap">False</property>
                  <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
+                 <property name="xalign">0</property>
                  <property name="yalign">0.5</property>
                  <property name="xpad">0</property>
                  <property name="ypad">0</property>
@@ -3718,23 +3585,23 @@
                <packing>
                  <property name="left_attach">0</property>
                  <property name="right_attach">1</property>
-                 <property name="top_attach">2</property>
-                 <property name="bottom_attach">3</property>
-                 <property name="x_options"></property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
                  <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label44">
+               <widget class="GtkLabel" id="label51">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">Username:</property>
+                 <property name="label" translatable="yes">Password authentication</property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                  <property name="wrap">False</property>
                  <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
+                 <property name="xalign">0</property>
                  <property name="yalign">0.5</property>
                  <property name="xpad">0</property>
                  <property name="ypad">0</property>
@@ -3746,346 +3613,133 @@
                <packing>
                  <property name="left_attach">0</property>
                  <property name="right_attach">1</property>
-                 <property name="top_attach">1</property>
-                 <property name="bottom_attach">2</property>
-                 <property name="x_options"></property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+                 <property name="x_options">fill</property>
                  <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkLabel" id="label40">
+               <widget class="GtkLabel" id="label49">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes">SMTP authentication:</property>
+                 <property name="label" translatable="yes">No of e-mails to retrieve</property>
                  <property name="use_underline">False</property>
                  <property name="use_markup">False</property>
                  <property name="justify">GTK_JUSTIFY_LEFT</property>
                  <property name="wrap">False</property>
                  <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
+                 <property name="xalign">0</property>
                  <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
-               </widget>
-               <packing>
-                 <property name="left_attach">0</property>
-                 <property name="right_attach">1</property>
-                 <property name="top_attach">0</property>
-                 <property name="bottom_attach">1</property>
-                 <property name="x_options"></property>
-                 <property name="y_options"></property>
-               </packing>
-             </child>
-           </widget>
-           <packing>
-             <property name="tab_expand">False</property>
-             <property name="tab_fill">False</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkLabel" id="label25">
-             <property name="visible">True</property>
-             <property name="label" translatable="yes">SMTP server</property>
-             <property name="use_underline">False</property>
-             <property name="use_markup">False</property>
-             <property name="justify">GTK_JUSTIFY_LEFT</property>
-             <property name="wrap">False</property>
-             <property name="selectable">False</property>
-             <property name="xalign">0.5</property>
-             <property name="yalign">0.5</property>
-             <property name="xpad">0</property>
-             <property name="ypad">0</property>
-             <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-             <property name="width_chars">-1</property>
-             <property name="single_line_mode">False</property>
-             <property name="angle">0</property>
-           </widget>
-           <packing>
-             <property name="type">tab</property>
-           </packing>
-         </child>
-
-         <child>
-           <widget class="GtkVBox" id="vbox8">
-             <property name="border_width">10</property>
-             <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">10</property>
-
-             <child>
-               <widget class="GtkHBox" id="hbox2">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label29">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Security:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkComboBox" id="combobox3">
-                     <property name="visible">True</property>
-                     <property name="add_tearoffs">False</property>
-                     <property name="focus_on_click">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkHBox" id="hbox4">
-                 <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label31">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Incoming e-mail port:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSpinButton" id="spinbutton1">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">False</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">False</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">2 0 100 1 10 10</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHBox" id="hbox3">
+               <widget class="GtkLabel" id="label52">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label30">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Security:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkComboBox" id="combobox4">
-                     <property name="visible">True</property>
-                     <property name="add_tearoffs">False</property>
-                     <property name="focus_on_click">True</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
+                 <property name="label" translatable="yes">E-mail size limit:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHBox" id="hbox5">
+               <widget class="GtkComboBox" id="combobox8">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">10</property>
-
-                 <child>
-                   <widget class="GtkLabel" id="label32">
-                     <property name="visible">True</property>
-                     <property name="label" translatable="yes">Outgoing e-mail port:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
-                     <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">False</property>
-                   </packing>
-                 </child>
-
-                 <child>
-                   <widget class="GtkSpinButton" id="spinbutton2">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="climb_rate">1</property>
-                     <property name="digits">0</property>
-                     <property name="numeric">False</property>
-                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-                     <property name="snap_to_ticks">False</property>
-                     <property name="wrap">False</property>
-                     <property name="adjustment">1 0 100 1 10 10</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">False</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
+                 <property name="add_tearoffs">False</property>
+                 <property name="focus_on_click">True</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="y_options">fill</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHSeparator" id="hseparator2">
+               <widget class="GtkComboBox" id="combobox9">
                  <property name="visible">True</property>
+                 <property name="add_tearoffs">False</property>
+                 <property name="focus_on_click">True</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options">fill</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton2">
+               <widget class="GtkComboBox" id="combobox10">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Use specific connection</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="add_tearoffs">False</property>
                  <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options">fill</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHBox" id="hbox1">
+               <widget class="GtkHBox" id="hbox16">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">10</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label28">
+                   <widget class="GtkSpinButton" id="spinbutton4">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Connection:</property>
-                     <property name="use_underline">False</property>
-                     <property name="use_markup">False</property>
-                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="can_focus">True</property>
+                     <property name="climb_rate">1</property>
+                     <property name="digits">0</property>
+                     <property name="numeric">False</property>
+                     <property name="update_policy">GTK_UPDATE_ALWAYS</property>
+                     <property name="snap_to_ticks">False</property>
                      <property name="wrap">False</property>
-                     <property name="selectable">False</property>
-                     <property name="xalign">0.5</property>
-                     <property name="yalign">0.5</property>
-                     <property name="xpad">0</property>
-                     <property name="ypad">0</property>
-                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                     <property name="width_chars">-1</property>
-                     <property name="single_line_mode">False</property>
-                     <property name="angle">0</property>
+                     <property name="adjustment">1 0 100 1 10 10</property>
                    </widget>
                    <packing>
                      <property name="padding">0</property>
@@ -4093,73 +3747,27 @@
                      <property name="fill">False</property>
                    </packing>
                  </child>
-
-                 <child>
-                   <widget class="GtkEntry" id="entry8">
-                     <property name="visible">True</property>
-                     <property name="can_focus">True</property>
-                     <property name="editable">True</property>
-                     <property name="visibility">True</property>
-                     <property name="max_length">0</property>
-                     <property name="text" translatable="yes"></property>
-                     <property name="has_frame">True</property>
-                     <property name="invisible_char">*</property>
-                     <property name="activates_default">False</property>
-                   </widget>
-                   <packing>
-                     <property name="padding">0</property>
-                     <property name="expand">True</property>
-                     <property name="fill">True</property>
-                   </packing>
-                 </child>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkHSeparator" id="hseparator1">
-                 <property name="visible">True</property>
                </widget>
                <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">True</property>
-               </packing>
-             </child>
-
-             <child>
-               <widget class="GtkCheckButton" id="checkbutton1">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Set as default mailbox</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
            </widget>
            <packing>
              <property name="tab_expand">False</property>
-             <property name="tab_fill">False</property>
+             <property name="tab_fill">True</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label26">
+           <widget class="GtkLabel" id="label23">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Other</property>
+             <property name="label" translatable="yes">Retrieval</property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4178,109 +3786,124 @@
              <property name="type">tab</property>
            </packing>
          </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">True</property>
+         <property name="fill">True</property>
+       </packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
+<widget class="GtkDialog" id="account_wizard">
+  <property name="border_width">10</property>
+  <property name="title" translatable="yes"></property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_NONE</property>
+  <property name="modal">False</property>
+  <property name="default_width">500</property>
+  <property name="default_height">400</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+  <property name="urgency_hint">False</property>
+  <property name="has_separator">True</property>
+
+  <child internal-child="vbox">
+    <widget class="GtkVBox" id="account_wizzard_top_container">
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child internal-child="action_area">
+       <widget class="GtkHButtonBox" id="dialog1-action_area">
+         <property name="visible">True</property>
+         <property name="layout_style">GTK_BUTTONBOX_END</property>
 
          <child>
-           <widget class="GtkVBox" id="vbox9">
-             <property name="border_width">10</property>
+           <widget class="GtkButton" id="AWFinishButton">
              <property name="visible">True</property>
-             <property name="homogeneous">False</property>
-             <property name="spacing">10</property>
+             <property name="label" translatable="yes" context="yes">Finish</property>
+             <property name="use_underline">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-3</property>
+           </widget>
+         </child>
 
-             <child>
-               <widget class="GtkLabel" id="label33">
-                 <property name="visible">True</property>
-                 <property name="label" translatable="yes">These security settings will be applied to %s</property>
-                 <property name="use_underline">False</property>
-                 <property name="use_markup">False</property>
-                 <property name="justify">GTK_JUSTIFY_LEFT</property>
-                 <property name="wrap">False</property>
-                 <property name="selectable">False</property>
-                 <property name="xalign">0.5</property>
-                 <property name="yalign">0.5</property>
-                 <property name="xpad">0</property>
-                 <property name="ypad">0</property>
-                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-                 <property name="width_chars">-1</property>
-                 <property name="single_line_mode">False</property>
-                 <property name="angle">0</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+         <child>
+           <widget class="GtkButton" id="AWBackButton">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes" context="yes">Back</property>
+             <property name="use_underline">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">2</property>
+           </widget>
+         </child>
 
-             <child>
-               <widget class="GtkHSeparator" id="hseparator4">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+         <child>
+           <widget class="GtkButton" id="AWNextButton">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes" context="yes">Next</property>
+             <property name="use_underline">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">1</property>
+           </widget>
+         </child>
 
-             <child>
-               <widget class="GtkCheckButton" id="checkbutton5">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Encrypt mails by default</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+         <child>
+           <widget class="GtkButton" id="AWCancelButton">
+             <property name="visible">True</property>
+             <property name="label" translatable="yes" context="yes">Cancel</property>
+             <property name="use_underline">True</property>
+             <property name="relief">GTK_RELIEF_NORMAL</property>
+             <property name="focus_on_click">True</property>
+             <property name="response_id">-6</property>
+           </widget>
+         </child>
+       </widget>
+       <packing>
+         <property name="padding">0</property>
+         <property name="expand">False</property>
+         <property name="fill">True</property>
+         <property name="pack_type">GTK_PACK_END</property>
+       </packing>
+      </child>
 
-             <child>
-               <widget class="GtkCheckButton" id="checkbutton8">
-                 <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">Digitally sign e-mails by default</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+      <child>
+       <widget class="GtkNotebook" id="AWNotebook">
+         <property name="visible">True</property>
+         <property name="show_tabs">False</property>
+         <property name="show_border">False</property>
+         <property name="tab_pos">GTK_POS_TOP</property>
+         <property name="scrollable">False</property>
+         <property name="enable_popup">False</property>
 
-             <child>
-               <widget class="GtkHSeparator" id="hseparator3">
-                 <property name="visible">True</property>
-               </widget>
-               <packing>
-                 <property name="padding">0</property>
-                 <property name="expand">False</property>
-                 <property name="fill">False</property>
-               </packing>
-             </child>
+         <child>
+           <widget class="GtkVBox" id="vbox5">
+             <property name="visible">True</property>
+             <property name="homogeneous">False</property>
+             <property name="spacing">10</property>
 
              <child>
-               <widget class="GtkHBox" id="hbox11">
+               <widget class="GtkHBox" id="hbox17">
                  <property name="visible">True</property>
                  <property name="homogeneous">False</property>
                  <property name="spacing">0</property>
 
                  <child>
-                   <widget class="GtkLabel" id="label39">
+                   <widget class="GtkLabel" id="label53">
                      <property name="visible">True</property>
-                     <property name="label" translatable="yes">Display security indication for:</property>
+                     <property name="label" translatable="yes" context="yes">Mailbox setup wizard allows you to define mailboxes for use on your device.</property>
                      <property name="use_underline">False</property>
                      <property name="use_markup">False</property>
                      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4289,10 +3912,10 @@
                      <property name="xalign">0.5</property>
                      <property name="yalign">0.5</property>
                      <property name="xpad">0</property>
-                     <property name="ypad">0</property>
+                     <property name="ypad">10</property>
                      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
                      <property name="width_chars">-1</property>
-                     <property name="single_line_mode">True</property>
+                     <property name="single_line_mode">False</property>
                      <property name="angle">0</property>
                    </widget>
                    <packing>
@@ -4310,54 +3933,105 @@
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton3">
+               <widget class="GtkHSeparator" id="hseparator6">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">All encrypted and digitally signed messages</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
                </widget>
                <packing>
                  <property name="padding">0</property>
                  <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="fill">True</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton9">
+               <widget class="GtkTable" id="table3">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">All untrusted digital IDs</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
+                 <property name="n_rows">1</property>
+                 <property name="n_columns">2</property>
+                 <property name="homogeneous">False</property>
+                 <property name="row_spacing">10</property>
+                 <property name="column_spacing">10</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label15">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes" context="yes">Mailbox type:</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">0</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">0</property>
+                     <property name="right_attach">1</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                   </packing>
+                 </child>
+
+                 <child>
+                   <widget class="GtkComboBox" id="AWMailboxtypeComboBox">
+                     <property name="visible">True</property>
+                     <property name="items" translatable="yes" context="yes">imap
+pop
+local</property>
+                     <property name="add_tearoffs">False</property>
+                     <property name="focus_on_click">True</property>
+                   </widget>
+                   <packing>
+                     <property name="left_attach">1</property>
+                     <property name="right_attach">2</property>
+                     <property name="top_attach">0</property>
+                     <property name="bottom_attach">1</property>
+                   </packing>
+                 </child>
                </widget>
                <packing>
                  <property name="padding">0</property>
                  <property name="expand">False</property>
-                 <property name="fill">False</property>
+                 <property name="fill">True</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkCheckButton" id="checkbutton10">
+               <widget class="GtkHBox" id="hbox18">
                  <property name="visible">True</property>
-                 <property name="can_focus">True</property>
-                 <property name="label" translatable="yes">All expired or invalid digital IDs</property>
-                 <property name="use_underline">True</property>
-                 <property name="relief">GTK_RELIEF_NORMAL</property>
-                 <property name="focus_on_click">True</property>
-                 <property name="active">False</property>
-                 <property name="inconsistent">False</property>
-                 <property name="draw_indicator">True</property>
+                 <property name="homogeneous">False</property>
+                 <property name="spacing">0</property>
+
+                 <child>
+                   <widget class="GtkLabel" id="label13">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes" context="yes">! Note: You cannot edit mailbox type once setup is complete</property>
+                     <property name="use_underline">False</property>
+                     <property name="use_markup">False</property>
+                     <property name="justify">GTK_JUSTIFY_LEFT</property>
+                     <property name="wrap">False</property>
+                     <property name="selectable">False</property>
+                     <property name="xalign">0.5</property>
+                     <property name="yalign">0.5</property>
+                     <property name="xpad">0</property>
+                     <property name="ypad">10</property>
+                     <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                     <property name="width_chars">-1</property>
+                     <property name="single_line_mode">False</property>
+                     <property name="angle">0</property>
+                   </widget>
+                   <packing>
+                     <property name="padding">0</property>
+                     <property name="expand">False</property>
+                     <property name="fill">False</property>
+                   </packing>
+                 </child>
                </widget>
                <packing>
                  <property name="padding">0</property>
@@ -4373,9 +4047,9 @@
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label27">
+           <widget class="GtkLabel" id="label57">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Security</property>
+             <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4394,128 +4068,216 @@
              <property name="type">tab</property>
            </packing>
          </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
 
-<widget class="GtkDialog" id="mailbox_setup_3">
-  <property name="border_width">10</property>
-  <property name="width_request">400</property>
-  <property name="height_request">350</property>
-  <property name="title" translatable="yes">Mailbox setup 3/4</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">500</property>
-  <property name="default_height">400</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
+         <child>
+           <widget class="GtkTable" id="table4">
+             <property name="visible">True</property>
+             <property name="n_rows">4</property>
+             <property name="n_columns">2</property>
+             <property name="homogeneous">False</property>
+             <property name="row_spacing">10</property>
+             <property name="column_spacing">0</property>
 
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox11">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
+             <child>
+               <widget class="GtkLabel" id="AWRealNameLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">Name:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
+               </packing>
+             </child>
 
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox4">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
+             <child>
+               <widget class="GtkLabel" id="AWUserNameLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">User name:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+                 <property name="x_options">fill</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="button18">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Finish</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
+             <child>
+               <widget class="GtkLabel" id="AWPasswordLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">Password:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+                 <property name="x_options">fill</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="button19">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Back</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
+             <child>
+               <widget class="GtkLabel" id="AWEMailAddressLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">E-mail address:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+                 <property name="x_options">fill</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="button20">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Next</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
+             <child>
+               <widget class="GtkEntry" id="AWRealNameEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+               </packing>
+             </child>
 
-         <child>
-           <widget class="GtkButton" id="button21">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Cancel</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
+             <child>
+               <widget class="GtkEntry" id="AWUserNameEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWPasswordEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">False</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWEMailAddressEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+               </packing>
+             </child>
            </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
+           </packing>
          </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkTable" id="table9">
-         <property name="visible">True</property>
-         <property name="n_rows">2</property>
-         <property name="n_columns">2</property>
-         <property name="homogeneous">False</property>
-         <property name="row_spacing">10</property>
-         <property name="column_spacing">10</property>
 
          <child>
-           <widget class="GtkLabel" id="label55">
+           <widget class="GtkLabel" id="label58">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Outgoing server:</property>
+             <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
-             <property name="xalign">0</property>
+             <property name="xalign">0.5</property>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
@@ -4525,25 +4287,129 @@
              <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">1</property>
-             <property name="bottom_attach">2</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
+             <property name="type">tab</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkTable" id="table9">
+             <property name="visible">True</property>
+             <property name="n_rows">2</property>
+             <property name="n_columns">2</property>
+             <property name="homogeneous">False</property>
+             <property name="row_spacing">10</property>
+             <property name="column_spacing">10</property>
+
+             <child>
+               <widget class="GtkLabel" id="AWInServerLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">Incoming server:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkLabel" id="AWOutServerLabel">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">Outgoing server:</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">0</property>
+                 <property name="right_attach">1</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWInServerComboEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">0</property>
+                 <property name="bottom_attach">1</property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWOutServerComboEntry">
+                 <property name="visible">True</property>
+                 <property name="editable">True</property>
+                 <property name="visibility">True</property>
+                 <property name="max_length">0</property>
+                 <property name="text" translatable="yes"></property>
+                 <property name="has_frame">True</property>
+                 <property name="invisible_char">*</property>
+                 <property name="activates_default">False</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">2</property>
+                 <property name="top_attach">1</property>
+                 <property name="bottom_attach">2</property>
+               </packing>
+             </child>
+           </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">False</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label54">
+           <widget class="GtkLabel" id="label59">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Incoming server:</property>
+             <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
              <property name="wrap">False</property>
              <property name="selectable">False</property>
-             <property name="xalign">0</property>
+             <property name="xalign">0.5</property>
              <property name="yalign">0.5</property>
              <property name="xpad">0</property>
              <property name="ypad">0</property>
@@ -4553,163 +4419,54 @@
              <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="left_attach">0</property>
-             <property name="right_attach">1</property>
-             <property name="top_attach">0</property>
-             <property name="bottom_attach">1</property>
-             <property name="x_options">fill</property>
-             <property name="y_options"></property>
+             <property name="type">tab</property>
            </packing>
          </child>
 
          <child>
-           <widget class="GtkComboBoxEntry" id="comboboxentry4">
+           <widget class="GtkHBox" id="hbox19">
              <property name="visible">True</property>
-             <property name="add_tearoffs">False</property>
-             <property name="has_frame">True</property>
-             <property name="focus_on_click">True</property>
-           </widget>
-           <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">0</property>
-             <property name="bottom_attach">1</property>
-             <property name="y_options">fill</property>
-           </packing>
-         </child>
+             <property name="homogeneous">False</property>
+             <property name="spacing">0</property>
 
-         <child>
-           <widget class="GtkComboBoxEntry" id="comboboxentry5">
-             <property name="visible">True</property>
-             <property name="add_tearoffs">False</property>
-             <property name="has_frame">True</property>
-             <property name="focus_on_click">True</property>
+             <child>
+               <widget class="GtkLabel" id="label56">
+                 <property name="visible">True</property>
+                 <property name="label" translatable="yes" context="yes">Mailbox setup is complete.
+
+Tap 'Finish' to save or 'Cancel' to discard the settings.
+Tap 'Advanced' to edit the advanced e-mail settings.</property>
+                 <property name="use_underline">False</property>
+                 <property name="use_markup">False</property>
+                 <property name="justify">GTK_JUSTIFY_LEFT</property>
+                 <property name="wrap">False</property>
+                 <property name="selectable">False</property>
+                 <property name="xalign">0.5</property>
+                 <property name="yalign">0.5</property>
+                 <property name="xpad">0</property>
+                 <property name="ypad">0</property>
+                 <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+                 <property name="width_chars">-1</property>
+                 <property name="single_line_mode">False</property>
+                 <property name="angle">0</property>
+               </widget>
+               <packing>
+                 <property name="padding">0</property>
+                 <property name="expand">False</property>
+                 <property name="fill">False</property>
+               </packing>
+             </child>
            </widget>
            <packing>
-             <property name="left_attach">1</property>
-             <property name="right_attach">2</property>
-             <property name="top_attach">1</property>
-             <property name="bottom_attach">2</property>
-             <property name="x_options">fill</property>
-             <property name="y_options">fill</property>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
            </packing>
          </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">True</property>
-         <property name="fill">True</property>
-       </packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
-<widget class="GtkDialog" id="mailbox_setup_4">
-  <property name="border_width">10</property>
-  <property name="width_request">400</property>
-  <property name="height_request">350</property>
-  <property name="title" translatable="yes">Mailbox setup 4/4</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="default_width">500</property>
-  <property name="default_height">400</property>
-  <property name="resizable">False</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="decorated">True</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">False</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <property name="has_separator">True</property>
-
-  <child internal-child="vbox">
-    <widget class="GtkVBox" id="vbox12">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child internal-child="action_area">
-       <widget class="GtkHButtonBox" id="hbuttonbox5">
-         <property name="visible">True</property>
-         <property name="layout_style">GTK_BUTTONBOX_END</property>
-
-         <child>
-           <widget class="GtkButton" id="button22">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Finish</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button23">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Back</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button24">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Advanced</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-
-         <child>
-           <widget class="GtkButton" id="button25">
-             <property name="visible">True</property>
-             <property name="can_default">True</property>
-             <property name="can_focus">True</property>
-             <property name="label" translatable="yes">Cancel</property>
-             <property name="use_underline">True</property>
-             <property name="relief">GTK_RELIEF_NORMAL</property>
-             <property name="focus_on_click">True</property>
-             <property name="response_id">0</property>
-           </widget>
-         </child>
-       </widget>
-       <packing>
-         <property name="padding">0</property>
-         <property name="expand">False</property>
-         <property name="fill">True</property>
-         <property name="pack_type">GTK_PACK_END</property>
-       </packing>
-      </child>
-
-      <child>
-       <widget class="GtkHBox" id="hbox19">
-         <property name="visible">True</property>
-         <property name="homogeneous">False</property>
-         <property name="spacing">0</property>
 
          <child>
-           <widget class="GtkLabel" id="label56">
+           <widget class="GtkLabel" id="label60">
              <property name="visible">True</property>
-             <property name="label" translatable="yes">Mailbox setup is complete.
-
-Tap 'Finish' to save or 'Cancel' to discard the settings.
-Tap 'Advanced' to edit the advanced e-mail settings.</property>
+             <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
              <property name="use_markup">False</property>
              <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4725,9 +4482,7 @@ Tap 'Advanced' to edit the advanced e-mail settings.</property>
              <property name="angle">0</property>
            </widget>
            <packing>
-             <property name="padding">0</property>
-             <property name="expand">False</property>
-             <property name="fill">False</property>
+             <property name="type">tab</property>
            </packing>
          </child>
        </widget>