- Re-designed User Preferences interface

4 files changed, 719 insertions, 485 deletions

diff --git a/program/js/app.js b/program/js/app.js
index 17a3e0ebc..e7c528962 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -237,6 +237,9 @@ function rcube_webmail()
             this.enable_command('savedraft', true);
             
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
+
+          // init message compose form
+          this.init_messageform();
           }
 
         if (this.env.messagecount)
@@ -247,10 +250,6 @@ function rcube_webmail()
 
         this.set_page_buttons();
 
-        // init message compose form
-        if (this.env.action=='compose')
-          this.init_messageform();
-
         // show printing dialog
         if (this.env.action=='print')
           window.print();
@@ -325,15 +324,14 @@ function rcube_webmail()
       case 'settings':
         this.enable_command('preferences', 'identities', 'save', 'folders', true);
         
-        if (this.env.action=='identities' || this.env.action=='edit-identity' || this.env.action=='add-identity') {
+        if (this.env.action=='identities') {
           this.enable_command('add', this.env.identities_level < 2);
-          this.enable_command('delete', 'edit', true);
-        }
-
-        if (this.env.action=='edit-identity' || this.env.action=='add-identity')
-          this.enable_command('save', true);
-          
-        if (this.env.action=='folders')
+          }
+	else if (this.env.action=='edit-identity' || this.env.action=='add-identity') {
+          this.enable_command('add', this.env.identities_level < 2);
+          this.enable_command('save', 'delete', 'edit', true);
+          }
+        else if (this.env.action=='folders')
           this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
 
         if (this.gui_objects.identitieslist)
@@ -346,8 +344,14 @@ function rcube_webmail()
           if (this.env.iid)
             this.identity_list.highlight_row(this.env.iid);
           }
-
-        if (this.gui_objects.subscriptionlist)
+        else if (this.gui_objects.sectionslist)
+          {
+          this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:false});
+          this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
+          this.sections_list.init();
+          this.sections_list.focus();
+	  }
+        else if (this.gui_objects.subscriptionlist)
           this.init_subscription_list();
 
         break;
@@ -2941,6 +2945,27 @@ function rcube_webmail()
     this.subscription_list.init();
     }
 
