projects / modest / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
* more security by only displaying images if the setting is on
[modest] / src / gtk-glade / modest.glade
diff --git a/src/gtk-glade/modest.glade b/src/gtk-glade/modest.glade
index 4e879df..a3ae4e4 100644 (file)
--- a/src/gtk-glade/modest.glade
+++ b/src/gtk-glade/modest.glade
@@ -414,6 +414,16 @@
                  </child>
 
                  <child>
+                   <widget class="GtkCheckMenuItem" id="menu_view_attachments">
+                     <property name="visible">True</property>
+                     <property name="label" translatable="yes">Attachments</property>
+                     <property name="use_underline">True</property>
+                     <property name="active">True</property>
+                     <signal name="toggled" handler="on_view_attachments_toggled" last_modification_time="Fri, 09 Jun 2006 14:17:29 GMT"/>
+                   </widget>
+                 </child>
+
+                 <child>
                    <widget class="GtkCheckMenuItem" id="full_screen1">
                      <property name="visible">True</property>
                      <property name="label" translatable="yes">Full screen</property>
@@ -2526,7 +2536,7 @@
 
 <widget class="GtkDialog" id="account_wizard">
   <property name="border_width">10</property>
-  <property name="title" translatable="yes"></property>
+  <property name="title" translatable="yes">Account Setup</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -2616,7 +2626,7 @@
          <property name="enable_popup">False</property>
 
          <child>
-           <widget class="GtkVBox" id="vbox5">
+           <widget class="GtkVBox" id="PresetPage">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">10</property>
@@ -2669,101 +2679,138 @@
                  <property name="fill">True</property>
                </packing>
              </child>
+           </widget>
+           <packing>
+             <property name="tab_expand">False</property>
+             <property name="tab_fill">True</property>
+           </packing>
+         </child>
+
+         <child>
+           <widget class="GtkLabel" id="label57">
+             <property name="visible">True</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.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="GtkTable" id="EMailAdressPage">
+             <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="GtkTable" id="table3">
+               <widget class="GtkLabel" id="AWEMailAddressLabel">
                  <property name="visible">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>
+                 <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">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></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>
+             <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="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">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkHBox" id="hbox18">
+               <widget class="GtkLabel" id="AWRealNameLabel">
                  <property name="visible">True</property>
-                 <property name="homogeneous">False</property>
-                 <property name="spacing">0</property>
+                 <property name="label" translatable="yes" context="yes">Your 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>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
 
-                 <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>
+             <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="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="y_options"></property>
                </packing>
              </child>
            </widget>
@@ -2774,7 +2821,7 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label57">
+           <widget class="GtkLabel" id="label64">
              <property name="visible">True</property>
              <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
@@ -2797,18 +2844,18 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkTable" id="table4">
+           <widget class="GtkTable" id="IncomingPage">
              <property name="visible">True</property>
-             <property name="n_rows">4</property>
-             <property name="n_columns">2</property>
+             <property name="n_rows">5</property>
+             <property name="n_columns">3</property>
              <property name="homogeneous">False</property>
              <property name="row_spacing">10</property>
-             <property name="column_spacing">0</property>
+             <property name="column_spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="AWRealNameLabel">
+               <widget class="GtkLabel" id="AWPasswordLabel">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes" context="yes">Name:</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>
@@ -2826,9 +2873,10 @@ LOCAL</property>
                <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="top_attach">4</property>
+                 <property name="bottom_attach">5</property>
                  <property name="x_options">fill</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
 
@@ -2853,16 +2901,17 @@ LOCAL</property>
                <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="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="AWPasswordLabel">
+               <widget class="GtkLabel" id="AWInServerLabel">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes" context="yes">Password:</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>
@@ -2883,13 +2932,14 @@ LOCAL</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="AWEMailAddressLabel">
+               <widget class="GtkLabel" id="label15">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes" context="yes">E-mail address:</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>
@@ -2907,14 +2957,15 @@ LOCAL</property>
                <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="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="GtkEntry" id="AWRealNameEntry">
+               <widget class="GtkEntry" id="AWInServerComboEntry">
                  <property name="visible">True</property>
                  <property name="editable">True</property>
                  <property name="visibility">True</property>
@@ -2927,35 +2978,86 @@ LOCAL</property>
                <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="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">3</property>
                  <property name="top_attach">0</property>
                  <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options">fill</property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkEntry" id="AWUserNameEntry">
+               <widget class="GtkCheckButton" id="AWInSSLCheckButton">
                  <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>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Use SSL</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="left_attach">2</property>
+                 <property name="right_attach">3</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="MailboxTypeNoteLabel">
+                 <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">1</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="left_attach">0</property>
+                 <property name="right_attach">3</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="AWPasswordEntry">
+               <widget class="GtkEntry" id="AWUserNameEntry">
                  <property name="visible">True</property>
                  <property name="editable">True</property>
