added old hidden property zero_replacement_char
[clawsker.git] / clawsker
index 2ce29d52ec9b2c6c4723a7940034369037f31f8c..2086375669bdf709cc9de22fe0bf23cfd93d20d8 100755 (executable)
--- a/clawsker
+++ b/clawsker
@@ -1,7 +1,6 @@
 #!/usr/bin/perl -w
 #
 # Clawsker :: A Claws Mail Tweaker
-# $Id$
 #
 use strict;
 use encoding 'utf8';
@@ -9,6 +8,7 @@ use Glib qw(TRUE FALSE);
 use Gtk2 -init;
 use POSIX qw(setlocale);
 use Locale::gettext;
+use Encode;
 
 my $NAME = 'clawsker';
 my $PREFIX = '@PREFIX@';
@@ -36,7 +36,7 @@ sub _ {
             $xla =~ s/\{$key\}/$par{$key}/g;
         }
     }
-    return $xla;
+    return decode_utf8($xla);
 }
 
 # default messages
@@ -55,7 +55,7 @@ sub _ {
 
     ab_frame => _('Addressbook'),
     mem_frame => _('Memory'),
-    msgview_frame => _('Message view'),
+    msgview_frame => _('Message View'),
     log_frame => _('Log window'),
     dnd_frame => _('Drag \'n\' drop'),
     ssl_frame => _('Secure Sockets Layer'),
@@ -63,6 +63,8 @@ sub _ {
     stripes_frame => _('Coloured stripes'),
     sbar_frame => _('Scroll bars'),
     mlist_frame => _('Message List'),
+    mview_frame => _('Message View'),
+    compo_frame => _('Compose window'),
     netm_frame => _('NetworkManager'),
 
     l_oth_use_dlg => _('Use detached address book edit dialogue'),
@@ -89,18 +91,29 @@ sub _ {
     l_gui_v_scroll_show => _('Show always'),
     l_gui_v_scroll_auto => _('Automatic'),
     l_gui_v_scroll_hide => _('Hide always'),
+    l_gui_from_show => _('From column displays'),
+    h_gui_from_show => _('Selects the data displayed in the From column of the Message List: name, address or both'),
+    l_gui_from_show_name => _('Name only'),
+    l_gui_from_show_addr => _('Address only'),
+    l_gui_from_show_both => _('Both name and address'),
     l_gui_strip_off => _('Coloured lines contrast'),
     h_gui_strip_off => _('Specify the value to use when creating alternately coloured lines in tree view components. The smaller the value, the less visible the difference in the alternating colours of the lines.'),
-    l_gui_cursor_v => _('Show Cursor in message view'),
-    h_gui_cursor_v => _('Display the cursor in the message view.'),
+    l_gui_cursor_v => _('Show cursor'),
+    h_gui_cursor_v => _('Display the cursor in the Message View.'),
     l_gui_toolbar_d => _('Detachable toolbars'),
     h_gui_toolbar_d => _('Show handles in the toolbars.'),
     l_gui_strip_all => _('Use stripes in all tree view components'),
     h_gui_strip_all => _('Enable alternately coloured lines in all tree view components.'),
     l_gui_strip_sum => _('Use stripes in Folder List and Message List'),
-    h_gui_strip_sum => _('Enable alternately coloured lines in Message list and Folder list.'),
+    h_gui_strip_sum => _('Enable alternately coloured lines in Message List and Folder List.'),
     l_gui_two_line_v => _('2 lines per Message List item in 3-column layout'),
     h_gui_two_line_v => _('Spread Message List information over two lines when using the three column mode.'),
+    l_gui_margin_co => _('Show compose margin'),
+    h_gui_margin_co => _('Shows a small margin in the Compose View.'),
+    l_gui_mview_date => _('Don\'t display localized date'),
+    h_gui_mview_date => _('Toggles localization of date format in Message View'),
+    l_gui_zero_char => _('Zero replacement character'),
+    h_gui_zero_char => _('Replaces \'0\' with the given character in Folder List'),
 
     l_beh_hover_t => _('Drag \'n\' drop hover timeout (ms)'),
     h_beh_hover_t => _('Time in milliseconds that will cause a folder tree to expand when the mouse cursor is held over it during drag and drop.'),
@@ -122,10 +135,12 @@ sub _ {
     h_beh_use_utf8 => _('Use UTF-8 encoding for broken mails instead of current locale.'),
     l_beh_warn_dnd => _('Warn on drag \'n\' drop'),
     h_beh_warn_dnd => _('Display a confirmation dialogue on drag \'n\' drop of folders.'),
-    l_beh_out_ascii => _('Ougoing messages fallback to ASCII'),
+    l_beh_out_ascii => _('Outgoing messages fallback to ASCII'),
     h_beh_out_ascii => _('If content allows, ASCII will be used to encode outgoing messages, otherwise the user-defined encoding is enforced always.'),
     l_beh_pp_unsel => _('Primary paste unselects selection'),
     h_beh_pp_unsel => _('Controls how pasting using middle-click changes the selected text and insertion point.'),
+    l_beh_inline_at => _('Show inline attachments'),
+    h_beh_inline_at => _('Allows hiding inline attachments already shown in mail structure view'),
 
     l_col_emphasis => _('X-Mailer header'),
     h_col_emphasis => _('The colour used for the X-Mailer line when its value is Claws Mail.'),
@@ -189,20 +204,20 @@ use constant PAGE_SPC => 5;
 # version functions
 
 sub version_greater_or_equal() {
-  my ($version, $refvers) = @_;
-  my @version = split (/\./, $version);
-  my @refvers = split (/\./, $refvers);
-  while ($#version < $#refvers) {
-    push (@version, '0');
-  }
-  my $idx = 0;
-  while (($idx <= $#refvers) 
-         and (int ($version[$idx]) == int ($refvers[$idx]))) {
-    ++$idx;
-  }
-  return TRUE if (($idx > $#refvers) 
-               or (int ($version[$idx]) >= int ($refvers[$idx])));
-  return FALSE;
+    my ($version, $refvers) = @_;
+    my @version = split (/\./, $version);
+    my @refvers = split (/\./, $refvers);
+    while ($#version < $#refvers) {
+        push (@version, '0');
+    }
+    my $idx = 0;
+    while (($idx <= $#refvers) 
+            and (int ($version[$idx]) == int ($refvers[$idx]))) {
+        ++$idx;
+    }
+    return TRUE if (($idx > $#refvers)
+        or (int ($version[$idx]) >= int ($refvers[$idx])));
+    return FALSE;
 }
 
 sub get_claws_version() {
@@ -246,7 +261,7 @@ sub handle_int_value {
     s/\s+$//;
     if (/^[0-9]+$/) {
         $$dataref = $_;
-       $widget->set_text ($_);
+        $widget->set_text ($_);
     }
     else {
         $widget->set_text ($$dataref);
@@ -258,6 +273,13 @@ sub handle_string_value {
     $$dataref = $widget->get_text ();
 }
 
+sub handle_nchar_value {
+    my ($widget, $event, $dataref, $minlen) = @_;
+    $_ = substr ($widget->get_text (), 0, $minlen);
+    $widget->set_text ($_);
+    $$dataref = $_;
+}
+
 sub gdk_color_from_str {
     my ($str) = @_;
     my ($rr, $gg, $bb) = (0, 0 ,0);
@@ -329,9 +351,8 @@ sub check_claws_not_running() {
         my $emsg = "$xl::s{e_error}$xl::s{e_running}";
         log_message ($emsg);
         error_dialog ($emsg);
-       return FALSE;
+        return FALSE;
      };
-
      return TRUE;
 }
 
@@ -341,9 +362,8 @@ sub check_rc_file() {
        my $emsg = "$xl::s{e_error}$xl::s{e_noclawsrc}\n";
         log_message ($emsg);
         error_dialog ($emsg);
-       return FALSE;
+        return FALSE;
     };
-
     return TRUE;
 }
 
@@ -375,7 +395,7 @@ sub new_check_button_for {
     }
     $cb->signal_connect (clicked => sub {
             my ($w, $e) = @_;
-           &handle_bool_value($w, $e, \$HPVALUE{$name});
+            &handle_bool_value($w, $e, \$HPVALUE{$name});
         });
     &set_widget_hint ($cb, $$hash{$key}[DESC]);
     &set_widget_sens ($cb, $$hash{$key}[CMVER]);
@@ -396,10 +416,36 @@ sub new_text_box_for_int {
     my $pagei = int (($type[2] - $type[1]) / 10);
     my $gentry = Gtk2::SpinButton->new_with_range ($type[1], $type[2], $pagei);
     $gentry->set_numeric (TRUE);
+    $gentry->set_value ($HPVALUE{$name});
     $$hash{$key}[GUI] = $gentry;
     $gentry->signal_connect('value-changed' => sub {
             my ($w, $e) = @_;
-           &handle_int_value($w, $e, \$HPVALUE{$name});
+            &handle_int_value($w, $e, \$HPVALUE{$name});
+        });
+    &set_widget_hint ($gentry, $$hash{$key}[DESC]);
+    &set_widget_sens ($gentry, $$hash{$key}[CMVER]);
+    $glabel->set_sensitive ($gentry->sensitive);
+    $hbox->pack_start ($glabel, FALSE, FALSE, HBOX_SPC);
+    $hbox->pack_start ($gentry, FALSE, FALSE, HBOX_SPC);
+    #
+    return $hbox;
+}
+
+sub new_text_box_for_nchar {
+    my ($hash, $key) = @_;
+    my $name = $$hash{$key}[NAME];
+    my $label = $$hash{$key}[LABEL];
+    my @type = split (/,/, $$hash{$key}[TYPE]); # char,minlen,maxlen
+    my $hbox = Gtk2::HBox->new (FALSE, 5);
+    my $glabel = Gtk2::Label->new ($label);
+    my $gentry = Gtk2::Entry->new ();
+    $gentry->set_max_length($type[2]) if defined ($type[2]);
+    $gentry->set_width_chars(int ($type[2]) + 2) if defined ($type[2]);
+    $gentry->set_text ($HPVALUE{$name});
+    $$hash{$key}[GUI] = $gentry;
+    $gentry->signal_connect('key-release-event' => sub {
+            my ($w, $e) = @_;
+            &handle_nchar_value($w, $e, \$HPVALUE{$name}, $type[1]);
         });
     &set_widget_hint ($gentry, $$hash{$key}[DESC]);
     &set_widget_sens ($gentry, $$hash{$key}[CMVER]);
@@ -424,7 +470,7 @@ sub new_color_button_for {
     $button->set_relief ('none');
     $button->signal_connect ('color-set' => sub {
             my ($w, $e) = @_;
-           &handle_color_value($w, $e, \$HPVALUE{$name}); 
+            &handle_color_value($w, $e, \$HPVALUE{$name}); 
         });
     &set_widget_hint ($button, $$hash{$key}[DESC]);
     &set_widget_sens ($button, $$hash{$key}[CMVER]);
@@ -451,7 +497,7 @@ sub new_selection_box_for {
     }
     $combo->signal_connect ('changed' => sub {
             my ($w, $e) = @_;
-           &handle_selection_value($w, $e, \$HPVALUE{$name});
+            &handle_selection_value($w, $e, \$HPVALUE{$name});
         });
     $combo->set_active ($HPVALUE{$name});
     &set_widget_hint ($combo, $$hash{$key}[DESC]);
@@ -483,6 +529,15 @@ sub new_vbox_pack() {
     return $vbox;
 }    
 
+sub new_vbox_pack_compact() {
+    my $vbox = Gtk2::VBox->new (FALSE, 0);
+    $vbox->set_border_width (0);
+    foreach my $item (@_) {
+        $vbox->pack_start ($item, FALSE, FALSE, 0);
+    }
+    return $vbox;
+}    
+
 sub new_subpage_frame () {
     my ($box, $title, $notpacked) = @_;
     my $frame = Gtk2::Frame->new ($title);
@@ -496,39 +551,39 @@ sub new_subpage_frame () {
 %pr::oth = ( # other preferences
     use_dlg => [ 
         'addressbook_use_editaddress_dialog',
-       $xl::s{l_oth_use_dlg},
+        $xl::s{l_oth_use_dlg},
         $xl::s{h_oth_use_dlg},
-       'bool',
-       '2.7.0',
-       '0',
-       undef,
+        'bool',
+        '2.7.0',
+        '0',
+        undef,
     ],
     max_use => [
-       'cache_max_mem_usage',
-       $xl::s{l_oth_max_use},
-       $xl::s{h_oth_max_use},
-       'int,0,262144', # 0 Kb - 256 Mb
-       '0.0.0',
-       '4096',
-       undef,
+        'cache_max_mem_usage',
+        $xl::s{l_oth_max_use},
+        $xl::s{h_oth_max_use},
+        'int,0,262144', # 0 Kb - 256 Mb
+        '0.0.0',
+        '4096',
+        undef,
     ],
     min_time => [
         'cache_min_keep_time',
-       $xl::s{l_oth_min_time},
-       $xl::s{h_oth_min_time},
-       'int,0,120', # 0 minutes - 2 hours
-       '0.0.0',
-       '15',
-       undef,
+        $xl::s{l_oth_min_time},
+        $xl::s{h_oth_min_time},
+        'int,0,120', # 0 minutes - 2 hours
+        '0.0.0',
+        '15',
+        undef,
     ],
     use_netm => [
         'use_networkmanager',
-       $xl::s{l_oth_use_netm},
-       $xl::s{h_oth_use_netm},
-       'bool',
-       '3.3.1',
-       '1',
-       undef,
+        $xl::s{l_oth_use_netm},
+        $xl::s{h_oth_use_netm},
+        'bool',
+        '3.3.1',
+        '1',
+        undef,
     ],
 );
 
@@ -555,10 +610,10 @@ sub new_other_page() {
         'bold_unread',
         $xl::s{l_gui_b_unread},
         $xl::s{h_gui_b_unread},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     no_markup => [
         'compose_no_markup',
@@ -567,97 +622,133 @@ sub new_other_page() {
         'bool',
         '0.0.0',
         '0',
-       undef,
+        undef,
     ],
     dot_lines => [
         'enable_dotted_lines',
         $xl::s{l_gui_dot_lines},
         $xl::s{h_gui_dot_lines},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     h_scroll => [
         'enable_hscrollbar',
         $xl::s{l_gui_h_scroll},
         $xl::s{h_gui_h_scroll},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     swp_from => [
         'enable_swap_from',
         $xl::s{l_gui_swp_from},
         $xl::s{h_gui_swp_from},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     v_scroll => [
         'folderview_vscrollbar_policy',
         $xl::s{l_gui_v_scroll},
         $xl::s{h_gui_v_scroll},
-       '0=l_gui_v_scroll_show;1=l_gui_v_scroll_auto;2=l_gui_v_scroll_hide',
-       '0.0.0',
-       '0',
-       undef,
+        '0=l_gui_v_scroll_show;1=l_gui_v_scroll_auto;2=l_gui_v_scroll_hide',
+        '0.0.0',
+        '0',
+        undef,
+    ],
+    from_show => [
+        'summary_from_show',
+        $xl::s{l_gui_from_show},
+        $xl::s{h_gui_from_show},
+        '0=l_gui_from_show_name;1=l_gui_from_show_addr;2=l_gui_from_show_both',
+        '3.7.10',
+        '0',
+        undef,
     ],
     strip_off => [
         'stripes_color_offset',
-       $xl::s{l_gui_strip_off},
-       $xl::s{h_gui_strip_off},
-       'int,0,10000', # no idea what this number means
-       '0.0.0',
-       '4000',
-       undef,
+        $xl::s{l_gui_strip_off},
+        $xl::s{h_gui_strip_off},
+        'int,0,40000', # no idea what this number means
+        '0.0.0',
+        '4000',
+        undef,
     ],
     cursor_v => [
         'textview_cursor_visible',
         $xl::s{l_gui_cursor_v},
         $xl::s{h_gui_cursor_v},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     toolbar_d => [
         'toolbar_detachable',
         $xl::s{l_gui_toolbar_d},
         $xl::s{h_gui_toolbar_d},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     strip_all => [
         'use_stripes_everywhere',
         $xl::s{l_gui_strip_all},
         $xl::s{h_gui_strip_all},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     strip_sum => [
         'use_stripes_in_summaries',
         $xl::s{l_gui_strip_sum},
         $xl::s{h_gui_strip_sum},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     two_linev => [
         'two_line_vertical',
-       $xl::s{l_gui_two_line_v},
-       $xl::s{h_gui_two_line_v},
-       'bool',
-       '3.4.0.7',
-       '0',
-       undef,
+        $xl::s{l_gui_two_line_v},
+        $xl::s{h_gui_two_line_v},
+        'bool',
+        '3.4.0.7',
+        '0',
+        undef,
+    ],
+    margin_co => [
+        'show_compose_margin',
+        $xl::s{l_gui_margin_co},
+        $xl::s{h_gui_margin_co},
+        'bool',
+        '3.7.6.7',
+        '0',
+        undef,
+    ],
+    mview_date => [
+        'msgview_date_format',
+        $xl::s{l_gui_mview_date},
+        $xl::s{h_gui_mview_date},
+        'bool',
+        '3.7.8.42',
+        '0',
+        undef,
+    ],
+    zero_char => [
+        'zero_replacement_char',
+        $xl::s{l_gui_zero_char},
+        $xl::s{h_gui_zero_char},
+        'char,1,1',
+        '2.8.1.77',
+        '0',
+        undef,
     ],
 );
 
@@ -665,11 +756,9 @@ sub new_gui_page() {
     my $gf = Gtk2::VBox->new (FALSE, 5);
     $gf->set_border_width (PAGE_SPC);
 
-    my $cb_no_markup = &new_check_button_for (\%pr::gui, 'no_markup'); 
     my $cb_dot_lines = &new_check_button_for (\%pr::gui, 'dot_lines'); 
-    my $cb_cursor_v = &new_check_button_for (\%pr::gui, 'cursor_v');
     my $cb_toolbar_d = &new_check_button_for (\%pr::gui, 'toolbar_d');
-    my $cb_two_linev = &new_check_button_for (\%pr::gui, 'two_linev');
+    my $tb_zero_char = &new_text_box_for_nchar (\%pr::gui, 'zero_char');
 
     $gf->pack_start (&new_subpage_frame (
                          &new_vbox_pack (
@@ -681,20 +770,32 @@ sub new_gui_page() {
     $gf->pack_start (&new_subpage_frame (
                          &new_vbox_pack (
                              &new_check_button_for (\%pr::gui, 'b_unread'),
-                             &new_check_button_for (\%pr::gui, 'swp_from')),
+                             &new_check_button_for (\%pr::gui, 'swp_from'),
+                             &new_check_button_for (\%pr::gui, 'two_linev'),
+                             &new_selection_box_for (\%pr::gui, 'from_show')),
                          $xl::s{mlist_frame}, 'not-packed'), 
                      FALSE, FALSE, FRAME_SPC);
-    $gf->pack_start ($cb_no_markup, FALSE, FALSE, 0);
+    $gf->pack_start (&new_subpage_frame (
+                         &new_hbox_pack (
+                             &new_check_button_for (\%pr::gui, 'cursor_v'),
+                             &new_check_button_for (\%pr::gui, 'mview_date')),
+                         $xl::s{mview_frame}, 'not-packed'), 
+                     FALSE, FALSE, FRAME_SPC);
+    $gf->pack_start (&new_subpage_frame (
+                         &new_hbox_pack (
+                             &new_check_button_for (\%pr::gui, 'no_markup'),
+                             &new_check_button_for (\%pr::gui, 'margin_co')),
+                         $xl::s{compo_frame}, 'not-packed'), 
+                     FALSE, FALSE, FRAME_SPC);
     $gf->pack_start ($cb_dot_lines, FALSE, FALSE, 0);
-    $gf->pack_start ($cb_cursor_v, FALSE, FALSE, 0);
     $gf->pack_start ($cb_toolbar_d, FALSE, FALSE, 0);
-    $gf->pack_start ($cb_two_linev, FALSE, FALSE, 0);
     $gf->pack_start (&new_subpage_frame (
                          &new_vbox_pack (
                              &new_check_button_for (\%pr::gui, 'h_scroll'),
                              &new_selection_box_for (\%pr::gui, 'v_scroll')),
                          $xl::s{sbar_frame}, 'not-packed'),
                      FALSE, FALSE, FRAME_SPC);
+    $gf->pack_start ($tb_zero_char, FALSE, FALSE, 0);
 
     return $gf;
 }
@@ -704,100 +805,100 @@ sub new_gui_page() {
         'hover_timeout',
         $xl::s{l_beh_hover_t},
         $xl::s{h_beh_hover_t},
-       'int,100,3000', # 0.1 seconds - 3 seconds
-       '0.0.0',
-       '500',
-       undef,
+        'int,100,3000', # 0.1 seconds - 3 seconds
+        '0.0.0',
+        '500',
+        undef,
     ],
     dangerous => [
         'live_dangerously',
         $xl::s{l_beh_dangerous},
         $xl::s{h_beh_dangerous},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     flowed => [
         'respect_flowed_format',
         $xl::s{l_beh_flowed},
         $xl::s{h_beh_flowed},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     parts_rw => [
         'save_parts_readwrite',
         $xl::s{l_beh_parts_rw},
         $xl::s{h_beh_parts_rw},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     skip_ssl => [
         'skip_ssl_cert_check',
         $xl::s{l_beh_skip_ssl},
         $xl::s{h_beh_skip_ssl},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     up_step => [
         'statusbar_update_step',
         $xl::s{l_beh_up_step},
         $xl::s{h_beh_up_step},
-       'int,1,200', # 1 item - 200 items
-       '0.0.0',
-       '10',
-       undef,
+        'int,1,200', # 1 item - 200 items
+        '0.0.0',
+        '10',
+        undef,
     ],
     thread_a => [
         'thread_by_subject_max_age',
         $xl::s{l_beh_thread_a},
         $xl::s{h_beh_thread_a},
-       'int,1,30', # 1 day - 30 days
-       '0.0.0',
-       '10',
-       undef,
+        'int,1,30', # 1 day - 30 days
+        '0.0.0',
+        '10',
+        undef,
     ],
     unsafe_ssl => [
         'unsafe_ssl_certs',
         $xl::s{l_beh_unsafe_ssl},
         $xl::s{h_beh_unsafe_ssl},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     use_utf8 => [
         'utf8_instead_of_locale_for_broken_mail',
         $xl::s{l_beh_use_utf8},
         $xl::s{h_beh_use_utf8},
-       'bool',
-       '0.0.0',
-       '0',
-       undef,
+        'bool',
+        '0.0.0',
+        '0',
+        undef,
     ],
     warn_dnd => [
         'warn_dnd',
         $xl::s{l_beh_warn_dnd},
         $xl::s{h_beh_warn_dnd},
-       'bool',
-       '0.0.0',
-       '1',
-       undef,
+        'bool',
+        '0.0.0',
+        '1',
+        undef,
     ],
     out_ascii => [
         'outgoing_fallback_to_ascii',
-       $xl::s{l_beh_out_ascii},
-       $xl::s{h_beh_out_ascii},
-       'bool',
-       '3.4.0.37',
-       '1',
-       undef,
+        $xl::s{l_beh_out_ascii},
+        $xl::s{h_beh_out_ascii},
+        'bool',
+        '3.4.0.37',
+        '1',
+        undef,
     ],
     pp_unsel => [
         'primary_paste_unselects',
@@ -808,6 +909,15 @@ sub new_gui_page() {
         '0',
         undef,
     ],
+    inline_at => [
+        'show_inline_attachments',
+        $xl::s{l_beh_inline_at},
+        $xl::s{h_beh_inline_at},
+        'bool',
+        '3.7.8.48',
+        '1',
+        undef,
+    ],
 );
 
 sub new_behaviour_page() {
@@ -838,7 +948,8 @@ sub new_behaviour_page() {
                              &new_check_button_for (\%pr::beh, 'use_utf8'),
                              &new_check_button_for (\%pr::beh, 'dangerous'),
                              &new_check_button_for (\%pr::beh, 'out_ascii'),
-                             &new_check_button_for (\%pr::beh, 'pp_unsel')),
+                             &new_check_button_for (\%pr::beh, 'pp_unsel'),
+                             &new_check_button_for (\%pr::beh, 'inline_at')),
                          $xl::s{msgs_frame}, 'not-packed'),
                      FALSE, FALSE, FRAME_SPC);
 
@@ -850,18 +961,18 @@ sub new_behaviour_page() {
         'emphasis_color',
         $xl::s{l_col_emphasis},
         $xl::s{h_col_emphasis},
-       'color',
-       '0.0.0',
-       '#0000cf',
-       undef,
+        'color',
+        '0.0.0',
+        '#0000cf',
+        undef,
     ],
     log_err => [
         'log_error_color',
         $xl::s{l_col_log_err},
         $xl::s{h_col_log_err},
         'color',
-       '0.0.0',
-       '#af0000',
+        '0.0.0',
+        '#af0000',
         undef,
     ],
     log_in => [
@@ -869,8 +980,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_in},
         $xl::s{h_col_log_in},
         'color',
-       '0.0.0',
-       '#000000',
+        '0.0.0',
+        '#000000',
         undef,
     ],
     log_msg => [
@@ -878,8 +989,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_msg},
         $xl::s{h_col_log_msg},
         'color',
-       '0.0.0',
-       '#00af00',
+        '0.0.0',
+        '#00af00',
         undef,
     ],
     log_out => [
@@ -887,8 +998,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_out},
         $xl::s{h_col_log_out},
         'color',
-       '0.0.0',
-       '#0000ef',
+        '0.0.0',
+        '#0000ef',
         undef,
     ],
     log_warn => [
@@ -896,8 +1007,8 @@ sub new_behaviour_page() {
         $xl::s{l_col_log_warn},
         $xl::s{h_col_log_warn},
         'color',
-       '0.0.0',
-       '#af0000',
+        '0.0.0',
+        '#af0000',
         undef,
     ],
 );
@@ -924,37 +1035,37 @@ sub new_colours_page() {
         'mainwin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     main_y => [
         'mainwin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     main_w => [
         'mainwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '779',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '779',
+        undef,
     ],
     main_h => [
         'mainwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '568',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '568',
+        undef,
     ],
     main_mx => [
         'mainwin_maximised',
@@ -978,43 +1089,43 @@ sub new_colours_page() {
         'main_messagewin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '256',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '256',
+        undef,
     ],
     msgs_y => [
         'main_messagewin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '210',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '210',
+        undef,
     ],
     msgs_w => [
         'messagewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     msgs_h => [
         'messagewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '540',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '540',
+        undef,
     ],
     send_w => [
         'sendwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '460',
         undef,
@@ -1023,7 +1134,7 @@ sub new_colours_page() {
         'sendwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '-1',
         undef,
@@ -1032,7 +1143,7 @@ sub new_colours_page() {
         'receivewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '460',
         undef,
@@ -1041,7 +1152,7 @@ sub new_colours_page() {
         'receivewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
+        'int,0,3000', # 0 pixels - 3000 pixels
         '0.0.0',
         '-1',
         undef,
@@ -1050,408 +1161,410 @@ sub new_colours_page() {
         'folderwin_x',
         $xl::s{l_win_x},
         $xl::s{h_win_x},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     fold_y => [
         'folderwin_y',
         $xl::s{l_win_y},
         $xl::s{h_win_y},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '16',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '16',
+        undef,
     ],
     fold_w => [
         'folderitemwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     fold_h => [
         'folderitemwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fsel_w => [
         'folderselwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     fsel_h => [
         'folderselwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     sour_w => [
         'sourcewin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     sour_h => [
         'sourcewin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     addr_w => [
         'addressbookwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     addr_h => [
         'addressbookwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     adep_w => [
         'addressbookeditpersonwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '640',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '640',
+        undef,
     ],
     adep_h => [
         'addressbookeditpersonwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '320',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '320',
+        undef,
     ],
     adeg_w => [
         'addressbookeditgroupwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '580',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '580',
+        undef,
     ],
     adeg_h => [
         'addressbookeditgroupwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '340',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '340',
+        undef,
     ],
     adda_w => [
         'addressaddwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     adda_h => [
         'addressaddwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     addf_w => [
         'addressbook_folderselwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '300',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '300',
+        undef,
     ],
     addf_h => [
         'addressbook_folderselwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acce_w => [
         'editaccountwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     acce_h => [
         'editaccountwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acco_w => [
         'accountswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     acco_h => [
         'accountswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     filt_w => [
         'filteringwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '500',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '500',
+        undef,
     ],
     filt_h => [
         'filteringwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fila_w => [
         'filteringactionwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '490',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '490',
+        undef,
     ],
     fila_h => [
         'filteringactionwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     fild_w => [
         'filtering_debugwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     fild_h => [
         'filtering_debugwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     matc_w => [
         'matcherwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     matc_h => [
         'matcherwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     pref_w => [
         'prefswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     pref_h => [
         'prefswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     temp_w => [
         'templateswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '480',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '480',
+        undef,
     ],
     temp_h => [
         'templateswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     acti_w => [
         'actionswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '486',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '486',
+        undef,
     ],
     acti_h => [
         'actionswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     tags_w => [
         'tagswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '486',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '486',
+        undef,
     ],
     tags_h => [
         'tagswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     plug_w => [
         'pluginswin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     plug_h => [
         'pluginswin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     logw_w => [
         'logwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '520',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '520',
+        undef,
     ],
     logw_h => [
         'logwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
     prin_w => [
         'print_previewwin_width',
         $xl::s{l_win_w},
         $xl::s{h_win_w},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '600',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '600',
+        undef,
     ],
     prin_h => [
         'print_previewwin_height',
         $xl::s{l_win_h},
         $xl::s{h_win_h},
-       'int,0,3000', # 0 pixels - 3000 pixels
-       '0.0.0',
-       '-1',
-       undef,
+        'int,0,3000', # 0 pixels - 3000 pixels
+        '0.0.0',
+        '-1',
+        undef,
     ],
 );
 
 sub new_winpos_subpage_main() {
     return &new_subpage_frame (
-               &new_vbox_pack (
-                   &new_text_box_for_int (\%pr::win, 'main_x'), 
-                   &new_text_box_for_int (\%pr::win, 'main_y'), 
-                   &new_text_box_for_int (\%pr::win, 'main_w'), 
-                   &new_text_box_for_int (\%pr::win, 'main_h'), 
+               &new_vbox_pack_compact (
+                   &new_vbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'main_x'), 
+                       &new_text_box_for_int (\%pr::win, 'main_y')), 
                    &new_hbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'main_w'), 
+                       &new_text_box_for_int (\%pr::win, 'main_h')), 
+                   &new_vbox_pack (
                        &new_check_button_for (\%pr::win, 'main_fs'), 
                        &new_check_button_for (\%pr::win, 'main_mx'))),
                _('Main window')
@@ -1460,11 +1573,13 @@ sub new_winpos_subpage_main() {
 
 sub new_winpos_subpage_msgs() {
     return &new_subpage_frame (
-               &new_vbox_pack (
-                   &new_text_box_for_int (\%pr::win, 'msgs_x'),
-                   &new_text_box_for_int (\%pr::win, 'msgs_y'),
-                   &new_text_box_for_int (\%pr::win, 'msgs_w'),
-                   &new_text_box_for_int (\%pr::win, 'msgs_h')),
+               &new_vbox_pack_compact (
+                   &new_vbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'msgs_x'),
+                       &new_text_box_for_int (\%pr::win, 'msgs_y')),
+                   &new_hbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'msgs_w'),
+                       &new_text_box_for_int (\%pr::win, 'msgs_h'))),
                _('Message window')
            );
 }
@@ -1472,16 +1587,14 @@ sub new_winpos_subpage_msgs() {
 sub new_winpos_subpage_sendrecv() {
     return &new_vbox_pack (
                &new_subpage_frame (
-                   &new_vbox_pack (
-                       &new_hbox_pack (
-                           &new_text_box_for_int (\%pr::win, 'send_w'),
-                           &new_text_box_for_int (\%pr::win, 'send_h'))),
+                   &new_hbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'send_w'),
+                       &new_text_box_for_int (\%pr::win, 'send_h')),
                    _('Send window'), 'not-packed'),
                &new_subpage_frame (
-                   &new_vbox_pack (
-                       &new_hbox_pack (
-                           &new_text_box_for_int (\%pr::win, 'recv_w'),
-                           &new_text_box_for_int (\%pr::win, 'recv_h'))),
+                   &new_hbox_pack (
+                       &new_text_box_for_int (\%pr::win, 'recv_w'),
+                       &new_text_box_for_int (\%pr::win, 'recv_h')),
                    _('Receive window'), 'not-packed')
            );
 }
@@ -1489,14 +1602,16 @@ sub new_winpos_subpage_sendrecv() {
 sub new_winpos_subpage_fold() {
     return &new_vbox_pack (
                &new_subpage_frame (
-                   &new_vbox_pack (
-                       &new_text_box_for_int (\%pr::win, 'fold_x'), 
-                       &new_text_box_for_int (\%pr::win, 'fold_y'), 
-                       &new_text_box_for_int (\%pr::win, 'fold_w'), 
-                       &new_text_box_for_int (\%pr::win, 'fold_h')),
+                   &new_vbox_pack_compact (
+                       &new_vbox_pack (
+                            &new_text_box_for_int (\%pr::win, 'fold_x'), 
+                            &new_text_box_for_int (\%pr::win, 'fold_y')), 
+                       &new_hbox_pack (
+                           &new_text_box_for_int (\%pr::win, 'fold_w'), 
+                           &new_text_box_for_int (\%pr::win, 'fold_h'))),
                    _('Folder window'), 'not-packed'),
                &new_subpage_frame (
-                   &new_vbox_pack (
+                   &new_hbox_pack (
                        &new_text_box_for_int (\%pr::win, 'fsel_w'),
                        &new_text_box_for_int (\%pr::win, 'fsel_h')),
                    _('Folder selection window'), 'not-packed')
@@ -1506,34 +1621,29 @@ sub new_winpos_subpage_fold() {
 sub new_winpos_subpage_addrbook() {
     return &new_vbox_pack (
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'addr_w'),
-                               &new_text_box_for_int (\%pr::win, 'addr_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'addr_w'),
+                          &new_text_box_for_int (\%pr::win, 'addr_h')),
                      _('Addressbook main window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'adep_w'),
-                               &new_text_box_for_int (\%pr::win, 'adep_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'adep_w'),
+                          &new_text_box_for_int (\%pr::win, 'adep_h')),
                      _('Edit person window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'adeg_w'),
-                               &new_text_box_for_int (\%pr::win, 'adeg_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'adeg_w'),
+                          &new_text_box_for_int (\%pr::win, 'adeg_h')),
                      _('Edit group window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'adda_w'),
-                               &new_text_box_for_int (\%pr::win, 'adda_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'adda_w'),
+                          &new_text_box_for_int (\%pr::win, 'adda_h')),
                      _('Add address window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'addf_w'),
-                               &new_text_box_for_int (\%pr::win, 'addf_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'addf_w'),
+                          &new_text_box_for_int (\%pr::win, 'addf_h')),
                      _('Folder select window'), 'not-packed')
            );
 }
@@ -1541,16 +1651,14 @@ sub new_winpos_subpage_addrbook() {
 sub new_winpos_subpage_accounts() {
     return &new_vbox_pack (
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'acco_w'),
-                               &new_text_box_for_int (\%pr::win, 'acco_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'acco_w'),
+                          &new_text_box_for_int (\%pr::win, 'acco_h')),
                      _('Accounts window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'acce_w'),
-                               &new_text_box_for_int (\%pr::win, 'acce_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'acce_w'),
+                          &new_text_box_for_int (\%pr::win, 'acce_h')),
                      _('Edit account window'), 'not-packed')
            );
 }
@@ -1558,28 +1666,24 @@ sub new_winpos_subpage_accounts() {
 sub new_winpos_subpage_filtering() {
     return &new_vbox_pack (
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'filt_w'),
-                               &new_text_box_for_int (\%pr::win, 'filt_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'filt_w'),
+                          &new_text_box_for_int (\%pr::win, 'filt_h')),
                      _('Filtering window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'fila_w'),
-                               &new_text_box_for_int (\%pr::win, 'fila_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'fila_w'),
+                          &new_text_box_for_int (\%pr::win, 'fila_h')),
                      _('Filtering actions window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'fild_w'),
-                               &new_text_box_for_int (\%pr::win, 'fild_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'fild_w'),
+                          &new_text_box_for_int (\%pr::win, 'fild_h')),
                      _('Filtering debug window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'matc_w'),
-                               &new_text_box_for_int (\%pr::win, 'matc_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'matc_w'),
+                          &new_text_box_for_int (\%pr::win, 'matc_h')),
                      _('Matcher window'), 'not-packed')
            );
 }
@@ -1587,34 +1691,29 @@ sub new_winpos_subpage_filtering() {
 sub new_winpos_subpage_prefs() {
     return &new_vbox_pack (
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'pref_w'),
-                               &new_text_box_for_int (\%pr::win, 'pref_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'pref_w'),
+                          &new_text_box_for_int (\%pr::win, 'pref_h')),
                      _('Preferences window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'temp_w'),
-                               &new_text_box_for_int (\%pr::win, 'temp_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'temp_w'),
+                          &new_text_box_for_int (\%pr::win, 'temp_h')),
                      _('Templates window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'acti_w'),
-                               &new_text_box_for_int (\%pr::win, 'acti_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'acti_w'),
+                          &new_text_box_for_int (\%pr::win, 'acti_h')),
                      _('Actions window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'tags_w'),
-                               &new_text_box_for_int (\%pr::win, 'tags_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'tags_w'),
+                          &new_text_box_for_int (\%pr::win, 'tags_h')),
                      _('Tags window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'plug_w'),
-                               &new_text_box_for_int (\%pr::win, 'plug_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'plug_w'),
+                          &new_text_box_for_int (\%pr::win, 'plug_h')),
                      _('Plugins window'), 'not-packed')
            );
 }
@@ -1622,19 +1721,17 @@ sub new_winpos_subpage_prefs() {
 sub new_winpos_subpage_misc() {
     return &new_vbox_pack (
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'logw_w'),
-                               &new_text_box_for_int (\%pr::win, 'logw_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'logw_w'),
+                          &new_text_box_for_int (\%pr::win, 'logw_h')),
                      _('Log window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
-                          &new_hbox_pack (
-                               &new_text_box_for_int (\%pr::win, 'prin_w'),
-                               &new_text_box_for_int (\%pr::win, 'prin_h'))),
+                     &new_hbox_pack (
+                          &new_text_box_for_int (\%pr::win, 'prin_w'),
+                          &new_text_box_for_int (\%pr::win, 'prin_h')),
                      _('Print preview window'), 'not-packed'),
                 &new_subpage_frame (
-                     &new_vbox_pack (
+                     &new_hbox_pack (
                           &new_text_box_for_int (\%pr::win, 'sour_w'),
                           &new_text_box_for_int (\%pr::win, 'sour_h')),
                      _('View source window'), 'not-packed')
@@ -1665,14 +1762,14 @@ sub print_version() {
     if ($Glib::VERSION >= 1.040) {
         print _(", built for ") . join(".", Glib->GET_VERSION_INFO) 
               . _(", running with ") . join(".", &Glib::major_version, 
-                 &Glib::minor_version, &Glib::micro_version);
+              &Glib::minor_version, &Glib::micro_version);
     }
     print "\n";
     print "Perl-GTK2 " . $Gtk2::VERSION;
     if ($Gtk2::VERSION >= 1.040) {
         print _(", built for ") . join(".", Gtk2->GET_VERSION_INFO)
-             . _(", running with ") . join(".", &Gtk2::major_version, 
-                 &Gtk2::minor_version, &Gtk2::micro_version);
+              . _(", running with ") . join(".", &Gtk2::major_version, 
+              &Gtk2::minor_version, &Gtk2::micro_version);
     }
     print "\n";
     my $clawsver = ($CLAWSV eq "") ? 
@@ -1712,51 +1809,51 @@ sub parse_command_line() {
     while (defined($ARGV[$arg])) {
         for ($ARGV[$arg]) {
             /--help/ && do { 
-               &print_help; 
+                &print_help; 
                 return FALSE;
-           };
+            };
             /--version/ && do { 
-               &print_version; 
+                &print_version; 
                 return FALSE;
-           };
-           /--verbose/ && do {
-               $VERBOSE = TRUE;
-               last;
-           };
-           /--use-claws-version/ && do {
-               ++$arg;
-               &command_line_fatal ("required version")
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal ("required a dotted numeric value")
-                   unless ($ARGV[$arg] =~ /[\d\.]+/);
-               $CLAWSV = $ARGV[$arg];
-               last;
-           };
-           /--alternate-config-dir/ && do {
-               ++$arg;
-               &command_line_fatal ($xl::s{e_requireddir})
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal ($xl::s{e_notadir})
-                   unless -d $ARGV[$arg];
-               $CONFIGDIR = $ARGV[$arg];
-               $CONFIGDIR .= "/" 
-                   unless ($CONFIGDIR =~ /.*\/$/);
-               $ALTCONFIGDIR = TRUE;
-               last;
-           };
-           /--clawsrc/ && do {
-               ++$arg;
-               &command_line_fatal($xl::s{e_requiredfile}) 
-                   unless defined($ARGV[$arg]);
-               &command_line_fatal($xl::s{e_notafile}) 
-                   unless -f $ARGV[$arg];
-               &set_rc_filename ($ARGV[$arg]);
-               last;
-           };
-           /.*/ && &command_line_fatal (
-                       _("unknown option '{opt}'.\n", opt => $ARGV[$arg]));
-       }
-       ++$arg;
+            };
+            /--verbose/ && do {
+                $VERBOSE = TRUE;
+                last;
+            };
+            /--use-claws-version/ && do {
+                ++$arg;
+                &command_line_fatal ("required version")
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal ("required a dotted numeric value")
+                    unless ($ARGV[$arg] =~ /[\d\.]+/);
+                $CLAWSV = $ARGV[$arg];
+                last;
+            };
+            /--alternate-config-dir/ && do {
+                ++$arg;
+                &command_line_fatal ($xl::s{e_requireddir})
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal ($xl::s{e_notadir})
+                    unless -d $ARGV[$arg];
+                $CONFIGDIR = $ARGV[$arg];
+                $CONFIGDIR .= "/" 
+                    unless ($CONFIGDIR =~ /.*\/$/);
+                $ALTCONFIGDIR = TRUE;
+                last;
+            };
+            /--clawsrc/ && do {
+                ++$arg;
+                &command_line_fatal($xl::s{e_requiredfile}) 
+                    unless defined($ARGV[$arg]);
+                &command_line_fatal($xl::s{e_notafile}) 
+                    unless -f $ARGV[$arg];
+                &set_rc_filename ($ARGV[$arg]);
+                last;
+            };
+            /.*/ && &command_line_fatal (
+                _("unknown option '{opt}'.\n", opt => $ARGV[$arg]));
+        }
+        ++$arg;
     }
     # eveything continues...
     return TRUE;
@@ -1766,7 +1863,7 @@ sub parse_command_line() {
 sub init_hidden_preferences() {
     foreach my $hash (\%pr::beh, \%pr::col, \%pr::gui, \%pr::oth, \%pr::win) {
         foreach my $key (keys %$hash) { 
-           $HPVALUE{${$hash}{$key}[NAME]} = $PREFS{${$hash}{$key}[NAME]};
+            $HPVALUE{${$hash}{$key}[NAME]} = $PREFS{${$hash}{$key}[NAME]};
         }
     }
     return TRUE;
@@ -1780,9 +1877,9 @@ sub load_preferences() {
     return FALSE unless &check_claws_not_running;
     open (RCF, "<$rc");
     while (<RCF>) {
-       chomp;
-       if (/^([8a-z_]+)=(.*)$/) {
-           $PREFS{$1} = "$2";
+        chomp;
+        if (/^([8a-z_]+)=(.*)$/) {
+            $PREFS{$1} = "$2";
         }
     }
     close (RCF);
@@ -1800,18 +1897,18 @@ sub save_preferences() {
     open (RCF, ">$rc");
     open (RCB, "<$rcbak");
     while (<RCB>) {
-       chomp;
-       if (/^([8a-z_]+)=(.*)$/) {
-           if (defined($HPVALUE{$1})) {
-               print RCF $1 . "=" . $HPVALUE{$1} . "\n";
-           }
-           else {
-               print RCF $_ . "\n";
-           }
+        chomp;
+        if (/^([8a-z_]+)=(.*)$/) {
+            if (defined($HPVALUE{$1})) {
+                print RCF $1 . "=" . $HPVALUE{$1} . "\n";
+            }
+            else {
+                print RCF $_ . "\n";
+            }
+        }
+        else {
+            print RCF $_ . "\n";
         }
-       else {
-           print RCF $_ . "\n";
-       }
     }
     close (RCB);
     close (RCF);
@@ -1850,19 +1947,19 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see &lt;http://www.gnu.org/licenses/&gt;.";
-    my $year = "2007-2009";
+    my $year = "2007-2012";
     my $holder = "Ricardo Mones &lt;ricardo\@mones.org&gt;";
     my $url = "http://www.claws-mail.org/clawsker";
 
     my $dialog = Gtk2::MessageDialog->new_with_markup ($parent, 
                     [qw/modal destroy-with-parent/], 
-                   'info', 'close', 
-                   "<span size=\"x-large\" weight=\"bold\">$title</span>\n"
-                   . "<span size=\"large\">$vers</span>\n\n"
-                   . "<span color=\"blue\" size=\"large\">$url</span>\n\n"
-                   . "<span>Copyright $year by $holder</span>\n\n"
-                   . "<span size=\"large\">$lic</span>\n\n"
-                   . "<span size=\"small\">$license</span>");
+                    'info', 'close', 
+                    "<span size=\"x-large\" weight=\"bold\">$title</span>\n"
+                    . "<span size=\"large\">$vers</span>\n\n"
+                    . "<span color=\"blue\" size=\"large\">$url</span>\n\n"
+                    . "<span>Copyright $year by $holder</span>\n\n"
+                    . "<span size=\"large\">$lic</span>\n\n"
+                    . "<span size=\"small\">$license</span>");
     $dialog->set_title ($xl::s{about});
     #
     return $dialog;