+  // preferences section select and load options frame
+  this.section_select = function(list)
+    {
+    var id = list.get_single_selection()
+    
+    if (id) {
+      var add_url = '';
+      var target = window;
+      this.set_busy(true);
+
+      if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
+        add_url = '&_framed=1';
+        target = window.frames[this.env.contentframe];
+        }
+
+      target.location.href = this.env.comm_path+'&_action=edit-prefs&_section='+id+add_url;
+      }
+
+    return true;
+    };
+
   this.identity_select = function(list)
     {
     var id;
diff --git a/program/steps/settings/edit_prefs.inc b/program/steps/settings/edit_prefs.inc
new file mode 100644
index 000000000..9fcbc426b
--- /dev/null
+++ b/program/steps/settings/edit_prefs.inc
@@ -0,0 +1,521 @@
+<?php
+
+/*
+ +-----------------------------------------------------------------------+
+ | program/steps/settings/edit_prefs.inc                                 |
+ |                                                                       |
+ | This file is part of the RoundCube Webmail client                     |
+ | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
+ | Licensed under the GNU GPL                                            |
+ |                                                                       |
+ | PURPOSE:                                                              |
+ |   Provide functionality for user's settings & preferences             |
+ |                                                                       |
+ +-----------------------------------------------------------------------+
+ | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ +-----------------------------------------------------------------------+
+
+ $Id: func.inc 2822 2009-07-31 09:07:54Z alec $
+
+*/
+
+if (!$OUTPUT->ajax_call)
+  $OUTPUT->set_pagetitle(rcube_label('preferences'));
+
+
+$CURR_SECTION = get_input_value('_section', RCUBE_INPUT_GPC);
+
+function rcmail_user_prefs_form($attrib)
+{
+  global $RCMAIL, $CURR_SECTION;
+
+  // add some labels to client
+  $RCMAIL->output->add_label('nopagesizewarning');
+
+  unset($attrib['form']);
+  
+  list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs', null,
+    array('name' => '_section', 'value' => $CURR_SECTION));
+
+  $out = $form_start;
+  
+  $out .= rcmail_user_prefs_block($CURR_SECTION, $attrib);
+  
+  return $out . $form_end;
+}
+
+function rcmail_user_prefs_block($part, $attrib)
+{
+  global $RCMAIL;
+
+  $config = $RCMAIL->config->all();
+  $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
+  
+  $blocks = array();
+  
+  switch ($part)
+  {
+  // General UI settings
+  case 'general':
+  
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+      'list' => array('name' => Q(rcube_label('listoptions'))),
+    );
+    
+    // language selection
+    if (!isset($no_override['language'])) {
+      $a_lang = $RCMAIL->list_languages();
+      asort($a_lang);
+
+      $field_id = 'rcmfd_lang';
+      $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
+      $select_lang->add(array_values($a_lang), array_keys($a_lang));
+
+      $blocks['main']['options']['language'] = array(
+        'title' => html::label($field_id, Q(rcube_label('language'))),
+        'content' => $select_lang->show($RCMAIL->user->language),
+      );
+    }
+
+    // show page size selection
+    if (!isset($no_override['timezone'])) {
+      $field_id = 'rcmfd_timezone';
+      $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
+      $select_timezone->add(rcube_label('autodetect'), 'auto');
+      $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
+      $select_timezone->add('(GMT -10:00) Hawaii', '-10');
+      $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
+      $select_timezone->add('(GMT -9:00) Alaska', '-9');
+      $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
+      $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
+      $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
+      $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
+      $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
+      $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
+      $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
+      $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+      $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
+      $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
+      $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
+      $select_timezone->add('(GMT +1:00) Central European Time', '1');
+      $select_timezone->add('(GMT +2:00) EET: Tallinn, Helsinki, Kaliningrad, South Africa', '2');
+      $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
+      $select_timezone->add('(GMT +3:30) Tehran', '3.5');
+      $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
+      $select_timezone->add('(GMT +4:30) Kabul', '4.5');
+      $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
+      $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
+      $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
+      $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
+      $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
+      $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
+      $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
+      $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
+      $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
+      $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
+      $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
+      $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
+      $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
+      $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
+      $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
+      $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
+      $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
+      $select_timezone->add('(GMT +14:00) Kiribati', '14');
+
+      $blocks['main']['options']['timezone'] = array(
+        'title' => html::label($field_id, Q(rcube_label('timezone'))),
+        'content' => $select_timezone->show((string)$config['timezone']),
+      );
+    }
+
+    // daylight savings
+    if (!isset($no_override['dst_active'])) {
+      $field_id = 'rcmfd_dst';
+      $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
+
+      $blocks['main']['options']['dstactive'] = array(
+        'title' => html::label($field_id, Q(rcube_label('dstactive'))),
+        'content' => $input_dst->show($config['dst_active']),
+      );
+    }
+
+    // MM: Show checkbox for toggling 'pretty dates' 
+    if (!isset($no_override['prettydate'])) {
+      $field_id = 'rcmfd_prettydate';
+      $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['prettydate'] = array(
+        'title' => html::label($field_id, Q(rcube_label('prettydate'))),
+        'content' => $input_prettydate->show($config['prettydate']?1:0),
+      );
+    }
+
+    // show page size selection
+    if (!isset($no_override['pagesize'])) {
+      $field_id = 'rcmfd_pgsize';
+      $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+
+      $blocks['list']['options']['pagesize'] = array(
+        'title' => html::label($field_id, Q(rcube_label('pagesize'))),
+        'content' => $input_pagesize->show($config['pagesize']),
+      );
+    }
+
+    // show drop-down for available skins
+    if (!isset($no_override['skin'])) {
+      $skins = rcmail_get_skins();
+
+      if (count($skins) > 1) {
+        $field_id = 'rcmfd_skin';
+        $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
+
+        foreach($skins as $skin)
+          $input_skin->add($skin, $skin);
+
+        $blocks['main']['options']['skin'] = array(
+          'title' => html::label($field_id, Q(rcube_label('skin'))),
+          'content' => $input_skin->show($config['skin']),
+        );
+      }
+    }
+    
+    break;
+
+  // Mailbox view (mail screen)
+  case 'mailbox':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+      'new_message' => array('name' => Q(rcube_label('newmessage'))),
+    );
+
+    // show config parameter for preview pane
+    if (!isset($no_override['preview_pane'])) {
+      $field_id = 'rcmfd_preview';
+      $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['preview_pane'] = array(
+        'title' => html::label($field_id, Q(rcube_label('previewpane'))),
+        'content' => $input_preview->show($config['preview_pane']?1:0),
+      );
+    }
+
+    if (!isset($no_override['mdn_requests'])) {
+      $field_id = 'rcmfd_mdn_requests';
+      $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
+      $select_mdn_requests->add(rcube_label('askuser'), 0);
+      $select_mdn_requests->add(rcube_label('autosend'), 1);
+      $select_mdn_requests->add(rcube_label('ignore'), 2);
+
+      $blocks['main']['options']['mdn_requests'] = array(
+        'title' => html::label($field_id, Q(rcube_label('mdnrequests'))),
+        'content' => $select_mdn_requests->show($config['mdn_requests']),
+      );
+    }
+
+    if (!isset($no_override['focus_on_new_message'])) {
+      $field_id = 'rcmfd_focus_on_new_message';
+      $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
+
+      $blocks['new_message']['options']['focus_on_new_message'] = array(
+        'title' => html::label($field_id, Q(rcube_label('focusonnewmessage'))),
+        'content' => $input_focus_on_new_message->show($config['focus_on_new_message']?1:0),
+      );
+    }
+
+    if (!isset($no_override['keep_alive'])) {
+      $field_id = 'rcmfd_keep_alive';
+      $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));
+
+      foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
+        if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60)
+            && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
+          $select_keep_alive->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min);
+        }
+
+      $blocks['new_message']['options']['keep_alive'] = array(
+        'title' => html::label($field_id, Q(rcube_label('keepalive'))),
+        'content' => $select_keep_alive->show($config['keep_alive']/60),
+      );
+    }
+
+    if (!isset($no_override['check_all_folders'])) {
+      $field_id = 'rcmfd_check_all_folders';
+      $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
+
+      $blocks['new_message']['options']['check_all_folders'] = array(
+        'title' => html::label($field_id, Q(rcube_label('checkallfolders'))),
+        'content' => $input_check_all->show($config['check_all_folders']?1:0),
+      );
+    }
+
+    break;
+
+  // Message viewing
+  case 'mailview':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+    );
+
+    // show checkbox for HTML/plaintext messages
+    if (!isset($no_override['prefer_html'])) {
+      $field_id = 'rcmfd_htmlmsg';
+      $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
+        'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));
+
+      $blocks['main']['options']['prefer_html'] = array(
+        'title' => html::label($field_id, Q(rcube_label('preferhtml'))),
+        'content' => $input_preferhtml->show($config['prefer_html']?1:0),
+      );
+    }
+
+    if (!isset($no_override['show_images'])) {
+      $field_id = 'rcmfd_show_images';
+      $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
+      $input_show_images->add(rcube_label('never'), 0);
+      $input_show_images->add(rcube_label('fromknownsenders'), 1);
+      $input_show_images->add(rcube_label('always'), 2);
+
+      $blocks['main']['options']['show_images'] = array(
+        'title' => html::label($field_id, Q(rcube_label('showremoteimages'))),
+        'content' => $input_show_images->show($config['show_images']),
+      );
+    }
+
+    if (!isset($no_override['inline_images'])) {
+      $field_id = 'rcmfd_inline_images';
+      $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['inline_images'] = array(
+        'title' => html::label($field_id, Q(rcube_label('showinlineimages'))),
+        'content' => $input_inline_images->show($config['inline_images']?1:0),
+      );
+    }
+
+    // "display after delete" checkbox
+    if (!isset($no_override['display_next'])) {
+      $field_id = 'rcmfd_displaynext';
+      $input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['display_next'] = array(
+        'title' => html::label($field_id, Q(rcube_label('displaynext'))),
+        'content' => $input_displaynext->show($config['display_next']?1:0),
+      );
+    }
+
+    break;
+
+  // Mail composition
+  case 'compose':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+    );
+
+    // Show checkbox for HTML Editor
+    if (!isset($no_override['htmleditor'])) {
+      $field_id = 'rcmfd_htmleditor';
+      $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['htmleditor'] = array(
+        'title' => html::label($field_id, Q(rcube_label('htmleditor'))),
+        'content' => $input_htmleditor->show($config['htmleditor']?1:0),
+      );
+    }
+
+    if (!isset($no_override['draft_autosave'])) {
+      $field_id = 'rcmfd_autosave';
+      $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
+      $select_autosave->add(rcube_label('never'), 0);
+      foreach (array(1, 3, 5, 10) as $i => $min)
+        $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
+
+      $blocks['main']['options']['draft_autosave'] = array(
+        'title' => html::label($field_id, Q(rcube_label('autosavedraft'))),
+        'content' => $select_autosave->show($config['draft_autosave']),
+      );
+    }
+
+    if (!isset($no_override['mime_param_folding'])) {
+      $field_id = 'rcmfd_param_folding';
+      $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
+      $select_param_folding->add(rcube_label('2231folding'), 0);
+      $select_param_folding->add(rcube_label('miscfolding'), 1);
+      $select_param_folding->add(rcube_label('2047folding'), 2);
+
+      $blocks['main']['options']['mime_param_folding'] = array(
+	'advanced' => true,
+        'title' => html::label($field_id, Q(rcube_label('mimeparamfolding'))),
+        'content' => $select_param_folding->show($config['mime_param_folding']),
+      );
+    }
+
+    break;
+
+  // Special IMAP folders
+  case 'folders':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+    );
+
+    // Configure special folders
+    if (!isset($no_override['default_imap_folders'])) {
+      $RCMAIL->imap_init(true);
+      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
+
+      if (!isset($no_override['drafts_mbox']))
+        $blocks['main']['options']['drafts_mbox'] = array(
+          'title' => Q(rcube_label('drafts')),
+          'content' => $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox")),
+        );
+
+      if (!isset($no_override['sent_mbox']))
+        $blocks['main']['options']['sent_mbox'] = array(
+          'title' => Q(rcube_label('sent')),
+          'content' => $select->show($config['sent_mbox'], array('name' => "_sent_mbox")),
+	);
+
+      if (!isset($no_override['junk_mbox']))
+        $blocks['main']['options']['junk_mbox'] = array(
+          'title' => Q(rcube_label('junk')),
+          'content' => $select->show($config['junk_mbox'], array('name' => "_junk_mbox")),
+	);
+
+      if (!isset($no_override['trash_mbox']))
+        $blocks['main']['options']['trash_mbox'] = array(
+          'title' => Q(rcube_label('trash')),
+          'content' => $select->show($config['trash_mbox'], array('name' => "_trash_mbox")),
+        );
+    }
+    break;
+
+  // Server settings
+  case 'server':
+
+    $blocks = array(
+      'main' => array('name' => Q(rcube_label('mainoptions'))),
+      'maintenance' => array('name' => Q(rcube_label('maintenance'))),
+    );
+
+    if (!isset($no_override['read_when_deleted'])) {
+      $field_id = 'rcmfd_read_deleted';
+      $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['read_when_deleted'] = array(
+        'title' => html::label($field_id, Q(rcube_label('readwhendeleted'))),
+        'content' => $input_readdeleted->show($config['read_when_deleted']?1:0),
+      );
+    }
+
+    if (!isset($no_override['flag_for_deletion'])) {
+      $field_id = 'rcmfd_flag_for_deletion';
+      $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['flag_for_deletion'] = array(
+        'title' => html::label($field_id, Q(rcube_label('flagfordeletion'))),
+        'content' => $input_flagfordeletion->show($config['flag_for_deletion']?1:0),
+      );
+    }
+
+    // don't show deleted messages
+    if (!isset($no_override['skip_deleted'])) {
+      $field_id = 'rcmfd_skip_deleted';
+      $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
+
+      $blocks['main']['options']['skip_deleted'] = array(
+        'title' => html::label($field_id, Q(rcube_label('skipdeleted'))),
+        'content' => $input_purge->show($config['skip_deleted']?1:0),
+      );
+    }
+
+    // Trash purging on logout
+    if (!isset($no_override['logout_purge'])) {
+      $field_id = 'rcmfd_logout_purge';
+      $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
+
+      $blocks['maintenance']['options']['logout_purge'] = array(
+        'title' => html::label($field_id, Q(rcube_label('logoutclear'))),
+        'content' => $input_purge->show($config['logout_purge']?1:0),
+      );
+    }
+
+    // INBOX compacting on logout
+    if (!isset($no_override['logout_expunge'])) {
+      $field_id = 'rcmfd_logout_expunge';
+      $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+
+      $blocks['maintenance']['options']['logout_expunge'] = array(
+        'title' => html::label($field_id, Q(rcube_label('logoutcompact'))),
+        'content' => $input_expunge->show($config['logout_expunge']?1:0),
+      );
+    }
+
+    break;
+  }
+
+  $data = $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'blocks' => $blocks));
+
+  // create output
+  foreach ($data['blocks'] as $idx => $block) {
+    if ($block['options']) {
+      $table = new html_table(array('cols' => 2));
+
+      foreach ($block['options'] as $option) {
+	if ($option['advanced'])
+          $table->set_row_attribs('advanced');
+	
+        $table->add('title', $option['title']);
+	$table->add(null, $option['content']);
+      }
+
+      $out .= html::tag('fieldset', null, html::tag('legend', null, $block['name']) . $table->show($attrib));
+    }
+  }
+
+  return $out;
+}
+
+
+function rcmail_get_skins()
+{
+  $path = 'skins';
+  $skins = array();
+
+  $dir = opendir($path);
+  
+  if (!$dir)
+	return false;
+  
+  while (($file = readdir($dir)) !== false)
+  {
+    $filename = $path.'/'.$file;
+    if (is_dir($filename) && is_readable($filename) 
+	&& !in_array($file, array('.', '..', '.svn')))
+      $skins[] = $file;
+  }
+
+  closedir($dir);
+
+  return $skins;
+}
+
+function rcmail_prefs_section_name()
+{
+  global $SECTIONS, $CURR_SECTION;
+  
+  return $SECTIONS[$CURR_SECTION]['section'];
+}
+
+
+// register UI objects
+$OUTPUT->add_handlers(array(
+  'userprefs' => 'rcmail_user_prefs_form',
+  'sectionname' => 'rcmail_prefs_section_name',
+));
+
+$OUTPUT->send('settingsedit');
+
+?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index f833c1a5c..11201781c 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -22,396 +22,53 @@
 if (!$OUTPUT->ajax_call)
   $OUTPUT->set_pagetitle(rcube_label('preferences'));
 