-                 <property name="visibility">False</property>
+                 <property name="visibility">True</property>
                  <property name="max_length">0</property>
                  <property name="text" translatable="yes"></property>
                  <property name="has_frame">True</property>
@@ -2964,17 +3066,18 @@ LOCAL</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="right_attach">3</property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
 
              <child>
-               <widget class="GtkEntry" id="AWEMailAddressEntry">
+               <widget class="GtkEntry" id="AWPasswordEntry">
                  <property name="visible">True</property>
                  <property name="editable">True</property>
-                 <property name="visibility">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>
@@ -2983,9 +3086,10 @@ LOCAL</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="right_attach">3</property>
+                 <property name="top_attach">4</property>
+                 <property name="bottom_attach">5</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
            </widget>
@@ -2996,7 +3100,7 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label58">
+           <widget class="GtkLabel" id="label65">
              <property name="visible">True</property>
              <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
@@ -3019,18 +3123,18 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkTable" id="table9">
+           <widget class="GtkTable" id="OutgoingPage">
              <property name="visible">True</property>
-             <property name="n_rows">2</property>
-             <property name="n_columns">2</property>
+             <property name="n_rows">4</property>
+             <property name="n_columns">3</property>
              <property name="homogeneous">False</property>
              <property name="row_spacing">10</property>
              <property name="column_spacing">10</property>
 
              <child>
-               <widget class="GtkLabel" id="AWInServerLabel">
+               <widget class="GtkLabel" id="AWOutPasswordLabel">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes" context="yes">Incoming server:</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>
@@ -3048,17 +3152,45 @@ LOCAL</property>
                <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="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="AWOutServerLabel">
+               <widget class="GtkLabel" id="AWOutUserLabel">
                  <property name="visible">True</property>
-                 <property name="label" translatable="yes" context="yes">Outgoing server:</property>
+                 <property name="label" translatable="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">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="label70">
+                 <property name="visible">True</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>
@@ -3084,7 +3216,35 @@ LOCAL</property>
              </child>
 
              <child>
-               <widget class="GtkEntry" id="AWInServerComboEntry">
+               <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">0</property>
+                 <property name="bottom_attach">1</property>
+                 <property name="x_options">fill</property>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWOutServerComboEntry">
                  <property name="visible">True</property>
                  <property name="editable">True</property>
                  <property name="visibility">True</property>
@@ -3099,12 +3259,59 @@ LOCAL</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>
 
              <child>
-               <widget class="GtkEntry" id="AWOutServerComboEntry">
+               <widget class="GtkCheckButton" id="AWOutSSLCheckButton">
+                 <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Use SSL</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">2</property>
+                 <property name="right_attach">3</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="GtkCheckButton" id="AWUseIncomingCheckButton">
                  <property name="visible">True</property>
+                 <property name="can_focus">True</property>
+                 <property name="label" translatable="yes">Use incoming settings</property>
+                 <property name="use_underline">True</property>
+                 <property name="relief">GTK_RELIEF_NORMAL</property>
+                 <property name="focus_on_click">True</property>
+                 <property name="active">True</property>
+                 <property name="inconsistent">False</property>
+                 <property name="draw_indicator">True</property>
+               </widget>
+               <packing>
+                 <property name="left_attach">1</property>
+                 <property name="right_attach">3</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="AWOutUserNameEntry">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</property>
+                 <property name="can_focus">True</property>
                  <property name="editable">True</property>
                  <property name="visibility">True</property>
                  <property name="max_length">0</property>
@@ -3115,9 +3322,32 @@ LOCAL</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="right_attach">3</property>
+                 <property name="top_attach">2</property>
+                 <property name="bottom_attach">3</property>
+                 <property name="y_options"></property>
+               </packing>
+             </child>
+
+             <child>
+               <widget class="GtkEntry" id="AWOutPasswordEntry">
+                 <property name="visible">True</property>
+                 <property name="sensitive">False</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">3</property>
+                 <property name="top_attach">3</property>
+                 <property name="bottom_attach">4</property>
+                 <property name="y_options"></property>
                </packing>
              </child>
            </widget>
@@ -3128,7 +3358,7 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkLabel" id="label59">
+           <widget class="GtkLabel" id="label58">
              <property name="visible">True</property>
              <property name="label" translatable="yes"></property>
              <property name="use_underline">False</property>
@@ -3151,7 +3381,7 @@ LOCAL</property>
          </child>
 
          <child>
-           <widget class="GtkHBox" id="hbox19">
+           <widget class="GtkHBox" id="FinishPage">
              <property name="visible">True</property>
              <property name="homogeneous">False</property>
              <property name="spacing">0</property>
"modest" is a lean & mean e-mail program.