-function rcmail_user_prefs_form($attrib)
-{
-  global $RCMAIL;
+// define sections list
+$SECTIONS['general'] = array('id' => 'general', 'section' => rcube_label('uisettings'));
+$SECTIONS['mailbox'] = array('id' => 'mailbox', 'section' => rcube_label('mailboxview'));
+$SECTIONS['compose'] = array('id' => 'compose', 'section' => rcube_label('messagescomposition'));
+$SECTIONS['mailview'] = array('id' => 'mailview','section' => rcube_label('messagesdisplaying'));
+$SECTIONS['folders'] = array('id' => 'folders', 'section' => rcube_label('specialfolders'));
+$SECTIONS['server'] = array('id' => 'server',  'section' => rcube_label('serversettings'));
 
-  $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
-  $blocks = $attrib['parts'] ? preg_split('/[\s,;]+/', strip_quotes($attrib['parts'])) : array('general','mailbox','compose','mailview','folders','server');
 
-  // add some labels to client
-  $RCMAIL->output->add_label('nopagesizewarning');
-  
-  list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');
-  unset($attrib['form']);
-
-  $out = $form_start;
-  
-  foreach ($blocks as $part)
-    $out .= rcmail_user_prefs_block($part, $no_override, $attrib);
-  
-  return $out . $form_end;
-}
-
-function rcmail_user_prefs_block($part, $no_override, $attrib)
-{
-  global $RCMAIL;
-  $config = $RCMAIL->config->all();
-  
-  switch ($part)
+// similar function as /steps/settings/identities.inc::rcmail_identity_frame()
+function rcmail_preferences_frame($attrib)
   {
-  // General UI settings
-  case 'general':
-    $table = new html_table(array('cols' => 2));
-
-    // show language selection
-    if (!isset($no_override['language'])) {
-      $a_lang = $RCMAIL->list_languages();
-      asort($a_lang);
-
-      $field_id = 'rcmfd_lang';
-      $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
-      $select_lang->add(array_values($a_lang), array_keys($a_lang));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('language'))));
-      $table->add(null, $select_lang->show($RCMAIL->user->language));
-    }
-
-    // show page size selection
-    if (!isset($no_override['timezone'])) {
-      $field_id = 'rcmfd_timezone';
-      $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
-      $select_timezone->add(rcube_label('autodetect'), 'auto');
-      $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
-      $select_timezone->add('(GMT -10:00) Hawaii', '-10');
-      $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
-      $select_timezone->add('(GMT -9:00) Alaska', '-9');
-      $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
-      $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
-      $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
-      $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
-      $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
-      $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
-      $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
-      $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
-      $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
-      $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
-      $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
-      $select_timezone->add('(GMT +1:00) Central European Time', '1');
-      $select_timezone->add('(GMT +2:00) EET: Tallinn, Helsinki, Kaliningrad, South Africa', '2');
-      $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
-      $select_timezone->add('(GMT +3:30) Tehran', '3.5');
-      $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
-      $select_timezone->add('(GMT +4:30) Kabul', '4.5');
-      $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
-      $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
-      $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
-      $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
-      $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
-      $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
-      $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
-      $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
-      $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
-      $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
-      $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
-      $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
-      $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
-      $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
-      $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
-      $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
-      $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
-      $select_timezone->add('(GMT +14:00) Kiribati', '14');
-
-      $table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
-      $table->add(null, $select_timezone->show((string)$config['timezone']));
-    }
-
-    // daylight savings
-    if (!isset($no_override['dst_active'])) {
-      $field_id = 'rcmfd_dst';
-      $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
-      $table->add(null, $input_dst->show($config['dst_active']));
-    }
-
-    // MM: Show checkbox for toggling 'pretty dates' 
-    if (!isset($no_override['prettydate'])) {
-      $field_id = 'rcmfd_prettydate';
-      $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
-      $table->add(null, $input_prettydate->show($config['prettydate']?1:0));
-    }
-
-    // show page size selection
-    if (!isset($no_override['pagesize'])) {
-      $field_id = 'rcmfd_pgsize';
-      $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
-      $table->add(null, $input_pagesize->show($config['pagesize']));
-    }
-
-    // show drop-down for available skins
-    if (!isset($no_override['skin'])) {
-      $skins = rcmail_get_skins();
-
-      if (count($skins) > 1) {
-        $field_id = 'rcmfd_skin';
-        $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
-
-        foreach($skins as $skin)
-          $input_skin->add($skin, $skin);
-
-        $table->add('title', html::label($field_id, Q(rcube_label('skin'))));
-        $table->add(null, $input_skin->show($config['skin']));
-      }
-    }
-    
-    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
-    
-    if ($table->size())
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
-    break;
-
-
-  // Mailbox view (mail screen)
-  case 'mailbox':
-    $table = new html_table(array('cols' => 2));
-
-    if (!isset($no_override['focus_on_new_message'])) {
-      $field_id = 'rcmfd_focus_on_new_message';
-      $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
-      $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
-      $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
-    }
-
-    // show config parameter for preview pane
-    if (!isset($no_override['preview_pane'])) {
-      $field_id = 'rcmfd_preview';
-      $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('previewpane'))));
-      $table->add(null, $input_preview->show($config['preview_pane']?1:0));
-    }
-
-    if (!isset($no_override['mdn_requests'])) {
-      $field_id = 'rcmfd_mdn_requests';
-      $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
-      $select_mdn_requests->add(rcube_label('askuser'), 0);
-      $select_mdn_requests->add(rcube_label('autosend'), 1);
-      $select_mdn_requests->add(rcube_label('ignore'), 2);
-
-      $table->add('title', html::label($field_id, Q(rcube_label('mdnrequests'))));
-      $table->add(null, $select_mdn_requests->show($config['mdn_requests']));
-    }
-
-    if (!isset($no_override['keep_alive'])) {
-      $field_id = 'rcmfd_keep_alive';
-      $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));
-
-      foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
-        if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60)
-            && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
-          $select_keep_alive->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min);
-        }
-
-      $table->add('title', html::label($field_id, Q(rcube_label('keepalive'))));
-      $table->add(null, $select_keep_alive->show($config['keep_alive']/60));
-    }
-
-    if (!isset($no_override['check_all_folders'])) {
-      $field_id = 'rcmfd_check_all_folders';
-      $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
-      $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders'))));
-      $table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
-    }
-
-    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
-
-    if ($table->size())
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib));
-    break;
-
-
-  // Message viewing
-  case 'mailview':
-    $table = new html_table(array('cols' => 2));
-
-    // show checkbox for HTML/plaintext messages
-    if (!isset($no_override['prefer_html'])) {
-      $field_id = 'rcmfd_htmlmsg';
-      $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
-        'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('preferhtml'))));
-      $table->add(null, $input_preferhtml->show($config['prefer_html']?1:0));
-    }
-
-    if (!isset($no_override['show_images'])) {
-      $field_id = 'rcmfd_show_images';
-      $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
-      $input_show_images->add(rcube_label('never'), 0);
-      $input_show_images->add(rcube_label('fromknownsenders'), 1);
-      $input_show_images->add(rcube_label('always'), 2);
-
-      $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages'))));
-      $table->add(null, $input_show_images->show($config['show_images']));
-    }
-
-    if (!isset($no_override['inline_images'])) {
-      $field_id = 'rcmfd_inline_images';
-      $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('showinlineimages'))));
-      $table->add(null, $input_inline_images->show($config['inline_images']?1:0));
-    }
-
-    // "display after delete" checkbox
-    if (!isset($no_override['display_next'])) {
-      $field_id = 'rcmfd_displaynext';
-      $input_displaynext = new html_checkbox(array('name' => '_display_next', 'id' => $field_id, 'value' => 1));
+  global $OUTPUT;
 
-      $table->add('title', html::label($field_id, Q(rcube_label('displaynext'))));
-      $table->add(null, $input_displaynext->show($config['display_next']?1:0));
-    }
-
-    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
-
-    if ($table->size())
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib));
-    break;
-
-  // Mail composition
-  case 'compose':
-    $table = new html_table(array('cols' => 2));
-
-    // Show checkbox for HTML Editor
-    if (!isset($no_override['htmleditor'])) {
-      $field_id = 'rcmfd_htmleditor';
-      $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('htmleditor'))));
-      $table->add(null, $input_htmleditor->show($config['htmleditor']?1:0));
-    }
-
-    if (!isset($no_override['draft_autosave'])) {
-      $field_id = 'rcmfd_autosave';
-      $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
-      $select_autosave->add(rcube_label('never'), 0);
-      foreach (array(1, 3, 5, 10) as $i => $min)
-        $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
-
-      $table->add('title', html::label($field_id, Q(rcube_label('autosavedraft'))));
-      $table->add(null, $select_autosave->show($config['draft_autosave']));
-    }
-
-    if (!isset($no_override['mime_param_folding'])) {
-      $field_id = 'rcmfd_param_folding';
-      $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
-      $select_param_folding->add(rcube_label('2231folding'), 0);
-      $select_param_folding->add(rcube_label('miscfolding'), 1);
-      $select_param_folding->add(rcube_label('2047folding'), 2);
-
-      $table->set_row_attribs('advanced');
-      $table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding'))));
-      $table->add(null, $select_param_folding->show($config['mime_param_folding']));
-    }
-
-    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
-
-    if ($table->size())
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
-    break;
-
-
-  // Special IMAP folders
-  case 'folders':
-    // Configure special folders
-    if (!isset($no_override['default_imap_folders'])) {
-      $RCMAIL->imap_init(true);
-      $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
-
-      $table = new html_table(array('cols' => 2));
-
-      if (!isset($no_override['drafts_mbox'])) {
-        $table->add('title', Q(rcube_label('drafts')));
-        $table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0")));
-      }
-
-      if (!isset($no_override['sent_mbox'])) {
-        $table->add('title', Q(rcube_label('sent')));
-        $table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox")));
-      }
-
-      if (!isset($no_override['junk_mbox'])) {
-        $table->add('title', Q(rcube_label('junk')));
-        $table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox")));
-      }
-
-      if (!isset($no_override['trash_mbox'])) {
-        $table->add('title', Q(rcube_label('trash')));
-        $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox")));
-      }
-
-      $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
-
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib));
-    }
-    break;
-
-
-  // Server settings
-  case 'server':
-    $table = new html_table(array('cols' => 2));
-
-    if (!isset($no_override['read_when_deleted'])) {
-      $field_id = 'rcmfd_read_deleted';
-      $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('readwhendeleted'))));
-      $table->add(null, $input_readdeleted->show($config['read_when_deleted']?1:0));
-    }
+  if (!$attrib['id'])
+    $attrib['id'] = 'rcmprefsframe';
 
-    if (!isset($no_override['flag_for_deletion'])) {
-      $field_id = 'rcmfd_flag_for_deletion';
-      $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
+  $attrib['name'] = $attrib['id'];
 
-      $table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion'))));
-      $table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0));
-    }
-
-    // don't show deleted messages
-    if (!isset($no_override['skip_deleted'])) {
-      $field_id = 'rcmfd_skip_deleted';
-      $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('skipdeleted'))));
-      $table->add(null, $input_purge->show($config['skip_deleted']?1:0));
-    }
-
-    // Trash purging on logout
-    if (!isset($no_override['logout_purge'])) {
-      $field_id = 'rcmfd_logout_purge';
-      $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
-
-      $table->add('title', html::label($field_id, Q(rcube_label('logoutclear'))));
-      $table->add(null, $input_purge->show($config['logout_purge']?1:0));
-    }
-
-    // INBOX compacting on logout
-    if (!isset($no_override['logout_expunge'])) {
-      $field_id = 'rcmfd_logout_expunge';
-      $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+  $OUTPUT->set_env('contentframe', $attrib['name']);
+  $OUTPUT->set_env('blankpage', $attrib['src'] ? $OUTPUT->abs_url($attrib['src']) : 'program/blank.gif');
+  
+  return html::iframe($attrib);
+  }
 
-      $table->add('title', html::label($field_id, Q(rcube_label('logoutcompact'))));
-      $table->add(null, $input_expunge->show($config['logout_expunge']?1:0));
-    }
 
-    $RCMAIL->plugins->exec_hook('user_preferences', array('section' => $part, 'table' => $table));
+function rcmail_sections_list($attrib)
+  {
+  global $RCMAIL, $SECTIONS;
+  
+  // add id to message list table if not specified
+  if (!strlen($attrib['id']))
+    $attrib['id'] = 'rcmsectionslist';
 
-    if ($table->size())
-      $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('serversettings'))) . $table->show($attrib));
-    break;
+  // hook + define list cols
+  $plugin = $RCMAIL->plugins->exec_hook('list_prefs_sections',
+    array('list' => $SECTIONS, 'cols' => array('section')));
+	    
+  // create XHTML table
+  $out = rcube_table_output($attrib, $plugin['list'], $plugin['cols'], 'id');
 
+  // set client env
+  $RCMAIL->output->add_gui_object('sectionslist', $attrib['id']);
+  $RCMAIL->output->include_script('list.js');
 
-    default:
-      $out = '';
-  }
-  
   return $out;
-}
+  }
 
 
 function rcmail_identities_list($attrib)
@@ -437,7 +94,6 @@ function rcmail_identities_list($attrib)
   }
 
 
-
 // similar function as in /steps/addressbook/edit.inc
 function get_form_tags($attrib, $action, $id = null, $hidden = null)
   {
@@ -447,7 +103,10 @@ function get_form_tags($attrib, $action, $id = null, $hidden = null)
   
   if (empty($EDIT_FORM)) {
     $request_key = $action . (isset($id) ? '.'.$id : '');
-    $form_start = $RCMAIL->output->request_form(array('name' => "form", 'method' => "post", 'task' => $RCMAIL->task, 'action' => $action, 'request' => $request_key, 'noclose' => true) + $attrib);
+    $form_start = $RCMAIL->output->request_form(array(
+	'name' => 'form', 'method' => 'post',
+	'task' => $RCMAIL->task, 'action' => $action,
+	'request' => $request_key, 'noclose' => true) + $attrib);
     
     if (is_array($hidden)) {
       $hiddenfields = new html_hiddenfield($hidden);
@@ -463,35 +122,12 @@ function get_form_tags($attrib, $action, $id = null, $hidden = null)
   return array($form_start, $form_end);
   }
 
-function rcmail_get_skins()
-  {
-  $path = 'skins';
-  $skins = array();
-
-  $dir = opendir($path);
-  
-  if (!$dir)
-	return false;
-  
-  while (($file = readdir($dir)) !== false)
-    {
-    $filename = $path.'/'.$file;
-    if (is_dir($filename) && is_readable($filename) 
-	&& !in_array($file, array('.', '..', '.svn')))
-      $skins[] = $file;
-    }
-
-  closedir($dir);
-
-  return $skins;
-  }
-
 
 // register UI objects
 $OUTPUT->add_handlers(array(
-  'userprefs' => 'rcmail_user_prefs_form',
+  'prefsframe' => 'rcmail_preferences_frame',
+  'sectionslist' => 'rcmail_sections_list',
   'identitieslist' => 'rcmail_identities_list',
-  'itentitieslist' => 'rcmail_identities_list'  // keep this for backward compatibility
 ));
 
 ?>
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index 910cab692..d0bfdf099 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -19,83 +19,135 @@
 
 */
 
-$a_user_prefs = array(
-  'language'     => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
-  'timezone'     => isset($_POST['_timezone']) ? (is_numeric($_POST['_timezone']) ? floatval($_POST['_timezone']) : get_input_value('_timezone', RCUBE_INPUT_POST)) : $CONFIG['timezone'],
-  'dst_active'   => isset($_POST['_dst_active']) ? TRUE : FALSE,
-  'pagesize'     => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'],
-  'prettydate'   => isset($_POST['_pretty_date']) ? TRUE : FALSE,
-  'prefer_html'  => isset($_POST['_prefer_html']) ? TRUE : FALSE,
-  'htmleditor'   => isset($_POST['_htmleditor']) ? TRUE : FALSE,
-  'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
-  'preview_pane' => isset($_POST['_preview_pane']) ? TRUE : FALSE,
-  'display_next' => isset($_POST['_display_next']) ? TRUE : FALSE,
-  'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
-  'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
-  'skip_deleted' => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
-  'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
-  'logout_purge' => isset($_POST['_logout_purge']) ? TRUE : FALSE,
-  'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
-  'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
-  'show_images' => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
-  'keep_alive' => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
-  'check_all_folders' => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
-  'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
-  'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
-  'skin' => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
-  'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST),
-  'sent_mbox' => get_input_value('_sent_mbox', RCUBE_INPUT_POST),
-  'junk_mbox' => get_input_value('_junk_mbox', RCUBE_INPUT_POST),
-  'trash_mbox' => get_input_value('_trash_mbox', RCUBE_INPUT_POST),
-  );
-
-$data  =  rcmail::get_instance()->plugins->exec_hook('save_preferences', array('prefs' => $a_user_prefs));
+$CURR_SECTION = get_input_value('_section', RCUBE_INPUT_POST);
+
+$a_user_prefs = array();
+
+// set options for specified section
+switch ($CURR_SECTION)
+{
+  case 'general':
+    $a_user_prefs = array(
+      'language'     => isset($_POST['_language']) ? get_input_value('_language', RCUBE_INPUT_POST) : $CONFIG['language'],
+      'timezone'     => isset($_POST['_timezone']) ? (is_numeric($_POST['_timezone']) ? floatval($_POST['_timezone']) : get_input_value('_timezone', RCUBE_INPUT_POST)) : $CONFIG['timezone'],
+      'dst_active'   => isset($_POST['_dst_active']) ? TRUE : FALSE,
+      'pagesize'     => is_numeric($_POST['_pagesize']) ? max(2, intval($_POST['_pagesize'])) : $CONFIG['pagesize'],
+      'prettydate'   => isset($_POST['_pretty_date']) ? TRUE : FALSE,
+      'skin' 	     => isset($_POST['_skin']) ? get_input_value('_skin', RCUBE_INPUT_POST) : $CONFIG['skin'],
+    );
+
+  break;
+  case 'mailbox':
+    $a_user_prefs = array(
+      'focus_on_new_message' => isset($_POST['_focus_on_new_message']) ? TRUE : FALSE,
+      'preview_pane' 	     => isset($_POST['_preview_pane']) ? TRUE : FALSE,
+      'mdn_requests'         => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
+      'keep_alive'           => isset($_POST['_keep_alive']) ? intval($_POST['_keep_alive'])*60 : $CONFIG['keep_alive'],
+      'check_all_folders'    => isset($_POST['_check_all_folders']) ? TRUE : FALSE,
+    );
+
+  break;
+  case 'mailview':
+    $a_user_prefs = array(
+      'prefer_html'     => isset($_POST['_prefer_html']) ? TRUE : FALSE,
+      'inline_images'   => isset($_POST['_inline_images']) ? TRUE : FALSE,
+      'show_images'     => isset($_POST['_show_images']) ? intval($_POST['_show_images']) : 0,
+      'display_next'    => isset($_POST['_display_next']) ? TRUE : FALSE,
+    );
+
+  break;
+  case 'compose':
+    $a_user_prefs = array(
+      'htmleditor'         => isset($_POST['_htmleditor']) ? TRUE : FALSE,
+      'draft_autosave'     => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
+      'mime_param_folding' => isset($_POST['_mime_param_folding']) ? intval($_POST['_mime_param_folding']) : 0,
+    );
+
+  break;
+  case 'server':
+    $a_user_prefs = array(
+      'read_when_deleted' => isset($_POST['_read_when_deleted']) ? TRUE : FALSE,
+      'skip_deleted'      => isset($_POST['_skip_deleted']) ? TRUE : FALSE,
+      'flag_for_deletion' => isset($_POST['_flag_for_deletion']) ? TRUE : FALSE,
+      'logout_purge'      => isset($_POST['_logout_purge']) ? TRUE : FALSE,
+      'logout_expunge'    => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
+    );
+
+  break;
+  case 'folders':
+    $a_user_prefs = array(
+      'drafts_mbox' => get_input_value('_drafts_mbox', RCUBE_INPUT_POST),
+      'sent_mbox'   => get_input_value('_sent_mbox', RCUBE_INPUT_POST),
+      'junk_mbox'   => get_input_value('_junk_mbox', RCUBE_INPUT_POST),
+      'trash_mbox'  => get_input_value('_trash_mbox', RCUBE_INPUT_POST),
+    );
+
+  break;
+}
+
+
+$data = rcmail::get_instance()->plugins->exec_hook('save_preferences',
+  array('prefs' => $a_user_prefs, 'section' => $CURR_SECTION));
+
 $a_user_prefs = $data['prefs'];
 
 // don't override these parameters
 foreach ((array)$CONFIG['dont_override'] as $p)
   $a_user_prefs[$p] = $CONFIG[$p];
 
-// special handling for 'default_imap_folders'
-if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) {
-  foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
-    $a_user_prefs[$p] = $CONFIG[$p];
-}
-else {
-  $a_user_prefs['default_imap_folders'] = array('INBOX');
-  foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
-    if ($a_user_prefs[$p])
-      $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p];
-  }
-}
-
-// switch UI language
-if (isset($_POST['_language'])) {
-  $RCMAIL->load_language($a_user_prefs['language']);
-}
-
-// switch skin
-$OUTPUT->set_skin($a_user_prefs['skin']);
 
-// force min size
-if ($a_user_prefs['pagesize'] < 1)
-  $a_user_prefs['pagesize'] = 10;
-
-if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']))
-  $a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];
-
-// force keep_alive
-if (isset($a_user_prefs['keep_alive'])) {
-    $a_user_prefs['keep_alive'] = max(60, $CONFIG['min_keep_alive'], $a_user_prefs['keep_alive']);
-    if (!empty($CONFIG['session_lifetime']))
-      $a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
+// verify some options
+switch ($CURR_SECTION)
+{
+  case 'general':
+
+    // switch UI language
+    if (isset($_POST['_language'])) {
+      $RCMAIL->load_language($a_user_prefs['language']);
+    }
+
+    // switch skin
+    $OUTPUT->set_skin($a_user_prefs['skin']);
+
+    // force min size
+    if ($a_user_prefs['pagesize'] < 1)
+      $a_user_prefs['pagesize'] = 10;
+
+    if (isset($CONFIG['max_pagesize']) && ($a_user_prefs['pagesize'] > $CONFIG['max_pagesize']))
+      $a_user_prefs['pagesize'] = (int) $CONFIG['max_pagesize'];
+
+  break;
+  case 'mailbox':
+
+    // force keep_alive
+    if (isset($a_user_prefs['keep_alive'])) {
+      $a_user_prefs['keep_alive'] = max(60, $CONFIG['min_keep_alive'], $a_user_prefs['keep_alive']);
+      if (!empty($CONFIG['session_lifetime']))
+        $a_user_prefs['keep_alive'] = min($CONFIG['session_lifetime']*60, $a_user_prefs['keep_alive']);
+    }
+
+  break;
+  case 'folders':
+
+    // special handling for 'default_imap_folders'
+    if (in_array('default_imap_folders', (array)$CONFIG['dont_override'])) {
+      foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p)
+	$a_user_prefs[$p] = $CONFIG[$p];
+    } else {
+      $a_user_prefs['default_imap_folders'] = array('INBOX');
+      foreach (array('drafts_mbox','sent_mbox','junk_mbox','trash_mbox') as $p) {
+	if ($a_user_prefs[$p])
+          $a_user_prefs['default_imap_folders'][] = $a_user_prefs[$p];
+	}
+    }
+  
+  break;
 }
 
-
 if ($USER->save_prefs($a_user_prefs))
   $OUTPUT->show_message('successfullysaved', 'confirmation');
 
-// go to next step
-rcmail_overwrite_action('preferences');
+// display the form again
+rcmail_overwrite_action('edit-prefs');
 
 ?>