From 3a003cc9fbeafd8a05d2136e6c74aad3e530cdca Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 19 Apr 2010 08:25:06 -0400
Subject: [PATCH] - fix dublicated request in msglist_click()

---
 program/js/app.js | 3399 ++++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 1,965 insertions(+), 1,434 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 4c8daee..1358c36 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,11 +3,12 @@
  | RoundCube Webmail Client Script                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005-2009, RoundCube Dev, - Switzerland                 |
+ | Copyright (C) 2005-2010, RoundCube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Authors: Thomas Bruederli <roundcube@gmail.com>                       |
+ |          Aleksander 'A.L.E.C' Machniak <alec@alec.pl>                 |
  |          Charles McNulty <charles@charlesmcnulty.com>                 |
  +-----------------------------------------------------------------------+
  | Requires: jquery.js, common.js, list.js                               |
@@ -19,31 +20,30 @@
 
 function rcube_webmail()
 {
-  this.env = new Object();
-  this.labels = new Object();
-  this.buttons = new Object();
-  this.buttons_sel = new Object();
-  this.gui_objects = new Object();
-  this.gui_containers = new Object();
-  this.commands = new Object();
-  this.command_handlers = new Object();
-  this.onloads = new Array();
+  this.env = {};
+  this.labels = {};
+  this.buttons = {};
+  this.buttons_sel = {};
+  this.gui_objects = {};
+  this.gui_containers = {};
+  this.commands = {};
+  this.command_handlers = {};
+  this.onloads = [];
 
   // create protected reference to myself
   this.ref = 'rcmail';
   var ref = this;
- 
+
   // webmail client settings
   this.dblclick_time = 500;
   this.message_time = 3000;
-  
+
   this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
-  
+
   // mimetypes supported by the browser (default settings)
   this.mimetypes = new Array('text/plain', 'text/html', 'text/xml',
-                             'image/jpeg', 'image/gif', 'image/png',
-                             'application/x-javascript', 'application/pdf',
-                             'application/x-shockwave-flash');
+    'image/jpeg', 'image/gif', 'image/png',
+    'application/x-javascript', 'application/pdf', 'application/x-shockwave-flash');
 
   // default environment vars
   this.env.keep_alive = 60;        // seconds
@@ -54,53 +54,54 @@
   this.env.blankpage = 'program/blank.gif';
 
   // set jQuery ajax options
-  jQuery.ajaxSetup({ cache:false,
+  $.ajaxSetup({
+    cache:false,
     error:function(request, status, err){ ref.http_error(request, status, err); },
     beforeSend:function(xmlhttp){ xmlhttp.setRequestHeader('X-RoundCube-Request', ref.env.request_token); }
   });
 
   // set environment variable(s)
   this.set_env = function(p, value)
-    {
+  {
     if (p != null && typeof(p) == 'object' && !value)
       for (var n in p)
         this.env[n] = p[n];
     else
       this.env[p] = value;
-    };
+  };
 
   // add a localized label to the client environment
   this.add_label = function(key, value)
-    {
+  {
     this.labels[key] = value;
-    };
+  };
 
   // add a button to the button list
   this.register_button = function(command, id, type, act, sel, over)
-    {
+  {
     if (!this.buttons[command])
-      this.buttons[command] = new Array();
-      
+      this.buttons[command] = [];
+
     var button_prop = {id:id, type:type};
     if (act) button_prop.act = act;
     if (sel) button_prop.sel = sel;
     if (over) button_prop.over = over;
 
     this.buttons[command][this.buttons[command].length] = button_prop;    
-    };
+  };
 
   // register a specific gui object
   this.gui_object = function(name, id)
-    {
+  {
     this.gui_objects[name] = id;
-    };
-  
+  };
+
   // register a container object
   this.gui_container = function(name, id)
   {
     this.gui_containers[name] = id;
   };
-  
+
   // add a GUI element (html node) to a specified container
   this.add_element = function(elm, container)
   {
@@ -112,11 +113,11 @@
   this.register_command = function(command, callback, enable)
   {
     this.command_handlers[command] = callback;
-    
+
     if (enable)
       this.enable_command(command, true);
   };
-  
+
   // execute the given script on load
   this.add_onload = function(f)
   {
@@ -125,16 +126,15 @@
 
   // initialize webmail client
   this.init = function()
-    {
+  {
     var p = this;
     this.task = this.env.task;
-    
+
     // check browser
-    if (!bw.dom || !bw.xmlhttp_test())
-      {
+    if (!bw.dom || !bw.xmlhttp_test()) {
       this.goto_url('error', '_code=0x199');
       return;
-      }
+    }
 
     // find all registered gui containers
     for (var n in this.gui_containers)
@@ -143,7 +143,7 @@
     // find all registered gui objects
     for (var n in this.gui_objects)
       this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);
-      
+
     // init registered buttons
     this.init_buttons();
 
@@ -153,119 +153,118 @@
 
     // enable general commands
     this.enable_command('logout', 'mail', 'addressbook', 'settings', true);
-    
+
     if (this.env.permaurl)
       this.enable_command('permaurl', true);
 
-    switch (this.task)
-      {
+    switch (this.task) {
+
       case 'mail':
-        if (this.gui_objects.messagelist)
-          {
-          this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {multiselect:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
+        // enable mail commands
+        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
+
+        if (this.gui_objects.messagelist) {
+
+          this.message_list = new rcube_list_widget(this.gui_objects.messagelist,
+            {multiselect:true, multiexpand:true, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
           this.message_list.row_init = function(o){ p.init_message_row(o); };
           this.message_list.addEventListener('dblclick', function(o){ p.msglist_dbl_click(o); });
+          this.message_list.addEventListener('click', function(o){ p.msglist_click(o); });
           this.message_list.addEventListener('keypress', function(o){ p.msglist_keypress(o); });
           this.message_list.addEventListener('select', function(o){ p.msglist_select(o); });
           this.message_list.addEventListener('dragstart', function(o){ p.drag_start(o); });
           this.message_list.addEventListener('dragmove', function(e){ p.drag_move(e); });
           this.message_list.addEventListener('dragend', function(e){ p.drag_end(e); });
+          this.message_list.addEventListener('expandcollapse', function(e){ p.msglist_expand(e); });
+
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
+          this.gui_objects.messagelist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
 
-          this.message_list.init();
-          this.enable_command('toggle_status', 'toggle_flag', true);
-          
-          if (this.gui_objects.mailcontframe)
-            this.gui_objects.mailcontframe.onmousedown = function(e){ return p.click_on_list(e); };
-          else
-            this.message_list.focus();
-          }
-          
-        if (this.env.coltypes)
           this.set_message_coltypes(this.env.coltypes);
+          this.message_list.init();
+          this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', true);
 
-        // enable mail commands
-        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
+          // load messages
+          if (this.env.messagecount)
+            this.command('list');
+        }
 
-        if (this.env.search_text != null && document.getElementById('quicksearchbox') != null)
-          document.getElementById('quicksearchbox').value = this.env.search_text;
-        
-        if (this.env.action=='show' || this.env.action=='preview')
-          {
-          this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete',
-            'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', true);
-
-          if (this.env.next_uid)
-            {
-            this.enable_command('nextmessage', true);
-            this.enable_command('lastmessage', true);
-            }
-          if (this.env.prev_uid)
-            {
-            this.enable_command('previousmessage', true);
-            this.enable_command('firstmessage', true);
-            }
-        
-          if (this.env.blockedobjects)
-            {
-            if (this.gui_objects.remoteobjectsmsg)
-              this.gui_objects.remoteobjectsmsg.style.display = 'block';
-            this.enable_command('load-images', 'always-load', true);
-            }
+        if (this.gui_objects.qsearchbox) {
+          if (this.env.search_text != null) {
+            this.gui_objects.qsearchbox.value = this.env.search_text;
           }
+          $(this.gui_objects.qsearchbox).focusin(function() { rcmail.message_list.blur(); });
+        }
 
         if (this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox)
           this.set_alttext('delete', 'movemessagetotrash');
-        
-        // make preview/message frame visible
-        if (this.env.action == 'preview' && this.env.framed && parent.rcmail)
-          {
-          this.enable_command('compose', 'add-contact', false);
-          parent.rcmail.show_contentframe(true);
+
+        if (this.env.action=='show' || this.env.action=='preview') {
+          this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete',
+            'open', 'mark', 'edit', 'viewsource', 'download', 'print', 'load-attachment', 'load-headers', true);
+
+          if (this.env.next_uid) {
+            this.enable_command('nextmessage', true);
+            this.enable_command('lastmessage', true);
+          }
+          if (this.env.prev_uid) {
+            this.enable_command('previousmessage', true);
+            this.enable_command('firstmessage', true);
           }
 
-        if (this.env.action=='compose')
-          {
+          if (this.env.blockedobjects) {
+            if (this.gui_objects.remoteobjectsmsg)
+              this.gui_objects.remoteobjectsmsg.style.display = 'block';
+            this.enable_command('load-images', 'always-load', true);
+          }
+
+          // make preview/message frame visible
+          if (this.env.action == 'preview' && this.env.framed && parent.rcmail) {
+            this.enable_command('compose', 'add-contact', false);
+            parent.rcmail.show_contentframe(true);
+          }
+        }
+        else if (this.env.action == 'compose') {
           this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
-          if (this.env.spellcheck)
-            {
+
+          if (this.env.spellcheck) {
             this.env.spellcheck.spelling_state_observer = function(s){ ref.set_spellcheck_state(s); };
             this.set_spellcheck_state('ready');
             if ($("input[name='_is_html']").val() == '1')
               this.display_spellcheck_controls(false);
-            }
+          }
+
           if (this.env.drafts_mailbox)
             this.enable_command('savedraft', true);
-            
+
           document.onmouseup = function(e){ return p.doc_mouse_up(e); };
 
           // init message compose form
           this.init_messageform();
-          }
+        }
+        // show printing dialog
+        else if (this.env.action == 'print')
+          window.print();
 
-        if (this.env.messagecount)
+        if (this.env.messagecount) {
           this.enable_command('select-all', 'select-none', 'expunge', true);
+          this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading);
+        }
 
         if (this.purge_mailbox_test())
           this.enable_command('purge', true);
 
         this.set_page_buttons();
 
-        // show printing dialog
-        if (this.env.action=='print')
-          window.print();
-
         // get unread count for each mailbox
-        if (this.gui_objects.mailboxlist)
-        {
+        if (this.gui_objects.mailboxlist) {
           this.env.unread_counts = {};
           this.gui_objects.folderlist = this.gui_objects.mailboxlist;
           this.http_request('getunread', '');
         }
-        
+
         // ask user to send MDN
-        if (this.env.mdn_request && this.env.uid)
-        {
+        if (this.env.mdn_request && this.env.uid) {
           var mdnurl = '_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox);
           if (confirm(this.get_label('mdnrequest')))
             this.http_post('sendmdn', mdnurl);
@@ -277,9 +276,13 @@
 
 
       case 'addressbook':
-        if (this.gui_objects.contactslist)
-          {
-          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:true, keyboard:true});
+        if (this.gui_objects.folderlist)
+          this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
+
+        if (this.gui_objects.contactslist) {
+
+          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
+            {multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
           this.contact_list.row_init = function(row){ p.triggerEvent('insertrow', { cid:row.uid, row:row }); };
           this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
           this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
@@ -291,40 +294,38 @@
           if (this.env.cid)
             this.contact_list.highlight_row(this.env.cid);
 
-          if (this.gui_objects.contactslist.parentNode)
-            {
-            this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
-            document.onmouseup = function(e){ return p.doc_mouse_up(e); };
-            }
-          else
-            this.contact_list.focus();
-            
-          this.gui_objects.folderlist = this.gui_objects.contactslist;
+          this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
+          document.onmouseup = function(e){ return p.doc_mouse_up(e); };
+          if (this.gui_objects.qsearchbox) {
+            $(this.gui_objects.qsearchbox).focusin(function() { rcmail.contact_list.blur(); });
           }
+        }
 
         this.set_page_buttons();
-        
-        if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly)
-          this.enable_command('add', true);
-        
+
+        if (this.env.address_sources && this.env.address_sources[this.env.source] && !this.env.address_sources[this.env.source].readonly) {
+          this.enable_command('add', 'import', true);
+          this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
+        }
+
         if (this.env.cid)
           this.enable_command('show', 'edit', true);
 
         if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform)
           this.enable_command('save', true);
         else
-          this.enable_command('search', 'reset-search', 'moveto', 'import', true);
-          
+          this.enable_command('search', 'reset-search', 'moveto', true);
+
         if (this.contact_list && this.contact_list.rowcount > 0)
           this.enable_command('export', true);
 
-        this.enable_command('list', true);
+        this.enable_command('list', 'listgroup', true);
         break;
 
 
       case 'settings':
         this.enable_command('preferences', 'identities', 'save', 'folders', true);
-        
+
         if (this.env.action=='identities') {
           this.enable_command('add', this.env.identities_level < 2);
         }
@@ -333,7 +334,7 @@
           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);
+          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', 'enable-threading', 'disable-threading', true);
 
         if (this.gui_objects.identitieslist)
           {
@@ -351,7 +352,6 @@
           this.sections_list.addEventListener('select', function(o){ p.section_select(o); });
           this.sections_list.init();
           this.sections_list.focus();
-          this.sections_list.select_first();  // open first section by default
         }
         else if (this.gui_objects.subscriptionlist)
           this.init_subscription_list();
@@ -361,7 +361,7 @@
       case 'login':
         var input_user = $('#rcmloginuser');
         input_user.bind('keyup', function(e){ return rcmail.login_user_keyup(e); });
-        
+
         if (input_user.val() == '')
           input_user.focus();
         else
@@ -372,7 +372,7 @@
 
         this.enable_command('login', true);
         break;
-      
+
       default:
         break;
       }
@@ -383,18 +383,17 @@
     // show message
     if (this.pending_message)
       this.display_message(this.pending_message[0], this.pending_message[1]);
-      
+
     // map implicit containers
     if (this.gui_objects.folderlist)
       this.gui_containers.foldertray = $(this.gui_objects.folderlist);
 
     // trigger init event hook
     this.triggerEvent('init', { task:this.task, action:this.env.action });
-    
+
     // execute all foreign onload scripts
     // @deprecated
-    for (var i=0; i<this.onloads.length; i++)
-      {
+    for (var i=0; i<this.onloads.length; i++) {
       if (typeof(this.onloads[i]) == 'string')
         eval(this.onloads[i]);
       else if (typeof(this.onloads[i]) == 'function')
@@ -405,106 +404,6 @@
     this.start_keepalive();
   };
 
-  // start interval for keep-alive/recent_check signal
-  this.start_keepalive = function()
-    {
-    if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
-      this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
-    else if (this.env.keep_alive && !this.env.framed && this.task!='login')
-      this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
-    }
-
-  this.init_message_row = function(row)
-  {
-    var uid = row.uid;
-    if (uid && this.env.messages[uid])
-      {
-      row.deleted = this.env.messages[uid].deleted ? true : false;
-      row.unread = this.env.messages[uid].unread ? true : false;
-      row.replied = this.env.messages[uid].replied ? true : false;
-      row.flagged = this.env.messages[uid].flagged ? true : false;
-      row.forwarded = this.env.messages[uid].forwarded ? true : false;
-      }
-
-    // set eventhandler to message icon
-    if (row.icon = row.obj.getElementsByTagName('td')[0].getElementsByTagName('img')[0])
-      {
-      var p = this;
-      row.icon.id = 'msgicn_'+row.uid;
-      row.icon._row = row.obj;
-      row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
-      }
-
-    // global variable 'flagged_col' may be not defined yet
-    if (!this.env.flagged_col && this.env.coltypes)
-      {
-      var found;
-      if((found = find_in_array('flag', this.env.coltypes)) >= 0)
-        this.set_env('flagged_col', found+1);
-      }
-
-    // set eventhandler to flag icon, if icon found
-    if (this.env.flagged_col && (row.flagged_icon = row.obj.getElementsByTagName('td')[this.env.flagged_col].getElementsByTagName('img')[0]))
-      {
-      var p = this;
-      row.flagged_icon.id = 'flaggedicn_'+row.uid;
-      row.flagged_icon._row = row.obj;
-      row.flagged_icon.onmousedown = function(e) { p.command('toggle_flag', this); };
-      }
-      
-    this.triggerEvent('insertrow', { uid:uid, row:row });
-  };
-
-  // init message compose form: set focus and eventhandlers
-  this.init_messageform = function()
-    {
-    if (!this.gui_objects.messageform)
-      return false;
-    
-    //this.messageform = this.gui_objects.messageform;
-    var input_from = $("[name='_from']");
-    var input_to = $("[name='_to']");
-    var input_subject = $("input[name='_subject']");
-    var input_message = $("[name='_message']").get(0);
-    var html_mode = $("input[name='_is_html']").val() == '1';
-
-    // init live search events
-    this.init_address_input_events(input_to);
-    this.init_address_input_events($("[name='_cc']"));
-    this.init_address_input_events($("[name='_bcc']"));
-    
-    if (!html_mode)
-      this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
-
-    // add signature according to selected identity
-    if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == ''
-        && !html_mode) {  // if we have HTML editor, signature is added in callback
-      this.change_identity(input_from[0]);
-    }
-    else if (!html_mode) 
-      this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
-
-    if (input_to.val() == '')
-      input_to.focus();
-    else if (input_subject.val() == '')
-      input_subject.focus();
-    else if (input_message && !html_mode)
-      input_message.focus();
-
-    // get summary of all field values
-    this.compose_field_hash(true);
- 
-    // start the auto-save timer
-    this.auto_save_start();
-    };
-
-  this.init_address_input_events = function(obj)
-    {
-    var handler = function(e){ return ref.ksearch_keypress(e,this); };
-    obj.bind((bw.safari || bw.ie ? 'keydown' : 'keypress'), handler);
-    obj.attr('autocomplete', 'off');
-    };
-
 
   /*********************************************************/
   /*********       client command interface        *********/
@@ -512,7 +411,7 @@
 
   // execute a specific command on the web client
   this.command = function(command, props, obj)
-    {
+  {
     if (obj && obj.blur)
       obj.blur();
 
@@ -520,34 +419,31 @@
       return false;
 
     // command not supported or allowed
-    if (!this.commands[command])
-      {
+    if (!this.commands[command]) {
       // pass command to parent window
       if (this.env.framed && parent.rcmail && parent.rcmail.command)
         parent.rcmail.command(command, props);
 
       return false;
-      }
-      
-   // check input before leaving compose step
-   if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
-     {
-     if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
+    }
+
+    // check input before leaving compose step
+    if (this.task=='mail' && this.env.action=='compose'
+        && (command == 'list' || command == 'mail' || command == 'addressbook' || command == 'settings')) {
+      if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
         return false;
-     }
+    }
 
     // process external commands
-    if (typeof this.command_handlers[command] == 'function')
-    {
+    if (typeof this.command_handlers[command] == 'function') {
       var ret = this.command_handlers[command](props, obj);
       return ret !== null ? ret : (obj ? false : true);
     }
-    else if (typeof this.command_handlers[command] == 'string')
-    {
+    else if (typeof this.command_handlers[command] == 'string') {
       var ret = window[this.command_handlers[command]](props, obj);
       return ret !== null ? ret : (obj ? false : true);
     }
-    
+
     // trigger plugin hook
     var event_ret = this.triggerEvent('before'+command, props);
     if (typeof event_ret != 'undefined') {
@@ -559,8 +455,8 @@
     }
 
     // process internal command
-    switch (command)
-      {
+    switch (command) {
+
       case 'login':
         if (this.gui_objects.loginform)
           this.gui_objects.loginform.submit();
@@ -581,10 +477,14 @@
           parent.location.href = this.env.permaurl;
         break;
 
+      case 'menu-open':
+      case 'menu-save':
+        this.triggerEvent(command, {props:props});
+        return false;
+
       case 'open':
         var uid;
-        if (uid = this.get_single_uid())
-        {
+        if (uid = this.get_single_uid()) {
           obj.href = '?_task='+this.env.task+'&_action=show&_mbox='+urlencode(this.env.mailbox)+'&_uid='+uid;
           return true;
         }
@@ -592,8 +492,7 @@
 
       // misc list commands
       case 'list':
-        if (this.task=='mail')
-          {
+        if (this.task=='mail') {
           if (this.env.search_request<0 || (props != '' && (this.env.search_request && props != this.env.mailbox)))
             this.reset_qsearch();
 
@@ -601,15 +500,19 @@
 
           if (this.env.trash_mailbox)
             this.set_alttext('delete', this.env.mailbox != this.env.trash_mailbox ? 'movemessagetotrash' : 'deletemessage');
-          }
-        else if (this.task=='addressbook')
-          {
+        }
+        else if (this.task=='addressbook') {
           if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
             this.reset_qsearch();
 
           this.list_contacts(props);
-          this.enable_command('add', (this.env.address_sources && !this.env.address_sources[props].readonly));
-          }
+          this.enable_command('add', 'import', (this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
+        }
+        break;
+
+
+      case 'listgroup':
+        this.list_contacts(null, props);
         break;
 
 
@@ -624,15 +527,10 @@
         if (this.env.sort_col==sort_col)
           sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
         else
-	  sort_order = 'ASC';
-	
-        // set table header class
-        $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
-        $('#rcm'+sort_col).addClass('sorted'+sort_order);
+          sort_order = 'ASC';
 
-        // save new sort properties
-        this.env.sort_col = sort_col;
-        this.env.sort_order = sort_order;
+        // set table header and update env
+        this.set_list_sorting(sort_col, sort_order);
 
         // reload message list
         this.list_mailbox('', '', sort_col+'_'+sort_order);
@@ -668,33 +566,29 @@
 
       // common commands used in multiple tasks
       case 'show':
-        if (this.task=='mail')
-          {
+        if (this.task=='mail') {
           var uid = this.get_single_uid();
-          if (uid && (!this.env.uid || uid != this.env.uid))
-            {
+          if (uid && (!this.env.uid || uid != this.env.uid)) {
             if (this.env.mailbox == this.env.drafts_mailbox)
               this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
             else
               this.show_message(uid);
-            }
           }
-        else if (this.task=='addressbook')
-          {
+        }
+        else if (this.task=='addressbook') {
           var cid = props ? props : this.get_single_cid();
           if (cid && !(this.env.action=='show' && cid==this.env.cid))
             this.load_contact(cid, 'show');
-          }
+        }
         break;
 
       case 'add':
         if (this.task=='addressbook')
           this.load_contact(0, 'add');
-        else if (this.task=='settings')
-          {
+        else if (this.task=='settings') {
           this.identity_list.clear_selection();
           this.load_identity(0, 'add-identity');
-          }
+        }
         break;
 
       case 'edit':
@@ -711,38 +605,33 @@
 
       case 'save-identity':
       case 'save':
-        if (this.gui_objects.editform)
-          {
+        if (this.gui_objects.editform) {
           var input_pagesize = $("input[name='_pagesize']");
           var input_name  = $("input[name='_name']");
           var input_email = $("input[name='_email']");
 
           // user prefs
-          if (input_pagesize.length && isNaN(parseInt(input_pagesize.val())))
-            {
+          if (input_pagesize.length && isNaN(parseInt(input_pagesize.val()))) {
             alert(this.get_label('nopagesizewarning'));
             input_pagesize.focus();
             break;
-            }
+          }
           // contacts/identities
-          else
-            {
-            if (input_name.length && input_name.val() == '')
-              {
+          else {
+            if (input_name.length && input_name.val() == '') {
               alert(this.get_label('nonamewarning'));
               input_name.focus();
               break;
-              }
-            else if (input_email.length && !rcube_check_email(input_email.val()))
-              {
+            }
+            else if (input_email.length && !rcube_check_email(input_email.val())) {
               alert(this.get_label('noemailwarning'));
               input_email.focus();
               break;
-              }
             }
+          }
 
           this.gui_objects.editform.submit();
-          }
+        }
         break;
 
       case 'delete':
@@ -757,7 +646,6 @@
           this.delete_identity();
         break;
 
-
       // mail task commands
       case 'move':
       case 'moveto':
@@ -767,41 +655,43 @@
           this.copy_contact(null, props);
         break;
 
+      case 'copy':
+        if (this.task == 'mail')
+          this.copy_messages(props);
+        break;
+
       case 'mark':
         if (props)
           this.mark_message(props);
         break;
-      
+
       case 'toggle_status':
         if (props && !props._row)
           break;
-        
-        var uid;
-        var flag = 'read';
-        
-        if (props._row.uid)
-          {
+
+        var uid, flag = 'read';
+
+        if (props._row.uid) {
           uid = props._row.uid;
-          
+
           // toggle read/unread
           if (this.message_list.rows[uid].deleted) {
             flag = 'undelete';
-          } else if (!this.message_list.rows[uid].unread)
-            flag = 'unread';
           }
-          
+          else if (!this.message_list.rows[uid].unread)
+            flag = 'unread';
+        }
+
         this.mark_message(flag, uid);
         break;
-        
+
       case 'toggle_flag':
         if (props && !props._row)
           break;
 
-        var uid;
-        var flag = 'flagged';
+        var uid, flag = 'flagged';
 
-        if (props._row.uid)
-          {
+        if (props._row.uid) {
           uid = props._row.uid;
           // toggle flagged/unflagged
           if (this.message_list.rows[uid].flagged)
@@ -816,7 +706,7 @@
           window.setTimeout(function(){ ref.command('load-images'); }, 300);
           break;
         }
-        
+
       case 'load-images':
         if (this.env.uid)
           this.show_message(this.env.uid, true, this.env.action=='preview');
@@ -824,32 +714,47 @@
 
       case 'load-attachment':
         var qstring = '_mbox='+urlencode(this.env.mailbox)+'&_uid='+this.env.uid+'&_part='+props.part;
-        
+
         // open attachment in frame if it's of a supported mimetype
-        if (this.env.uid && props.mimetype && find_in_array(props.mimetype, this.mimetypes)>=0)
-          {
+        if (this.env.uid && props.mimetype && $.inArray(props.mimetype, this.mimetypes)>=0) {
           if (props.mimetype == 'text/html')
             qstring += '&_safe=1';
           this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
-          if (this.attachment_win)
-            {
+          if (this.attachment_win) {
             window.setTimeout(function(){ ref.attachment_win.focus(); }, 10);
             break;
-            }
           }
+        }
 
         this.goto_url('get', qstring+'&_download=1', false);
         break;
-        
+
       case 'select-all':
+        this.select_all_mode = props ? false : true;
         if (props == 'invert')
           this.message_list.invert_selection();
         else
-          this.message_list.select_all(props);
+          this.message_list.select_all(props == 'page' ? '' : props);
         break;
 
       case 'select-none':
         this.message_list.clear_selection();
+        break;
+
+      case 'expand-all':
+        this.env.autoexpand_threads = 1;
+        this.message_list.expand_all();
+        break;
+
+      case 'expand-unread':
+        this.env.autoexpand_threads = 2;
+        this.message_list.collapse_all();
+        this.expand_unread();
+        break;
+
+      case 'collapse-all':
+        this.env.autoexpand_threads = 0;
+        this.message_list.collapse_all();
         break;
 
       case 'nextmessage':
@@ -871,20 +776,18 @@
         if (this.env.first_uid)
           this.show_message(this.env.first_uid);
         break;
-      
+
       case 'checkmail':
         this.check_for_recent(true);
         break;
-      
+
       case 'compose':
         var url = this.env.comm_path+'&_action=compose';
-       
-        if (this.task=='mail')
-        {
+
+        if (this.task=='mail') {
           url += '&_mbox='+urlencode(this.env.mailbox);
-          
-          if (this.env.mailbox==this.env.drafts_mailbox)
-          {
+
+          if (this.env.mailbox==this.env.drafts_mailbox) {
             var uid;
             if (uid = this.get_single_uid())
               url += '&_draft_uid='+uid;
@@ -893,40 +796,37 @@
              url += '&_to='+urlencode(props);
         }
         // modify url if we're in addressbook
-        else if (this.task=='addressbook')
-          {
+        else if (this.task=='addressbook') {
           // switch to mail compose step directly
-          if (props && props.indexOf('@') > 0)
-            {
+          if (props && props.indexOf('@') > 0) {
             url = this.get_task_url('mail', url);
             this.redirect(url + '&_to='+urlencode(props));
             break;
-            }
-          
+          }
+
           // use contact_id passed as command parameter
-          var a_cids = new Array();
+          var a_cids = [];
           if (props)
             a_cids[a_cids.length] = props;
           // get selected contacts
-          else if (this.contact_list)
-            {
+          else if (this.contact_list) {
             var selection = this.contact_list.get_selection();
             for (var n=0; n<selection.length; n++)
               a_cids[a_cids.length] = selection[n];
-            }
-            
+          }
+
           if (a_cids.length)
             this.http_request('mailto', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source), true);
 
           break;
-          }
+        }
 
         // don't know if this is necessary...
-        url = url.replace(/&_framed=1/, "");
+        url = url.replace(/&_framed=1/, '');
 
         this.redirect(url);
         break;
-        
+
       case 'spellcheck':
         if (window.tinyMCE && tinyMCE.get(this.env.composebody)) {
           tinyMCE.execCommand('mceSpellCheck', true);
@@ -972,21 +872,21 @@
         form.target = "savetarget";     
         form._draft.value = '';
         form.submit();
-        
+
         // clear timeout (sending could take longer)
         clearTimeout(this.request_timer);
         break;
 
       case 'add-attachment':
         this.show_attachment_form(true);
-        
+
       case 'send-attachment':
         // Reset the auto-save timer
         self.clearTimeout(this.save_timer);
 
         this.upload_file(props)      
         break;
-      
+
       case 'remove-attachment':
         this.remove_attachment(props);
         break;
@@ -1007,14 +907,12 @@
         if (uid = this.get_single_uid())
           this.goto_url('compose', '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
         break;
-        
+
       case 'print':
         var uid;
-        if (uid = this.get_single_uid())
-        {
+        if (uid = this.get_single_uid()) {
           ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
-          if (this.printwin)
-          {
+          if (this.printwin) {
             window.setTimeout(function(){ ref.printwin.focus(); }, 20);
             if (this.env.action != 'show')
               this.mark_message('read', uid);
@@ -1024,8 +922,7 @@
 
       case 'viewsource':
         var uid;
-        if (uid = this.get_single_uid())
-          {
+        if (uid = this.get_single_uid()) {
           ref.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox));
           if (this.sourcewin)
             window.setTimeout(function(){ ref.sourcewin.focus(); }, 20);
@@ -1041,13 +938,12 @@
       case 'add-contact':
         this.add_contact(props);
         break;
-      
+
       // quicksearch
       case 'search':
         if (!props && this.gui_objects.qsearchbox)
           props = this.gui_objects.qsearchbox.value;
-        if (props)
-        {
+        if (props) {
           this.qsearch(props);
           break;
         }
@@ -1056,11 +952,23 @@
       case 'reset-search':
         var s = this.env.search_request;
         this.reset_qsearch();
-        
+
         if (s && this.env.mailbox)
           this.list_mailbox(this.env.mailbox);
         else if (s && this.task == 'addressbook')
-          this.list_contacts(this.env.source);
+          this.list_contacts(this.env.source, this.env.group);
+        break;
+
+      case 'group-create':
+        this.add_contact_group(props)
+        break;
+
+      case 'group-rename':
+        this.rename_contact_group();
+        break;
+
+      case 'group-delete':
+        this.delete_contact_group();
         break;
 
       case 'import':
@@ -1075,15 +983,15 @@
           this.lock_form(this.gui_objects.importform, true);
         }
         else
-          this.goto_url('import');
+          this.goto_url('import', (this.env.source ? '_target='+urlencode(this.env.source)+'&' : ''));
         break;
-        
+
       case 'export':
         if (this.contact_list.rowcount > 0) {
           var add_url = (this.env.source ? '_source='+urlencode(this.env.source)+'&' : '');
           if (this.env.search_request)
             add_url += '_search='+this.env.search_request;
-        
+
           this.goto_url('export', add_url);
         }
         break;
@@ -1102,10 +1010,10 @@
       case 'identities':
         this.goto_url('identities');
         break;
-          
+
       case 'delete-identity':
         this.delete_identity();
-        
+
       case 'folders':
         this.goto_url('folders');
         break;
@@ -1117,7 +1025,15 @@
       case 'unsubscribe':
         this.unsubscribe_folder(props);
         break;
-        
+
+      case 'enable-threading':
+        this.enable_threading(props);
+        break;
+
+      case 'disable-threading':
+        this.disable_threading(props);
+        break;
+
       case 'create-folder':
         this.create_folder(props);
         break;
@@ -1130,51 +1046,49 @@
         this.delete_folder(props);
         break;
 
-      }
-      
+    }
+
     this.triggerEvent('after'+command, props);
 
     return obj ? false : true;
-    };
+  };
 
   // set command enabled or disabled
   this.enable_command = function()
-    {
+  {
     var args = arguments;
-    if(!args.length) return -1;
+    if (!args.length)
+      return -1;
 
-    var command;
-    var enable = args[args.length-1];
-    
-    for(var n=0; n<args.length-1; n++)
-      {
+    var command, enable = args[args.length-1];
+
+    for (var n=0; n<args.length-1; n++) {
       command = args[n];
       this.commands[command] = enable;
       this.set_button(command, (enable ? 'act' : 'pas'));
-      }
-      return true;
-    };
+    }
+    return true;
+  };
 
   // lock/unlock interface
   this.set_busy = function(a, message)
-    {
-    if (a && message)
-      {
+  {
+    if (a && message) {
       var msg = this.get_label(message);
       if (msg==message)        
         msg = 'Loading...';
 
       this.display_message(msg, 'loading', true);
-      }
+    }
     else if (!a)
       this.hide_message();
 
     this.busy = a;
     //document.body.style.cursor = a ? 'wait' : 'default';
-    
+
     if (this.gui_objects.editform)
       this.lock_form(this.gui_objects.editform, a);
-      
+
     // clear pending timer
     if (this.request_timer)
       clearTimeout(this.request_timer);
@@ -1182,25 +1096,25 @@
     // set timer for requests
     if (a && this.env.request_timeout)
       this.request_timer = window.setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
-    };
+  };
 
   // return a localized string
   this.get_label = function(name, domain)
-    {
+  {
     if (domain && this.labels[domain+'.'+name])
       return this.labels[domain+'.'+name];
     else if (this.labels[name])
       return this.labels[name];
     else
       return name;
-    };
-  
+  };
+
   // alias for convenience reasons
   this.gettext = this.get_label;
 
   // switch to another application task
   this.switch_task = function(task)
-    {
+  {
     if (this.task===task && task!='mail')
       return;
 
@@ -1209,23 +1123,23 @@
       url += '&_mbox=INBOX';
 
     this.redirect(url);
-    };
+  };
 
   this.get_task_url = function(task, url)
-    {
+  {
     if (!url)
       url = this.env.comm_path;
 
     return url.replace(/_task=[a-z]+/, '_task='+task);
-    };
-    
+  };
+
   // called when a request timed out
   this.request_timed_out = function()
-    {
+  {
     this.set_busy(false);
     this.display_message('Request timed out!', 'error');
-    };
-  
+  };
+
   this.reload = function(delay)
   {
     if (this.env.framed && parent.rcmail)
@@ -1241,51 +1155,42 @@
   /*********        event handling methods         *********/
   /*********************************************************/
 
-  this.doc_mouse_up = function(e)
+  this.drag_menu = function(e, target)
   {
-    var model, list, li;
+    var modkey = rcube_event.get_modifier(e),
+      menu = $('#'+this.gui_objects.message_dragmenu);
 
-    if (this.message_list) {
-      if (!rcube_mouse_is_over(e, this.message_list.list))
-        this.message_list.blur();
-      list = this.message_list;
-      model = this.env.mailboxes;
-    }
-    else if (this.contact_list) {
-      if (!rcube_mouse_is_over(e, this.contact_list.list))
-        this.contact_list.blur();
-      list = this.contact_list;
-      model = this.env.address_sources;
-    }
-    else if (this.ksearch_value) {
-      this.ksearch_blur();
+    if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
+      var pos = rcube_event.get_mouse_pos(e);
+      this.env.drag_target = target;
+      menu.css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
+      return true;
     }
 
-    // handle mouse release when dragging
-    if (this.drag_active && model && this.env.last_folder_target) {
-      $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
-      this.command('moveto', model[this.env.last_folder_target].id);
-      this.env.last_folder_target = null;
-      list.draglayer.hide();
+    return false;
+  };
+
+  this.drag_menu_action = function(action)
+  {
+    var menu = $('#'+this.gui_objects.message_dragmenu);
+    if (menu) {
+      menu.hide();
     }
-    
-    // reset 'pressed' buttons
-    if (this.buttons_sel) {
-      for (var id in this.buttons_sel)
-        if (typeof id != 'function')
-          this.button_out(this.buttons_sel[id], id);
-      this.buttons_sel = {};
-    }
+    this.command(action, this.env.drag_target);
+    this.env.drag_target = null;
   };
 
   this.drag_start = function(list)
   {
-    var model = this.task == 'mail' ? this.env.mailboxes : this.env.address_sources;
+    var model = this.task == 'mail' ? this.env.mailboxes : this.env.contactfolders;
 
     this.drag_active = true;
+
     if (this.preview_timer)
       clearTimeout(this.preview_timer);
-    
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
+
     // save folderlist and folders location/sizes for droptarget calculation in drag_move()
     if (this.gui_objects.folderlist && model)
       {
@@ -1297,7 +1202,7 @@
       pos = list.offset();
       this.env.folderlist_coords = { x1:pos.left, y1:pos.top, x2:pos.left + list.width(), y2:pos.top + list.height() };
 
-      this.env.folder_coords = new Array();
+      this.env.folder_coords = [];
       for (var k in model) {
         if (li = this.get_folder_li(k)) {
           // only visible folders
@@ -1315,7 +1220,7 @@
   {
     this.drag_active = false;
     this.env.last_folder_target = null;
-    
+
     if (this.folder_auto_timer) {
       window.clearTimeout(this.folder_auto_timer);
       this.folder_auto_timer = null;
@@ -1330,7 +1235,7 @@
       }
     }
   };
-  
+
   this.drag_move = function(e)
   {
     if (this.gui_objects.folderlist && this.env.folder_coords) {
@@ -1338,8 +1243,8 @@
       var boffset = bw.ie ? -document.documentElement.scrollTop : this.initialBodyScrollTop;
       var moffset = this.initialListScrollTop-this.gui_objects.folderlist.parentNode.scrollTop;
       var toffset = -moffset-boffset;
-
       var li, div, pos, mouse;
+
       mouse = rcube_event.get_mouse_pos(e);
       pos = this.env.folderlist_coords;
       mouse.y += toffset;
@@ -1353,7 +1258,7 @@
         }
         return;
       }
-    
+
       // over the folders
       for (var k in this.env.folder_coords) {
         pos = this.env.folder_coords[k];
@@ -1361,16 +1266,16 @@
             && this.check_droptarget(k)) {
 
           li = this.get_folder_li(k);
-          div = $(li.getElementsByTagName("div")[0]);
+          div = $(li.getElementsByTagName('div')[0]);
 
           // if the folder is collapsed, expand it after 1sec and restart the drag & drop process.
           if (div.hasClass('collapsed')) {
             if (this.folder_auto_timer)
               window.clearTimeout(this.folder_auto_timer);
-            
+
             this.folder_auto_expand = k;
             this.folder_auto_timer = window.setTimeout(function() {
-                rcmail.command("collapse-folder", rcmail.folder_auto_expand);
+                rcmail.command('collapse-folder', rcmail.folder_auto_expand);
                 rcmail.drag_start(null);
               }, 1000);
           } else if (this.folder_auto_timer) {
@@ -1378,7 +1283,7 @@
             this.folder_auto_timer = null;
             this.folder_auto_expand = null;
           }
-          
+
           $(li).addClass('droptarget');
           this.env.last_folder_target = k;
           this.env.folder_coords[k].on = 1;
@@ -1392,49 +1297,91 @@
   };
 
   this.collapse_folder = function(id)
-    {
-    var div;
-    if ((li = this.get_folder_li(id)) &&
-        (div = $(li.getElementsByTagName("div")[0])) &&
-        (div.hasClass('collapsed') || div.hasClass('expanded')))
-      {
-      var ul = $(li.getElementsByTagName("ul")[0]);
-      if (div.hasClass('collapsed'))
-        {
-        ul.show();
-        div.removeClass('collapsed').addClass('expanded');
-        var reg = new RegExp('&'+urlencode(id)+'&');
-        this.set_env('collapsed_folders', this.env.collapsed_folders.replace(reg, ''));
-        }
-      else
-        {
-        ul.hide();
-        div.removeClass('expanded').addClass('collapsed');
-        this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+urlencode(id)+'&');
+  {
+    var li = this.get_folder_li(id),
+      div = $(li.getElementsByTagName('div')[0]);
 
-        // select parent folder if one of its childs is currently selected
-        if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
-          this.command('list', id);
-        }
+    if (!div || (!div.hasClass('collapsed') && !div.hasClass('expanded')))
+      return;
 
-      // Work around a bug in IE6 and IE7, see #1485309
-      if ((bw.ie6 || bw.ie7) &&
-          li.nextSibling &&
-          (li.nextSibling.getElementsByTagName("ul").length>0) &&
-          li.nextSibling.getElementsByTagName("ul")[0].style &&
-          (li.nextSibling.getElementsByTagName("ul")[0].style.display!='none'))
-        {
-          li.nextSibling.getElementsByTagName("ul")[0].style.display = 'none';
-          li.nextSibling.getElementsByTagName("ul")[0].style.display = '';
-        }
+    var ul = $(li.getElementsByTagName('ul')[0]);
 
-      this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
-      this.set_unread_count_display(id, false);
+    if (div.hasClass('collapsed')) {
+      ul.show();
+      div.removeClass('collapsed').addClass('expanded');
+      var reg = new RegExp('&'+urlencode(id)+'&');
+      this.set_env('collapsed_folders', this.env.collapsed_folders.replace(reg, ''));
+    }
+    else {
+      ul.hide();
+      div.removeClass('expanded').addClass('collapsed');
+      this.set_env('collapsed_folders', this.env.collapsed_folders+'&'+urlencode(id)+'&');
+
+      // select parent folder if one of its childs is currently selected
+      if (this.env.mailbox.indexOf(id + this.env.delimiter) == 0)
+        this.command('list', id);
+    }
+
+    // Work around a bug in IE6 and IE7, see #1485309
+    if (bw.ie6 || bw.ie7) {
+      var siblings = li.nextSibling ? li.nextSibling.getElementsByTagName('ul') : null;
+      if (siblings && siblings.length && (li = siblings[0]) && li.style && li.style.display != 'none') {
+        li.style.display = 'none';
+        li.style.display = '';
       }
     }
 
+    this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
+    this.set_unread_count_display(id, false);
+  };
+
+  this.doc_mouse_up = function(e)
+  {
+    var model, list, li;
+
+    if (this.message_list) {
+      if (!rcube_mouse_is_over(e, this.message_list.list.parentNode))
+        this.message_list.blur();
+      else
+        this.message_list.focus();
+      list = this.message_list;
+      model = this.env.mailboxes;
+    }
+    else if (this.contact_list) {
+      if (!rcube_mouse_is_over(e, this.contact_list.list.parentNode))
+        this.contact_list.blur();
+      else
+        this.contact_list.focus();
+      list = this.contact_list;
+      model = this.env.contactfolders;
+    }
+    else if (this.ksearch_value) {
+      this.ksearch_blur();
+    }
+
+    // handle mouse release when dragging
+    if (this.drag_active && model && this.env.last_folder_target) {
+      var target = model[this.env.last_folder_target];
+
+      $(this.get_folder_li(this.env.last_folder_target)).removeClass('droptarget');
+      this.env.last_folder_target = null;
+      list.draglayer.hide();
+
+      if (!this.drag_menu(e, target))
+        this.command('moveto', target);
+    }
+
+    // reset 'pressed' buttons
+    if (this.buttons_sel) {
+      for (var id in this.buttons_sel)
+        if (typeof id != 'function')
+          this.button_out(this.buttons_sel[id], id);
+      this.buttons_sel = {};
+    }
+  };
+
   this.click_on_list = function(e)
-    {
+  {
     if (this.gui_objects.qsearchbox)
       this.gui_objects.qsearchbox.blur();
 
@@ -1443,59 +1390,83 @@
     else if (this.contact_list)
       this.contact_list.focus();
 
-    return rcube_event.get_button(e) == 2 ? true : rcube_event.cancel(e);
-    };
+    return true;
+  };
 
   this.msglist_select = function(list)
-    {
+  {
     if (this.preview_timer)
       clearTimeout(this.preview_timer);
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
 
-    var selected = list.selection.length==1;
+    var selected = list.get_single_selection() != null;
 
     // Hide certain command buttons when Drafts folder is selected
-    if (this.env.mailbox == this.env.drafts_mailbox)
-      {
+    if (this.env.mailbox == this.env.drafts_mailbox) {
       this.enable_command('reply', 'reply-all', 'forward', false);
       this.enable_command('show', 'print', 'open', 'edit', 'download', 'viewsource', selected);
-      this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
-      }
-    else
-      {
+      this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
+    }
+    else {
       this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected);
-      this.enable_command('delete', 'moveto', 'mark', (list.selection.length > 0 ? true : false));
-      }
+      this.enable_command('delete', 'moveto', 'copy', 'mark', (list.selection.length > 0 ? true : false));
+    }
 
     // start timer for message preview (wait for double click)
     if (selected && this.env.contentframe && !list.multi_selecting)
       this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
     else if (this.env.contentframe)
       this.show_contentframe(false);
-    };
+  };
+
+  // This allow as to re-select selected message and display it in preview frame
+  this.msglist_click = function(list)
+  {
+    if (list.multi_selecting || !this.env.contentframe)
+      return;
+
+    if (list.get_single_selection() && window.frames && window.frames[this.env.contentframe]) {
+      if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)>=0) {
+        if (this.preview_timer)
+          clearTimeout(this.preview_timer);
+        if (this.preview_read_timer)
+          clearTimeout(this.preview_read_timer);
+        this.preview_timer = window.setTimeout(function(){ ref.msglist_get_preview(); }, 200);
+      }
+    }
+  };
 
   this.msglist_dbl_click = function(list)
-    {
-      if (this.preview_timer)
-        clearTimeout(this.preview_timer);
+  {
+    if (this.preview_timer)
+      clearTimeout(this.preview_timer);
+
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
 
     var uid = list.get_single_selection();
     if (uid && this.env.mailbox == this.env.drafts_mailbox)
       this.goto_url('compose', '_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
     else if (uid)
       this.show_message(uid, false, false);
-    };
+  };
 
   this.msglist_keypress = function(list)
-    {
+  {
     if (list.key_pressed == list.ENTER_KEY)
       this.command('show');
     else if (list.key_pressed == list.DELETE_KEY)
       this.command('delete');
     else if (list.key_pressed == list.BACKSPACE_KEY)
       this.command('delete');
+    else if (list.key_pressed == 33)
+      this.command('previouspage');
+    else if (list.key_pressed == 34)
+      this.command('nextpage');
     else
       list.shiftkey = false;
-    };
+  };
 
   this.msglist_get_preview = function()
   {
@@ -1505,13 +1476,21 @@
     else if (this.env.contentframe)
       this.show_contentframe(false);
   };
-  
+
+  this.msglist_expand = function(row)
+  {
+    if (this.env.messages[row.uid])
+      this.env.messages[row.uid].expanded = row.expanded;
+  };
+
   this.check_droptarget = function(id)
   {
     if (this.task == 'mail')
       return (this.env.mailboxes[id] && this.env.mailboxes[id].id != this.env.mailbox && !this.env.mailboxes[id].virtual);
     else if (this.task == 'addressbook')
-      return (id != this.env.source && this.env.address_sources[id] && !this.env.address_sources[id].readonly);
+      return (id != this.env.source && this.env.contactfolders[id] && !this.env.contactfolders[id].readonly &&
+        !(!this.env.source && this.env.contactfolders[id].group) &&
+        !(this.env.contactfolders[id].type == 'group' && this.env.contactfolders[id].id == this.env.group));
     else if (this.task == 'settings')
       return (id != this.env.folder);
   };
@@ -1521,20 +1500,226 @@
   /*********     (message) list functionality      *********/
   /*********************************************************/
 
+  this.init_message_row = function(row)
+  {
+    var self = this, uid = row.uid;
+
+    if (uid && this.env.messages[uid])
+      $.extend(row, this.env.messages[uid]);
+
+    // set eventhandler to message icon
+    if (this.env.subject_col != null && (row.icon = document.getElementById('msgicn'+row.uid))) {
+      row.icon._row = row.obj;
+      row.icon.onmousedown = function(e) { self.command('toggle_status', this); };
+    }
+
+    // set eventhandler to flag icon, if icon found
+    if (this.env.flagged_col != null && (row.flagged_icon = document.getElementById('flaggedicn'+row.uid))) {
+      row.flagged_icon._row = row.obj;
+      row.flagged_icon.onmousedown = function(e) { self.command('toggle_flag', this); };
+    }
+
+    var expando;
+    if (!row.depth && row.has_children && (expando = document.getElementById('rcmexpando'+row.uid))) {
+      expando.onmousedown = function(e) { return self.expand_message_row(e, uid); };
+    }
+
+    this.triggerEvent('insertrow', { uid:uid, row:row });
+  };
+
+  // create a table row in the message list
+  this.add_message_row = function(uid, cols, flags, attop)
+  {
+    if (!this.gui_objects.messagelist || !this.message_list)
+      return false;
+
+    if (this.message_list.background)
+      var tbody = this.message_list.background;
+    else
+      var tbody = this.gui_objects.messagelist.tBodies[0];
+
+    if (!this.env.messages[uid])
+      this.env.messages[uid] = {};
+
+    // merge flags over local message object
+    $.extend(this.env.messages[uid], {
+      deleted: flags.deleted?1:0,
+      replied: flags.replied?1:0,
+      unread: flags.unread?1:0,
+      forwarded: flags.forwarded?1:0,
+      flagged: flags.flagged?1:0,
+      has_children: flags.has_children?1:0,
+      depth: flags.depth?flags.depth:0,
+      unread_children: flags.unread_children,
+      parent_uid: flags.parent_uid
+    });
+
+    var tree = expando = '',
+      rows = this.message_list.rows,
+      rowcount = tbody.rows.length,
+      even = rowcount%2,
+      message = this.env.messages[uid],
+      css_class = 'message'
+        + (even ? ' even' : ' odd')
+        + (flags.unread ? ' unread' : '')
+        + (flags.deleted ? ' deleted' : '')
+        + (flags.flagged ? ' flagged' : '')
+        + (flags.unread_children && !flags.unread && !this.env.autoexpand_threads ? ' unroot' : '')
+        + (this.message_list.in_selection(uid) ? ' selected' : ''),
+      // for performance use DOM instead of jQuery here
+      row = document.createElement('tr'),
+      col = document.createElement('td');
+
+    row.id = 'rcmrow'+uid;
+    row.className = css_class;
+
+    // message status icon
+    var icon = this.env.messageicon;
+    if (!flags.unread && flags.unread_children > 0 && this.env.unreadchildrenicon)
+      icon = this.env.unreadchildrenicon;
+    else if (flags.deleted && this.env.deletedicon)
+      icon = this.env.deletedicon;
+    else if (flags.replied && this.env.repliedicon) {
+      if (flags.forwarded && this.env.forwardedrepliedicon)
+        icon = this.env.forwardedrepliedicon;
+      else
+        icon = this.env.repliedicon;
+    }
+    else if (flags.forwarded && this.env.forwardedicon)
+      icon = this.env.forwardedicon;
+    else if(flags.unread && this.env.unreadicon)
+      icon = this.env.unreadicon;
+
+    // threads
+    if (this.env.threading) {
+      // This assumes that div width is hardcoded to 15px,
+      var width = message.depth * 15;
+      if (message.depth) {
+        if ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
+            (!rows[message.parent_uid] || !rows[message.parent_uid].expanded)) {
+          row.style.display = 'none';
+          message.expanded = false;
+        }
+        else
+          message.expanded = true;
+        }
+      else if (message.has_children) {
+        if (typeof(message.expanded) == 'undefined' && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
+          message.expanded = true;
+        }
+      }
+
+      if (width)
+        tree += '<span id="rcmtab' + uid + '" class="branch" style="width:' + width + 'px;">&nbsp;&nbsp;</span>';
+
+      if (message.has_children && !message.depth)
+        expando = '<div id="rcmexpando' + uid + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">&nbsp;&nbsp;</div>';
+    }
+
+    tree += icon ? '<img id="msgicn'+uid+'" src="'+icon+'" alt="" class="msgicon" />' : '';
+
+    // first col is always there
+    col.className = 'threads';
+    col.innerHTML = expando;
+    row.appendChild(col);
+
+    // build subject link 
+    if (!bw.ie && cols.subject) {
+      var action = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show';
+      var uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid';
+      cols.subject = '<a href="./?_task=mail&_action='+action+'&_mbox='+urlencode(flags.mbox)+'&'+uid_param+'='+uid+'"'+
+        ' onclick="return rcube_event.cancel(event)">'+cols.subject+'</a>';
+    }
+
+    // add each submitted col
+    for (var n = 0; n < this.env.coltypes.length; n++) {
+      var c = this.env.coltypes[n];
+      col = document.createElement('td');
+      col.className = String(c).toLowerCase();
+
+      var html;
+      if (c=='flag') {
+        if (flags.flagged && this.env.flaggedicon)
+          html = '<img id="flaggedicn'+uid+'" src="'+this.env.flaggedicon+'" class="flagicon" alt="" />';
+        else if(!flags.flagged && this.env.unflaggedicon)
+          html = '<img id="flaggedicn'+uid+'" src="'+this.env.unflaggedicon+'" class="flagicon" alt="" />';
+      }
+      else if (c=='attachment')
+        html = flags.attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;';
+      else if (c=='subject')
+        html = tree + cols[c];
+      else
+        html = cols[c];
+
+      col.innerHTML = html;
+
+      row.appendChild(col);
+    }
+
+    this.message_list.insert_row(row, attop);
+
+    // remove 'old' row
+    if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize) {
+      var uid = this.message_list.get_last_row();
+      this.message_list.remove_row(uid);
+      this.message_list.clear_selection(uid);
+    }
+  };
+
+  // messages list handling in background (for performance)
+  this.offline_message_list = function(flag)
+  {
+    if (this.message_list)
+   	  this.message_list.set_background_mode(flag);
+  };
+
+  this.set_list_sorting = function(sort_col, sort_order)
+  {
+    // set table header class
+    $('#rcm'+this.env.sort_col).removeClass('sorted'+(this.env.sort_order.toUpperCase()));
+    if (sort_col)
+      $('#rcm'+sort_col).addClass('sorted'+sort_order);
+
+    this.env.sort_col = sort_col;
+    this.env.sort_order = sort_order;
+  };
+
+  this.set_list_options = function(cols, sort_col, sort_order, threads)
+  {
+    var update, add_url = '';
+
+    if (this.env.sort_col != sort_col || this.env.sort_order != sort_order) {
+      update = 1;
+      this.set_list_sorting(sort_col, sort_order);
+    }
+
+    if (this.env.threading != threads) {
+      update = 1;
+      add_url += '&_threads=' + threads;     
+    }
+
+    if (cols.join() != this.env.coltypes.join()) {
+      update = 1;
+      add_url += '&_cols=' + cols.join(',');
+    }
+
+    if (update)
+      this.list_mailbox('', '', sort_col+'_'+sort_order, add_url);
+  };
+
   // when user doble-clicks on a row
   this.show_message = function(id, safe, preview)
-    {
+  {
     if (!id) return;
-    
+
     var add_url = '';
     var action = preview ? 'preview': 'show';
     var target = window;
-    
-    if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
+
+    if (preview && this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
       target = window.frames[this.env.contentframe];
       add_url = '&_framed=1';
-      }
+    }
 
     if (safe)
       add_url = '&_safe=1';
@@ -1546,45 +1731,45 @@
     var url = '&_action='+action+'&_uid='+id+'&_mbox='+urlencode(this.env.mailbox)+add_url;
     if (action == 'preview' && String(target.location.href).indexOf(url) >= 0)
       this.show_contentframe(true);
-    else
-      {
+    else {
       this.set_busy(true, 'loading');
       target.location.href = this.env.comm_path+url;
 
       // mark as read and change mbox unread counter
-      if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread)
-        {
-        this.set_message(id, 'unread', false);
-        if (this.env.unread_counts[this.env.mailbox])
-          {
-          this.env.unread_counts[this.env.mailbox] -= 1;
-          this.set_unread_count(this.env.mailbox, this.env.unread_counts[this.env.mailbox], this.env.mailbox == 'INBOX');
+      if (action == 'preview' && this.message_list && this.message_list.rows[id] && this.message_list.rows[id].unread && this.env.preview_pane_mark_read >= 0) {
+        this.preview_read_timer = window.setTimeout(function() {
+          ref.set_message(id, 'unread', false);
+          ref.update_thread_root(id, 'read');
+          if (ref.env.unread_counts[ref.env.mailbox]) {
+            ref.env.unread_counts[ref.env.mailbox] -= 1;
+            ref.set_unread_count(ref.env.mailbox, ref.env.unread_counts[ref.env.mailbox], ref.env.mailbox == 'INBOX');
           }
-        }
+          if (ref.env.preview_pane_mark_read > 0)
+            ref.http_post('mark', '_uid='+id+'&_flag=read');
+        }, this.env.preview_pane_mark_read * 1000);
       }
-    };
+    }
+  };
 
   this.show_contentframe = function(show)
-    {
+  {
     var frm;
-    if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length)
-      {
-      if (!show && window.frames[this.env.contentframe])
-        {
+    if (this.env.contentframe && (frm = $('#'+this.env.contentframe)) && frm.length) {
+      if (!show && window.frames[this.env.contentframe]) {
         if (window.frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
           window.frames[this.env.contentframe].location.href = this.env.blankpage;
-        }
+      }
       else if (!bw.safari && !bw.konq)
         frm[show ? 'show' : 'hide']();
       }
 
     if (!show && this.busy)
       this.set_busy(false);
-    };
+  };
 
   // list a specific page
   this.list_page = function(page)
-    {
+  {
     if (page=='next')
       page = this.env.current_page+1;
     if (page=='last')
@@ -1593,96 +1778,94 @@
       page = this.env.current_page-1;
     if (page=='first' && this.env.current_page>1)
       page = 1;
-      
-    if (page > 0 && page <= this.env.pagecount)
-      {
+
+    if (page > 0 && page <= this.env.pagecount) {
       this.env.current_page = page;
-      
+
       if (this.task=='mail')
         this.list_mailbox(this.env.mailbox, page);
       else if (this.task=='addressbook')
-        this.list_contacts(this.env.source, page);
-      }
-    };
+        this.list_contacts(this.env.source, null, page);
+    }
+  };
 
   // list messages of a specific mailbox using filter
   this.filter_mailbox = function(filter)
-    {
-      var search;
-      if (this.gui_objects.qsearchbox)
-        search = this.gui_objects.qsearchbox.value;
-      
-      this.message_list.clear();
+  {
+    var search;
+    if (this.gui_objects.qsearchbox)
+      search = this.gui_objects.qsearchbox.value;
 
-      // reset vars
-      this.env.current_page = 1;
-      this.set_busy(true, 'searching');
-      this.http_request('search', '_filter='+filter
-    	    + (search ? '&_q='+urlencode(search) : '')
-    	    + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
-    }
+    this.message_list.clear();
 
+    // reset vars
+    this.env.current_page = 1;
+    this.set_busy(true, 'searching');
+    this.http_request('search', '_filter='+filter
+        + (search ? '&_q='+urlencode(search) : '')
+        + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : ''), true);
+  };
 
   // list messages of a specific mailbox
-  this.list_mailbox = function(mbox, page, sort)
-    {
-    var add_url = '';
+  this.list_mailbox = function(mbox, page, sort, add_url)
+  {
+    var url = '';
     var target = window;
 
     if (!mbox)
       mbox = this.env.mailbox;
 
+    if (add_url)
+      url += add_url;
+
     // add sort to url if set
     if (sort)
-      add_url += '&_sort=' + sort;
+      url += '&_sort=' + sort;
 
     // also send search request to get the right messages
     if (this.env.search_request)
-      add_url += '&_search='+this.env.search_request;
+      url += '&_search='+this.env.search_request;
 
     // set page=1 if changeing to another mailbox
-    if (!page && this.env.mailbox != mbox)
-      {
+    if (!page && this.env.mailbox != mbox) {
       page = 1;
       this.env.current_page = page;
       this.show_contentframe(false);
-      }
+    }
 
     if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
-      add_url += '&_refresh=1';
+      url += '&_refresh=1';
 
     // unselect selected messages
     this.last_selected = 0;
-    if (this.message_list)
+    if (this.message_list) {
       this.message_list.clear_selection();
-    
+      this.select_all_mode = false;
+    }
     this.select_folder(mbox, this.env.mailbox);
     this.env.mailbox = mbox;
 
     // load message list remotely
-    if (this.gui_objects.messagelist)
-      {
-      this.list_mailbox_remote(mbox, page, add_url);
+    if (this.gui_objects.messagelist) {
+      this.list_mailbox_remote(mbox, page, url);
       return;
-      }
-    
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
+    }
+
+    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
       target = window.frames[this.env.contentframe];
-      add_url += '&_framed=1';
-      }
+      url += '&_framed=1';
+    }
 
     // load message list to target frame/window
-    if (mbox)
-      {
+    if (mbox) {
       this.set_busy(true, 'loading');
-      target.location.href = this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+add_url;
-      }
-    };
+      target.location.href = this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+url;
+    }
+  };
 
   // send remote request to load message list
   this.list_mailbox_remote = function(mbox, page, add_url)
-    {
+  {
     // clear message list first
     this.message_list.clear();
 
@@ -1690,54 +1873,166 @@
     var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : '');
     this.set_busy(true, 'loading');
     this.http_request('list', url+add_url, true);
-    };
+  };
 
-  this.expunge_mailbox = function(mbox)
-    {
-    var lock = false;
-    var add_url = '';
-    
-    // lock interface if it's the active mailbox
-    if (mbox == this.env.mailbox)
-       {
-       lock = true;
-       this.set_busy(true, 'loading');
-       add_url = '&_reload=1';
-       }
-
-    // send request to server
-    var url = '_mbox='+urlencode(mbox);
-    this.http_post('expunge', url+add_url, lock);
-    };
-
-  this.purge_mailbox = function(mbox)
-    {
-    var lock = false;
-    var add_url = '';
-    
-    if (!confirm(this.get_label('purgefolderconfirm')))
-      return false;
-    
-    // lock interface if it's the active mailbox
-    if (mbox == this.env.mailbox)
-       {
-       lock = true;
-       this.set_busy(true, 'loading');
-       add_url = '&_reload=1';
-       }
-
-    // send request to server
-    var url = '_mbox='+urlencode(mbox);
-    this.http_post('purge', url+add_url, lock);
-    return true;
-    };
-
-  // test if purge command is allowed
-  this.purge_mailbox_test = function()
+  // expand all threads with unread children
+  this.expand_unread = function()
   {
-    return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox 
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) 
-      || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
+    var tbody = this.gui_objects.messagelist.tBodies[0];
+    var new_row = tbody.firstChild;
+    var r;
+
+    while (new_row) {
+      if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid])
+	    && r.unread_children) {
+	    this.message_list.expand_all(r);
+	    var expando = document.getElementById('rcmexpando' + r.uid);
+	    if (expando)
+	      expando.className = 'expanded';
+	      this.set_unread_children(r.uid);
+      }
+      new_row = new_row.nextSibling;
+    }
+    return false;
+  };
+
+  // thread expanding/collapsing handler    
+  this.expand_message_row = function(e, uid)
+  {
+    var row = this.message_list.rows[uid];
+
+    // handle unread_children mark
+    row.expanded = !row.expanded;
+    this.set_unread_children(uid);
+    row.expanded = !row.expanded;
+
+    this.message_list.expand_row(e, uid);
+  };
+
+  // message list expanding
+  this.expand_threads = function()
+  {    
+    if (!this.env.threading || !this.env.autoexpand_threads || !this.message_list)
+      return;
+
+    switch (this.env.autoexpand_threads) {
+      case 2: this.expand_unread(); break;
+      case 1: this.message_list.expand_all(); break;
+    }
+    //  this.message_list.expand(null);
+  };
+
+  // update parent in a thread
+  this.update_thread_root = function(uid, flag)
+  {
+    if (!this.env.threading)
+      return;
+
+    var root = this.message_list.find_root(uid);
+
+    if (uid == root)
+      return;
+
+    var p = this.message_list.rows[root];
+
+    if (flag == 'read' && p.unread_children) {
+      p.unread_children--;
+    } else if (flag == 'unread' && p.has_children) {
+      // unread_children may be undefined
+      p.unread_children = p.unread_children ? p.unread_children + 1 : 1;
+    } else {
+      return;
+    }
+
+    this.set_message_icon(root);
+    this.set_unread_children(root);
+  };
+
+  // update thread indicators for all messages in a thread below the specified message
+  // return number of removed/added root level messages
+  this.update_thread = function (uid)
+  {
+    if (!this.env.threading)
+      return 0;
+
+    var rows = this.message_list.rows;
+    var row = rows[uid]
+    var depth = rows[uid].depth;
+    var r, parent, count = 0;
+    var roots = [];
+
+    if (!row.depth) // root message: decrease roots count
+      count--;
+    else if (row.unread) {
+      // update unread_children for thread root
+      var parent = this.message_list.find_root(uid);
+      rows[parent].unread_children--;
+      this.set_unread_children(parent);
+    }
+
+    parent = row.parent_uid;
+
+    // childrens
+    row = row.obj.nextSibling;
+    while (row) {
+      if (row.nodeType == 1 && (r = rows[row.uid])) {
+	    if (!r.depth || r.depth <= depth)
+	      break;
+
+	    r.depth--; // move left
+	    $('#rcmtab'+r.uid).width(r.depth * 15);
+        if (!r.depth) { // a new root
+	      count++; // increase roots count
+	      r.parent_uid = 0;
+	      if (r.has_children) {
+	        // replace 'leaf' with 'collapsed'
+	        $('#rcmrow'+r.uid+' '+'.leaf:first')
+              .attr('id', 'rcmexpando' + r.uid)
+	          .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
+    	      .bind('mousedown', {uid:r.uid, p:this},
+	            function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
+
+	        r.unread_children = 0;
+	        roots[roots.length] = r;
+	      }
+	      // show if it was hidden
+	      if (r.obj.style.display == 'none')
+	        $(r.obj).show();
+	    }
+	    else {
+	      if (r.depth == depth)
+	        r.parent_uid = parent;
+	      if (r.unread && roots.length)
+	        roots[roots.length-1].unread_children++;
+	    }
+	  }
+	  row = row.nextSibling;
+    }
+
+    // update unread_children for roots
+    for (var i=0; i<roots.length; i++)
+      this.set_unread_children(roots[i].uid);
+
+    return count;
+  };
+
+  this.delete_excessive_thread_rows = function()
+  {
+    var rows = this.message_list.rows;    
+    var tbody = this.message_list.list.tBodies[0];
+    var row = tbody.firstChild;
+    var cnt = this.env.pagesize + 1;
+
+    while (row) {
+      if (row.nodeType == 1 && (r = rows[row.uid])) {
+	    if (!r.depth && cnt)
+	      cnt--;
+
+        if (!cnt)
+	      this.message_list.remove_row(row.uid);
+	  }
+	  row = row.nextSibling;
+    }
   };
 
   // set message icon
@@ -1748,40 +2043,40 @@
 
     if (!rows[uid])
       return false;
-
-    if (rows[uid].deleted && this.env.deletedicon)
+    if (!rows[uid].unread && rows[uid].unread_children && this.env.unreadchildrenicon) {
+      icn_src = this.env.unreadchildrenicon;
+    }
+    else if (rows[uid].deleted && this.env.deletedicon)
       icn_src = this.env.deletedicon;
-    else if (rows[uid].replied && this.env.repliedicon)
-      {
+    else if (rows[uid].replied && this.env.repliedicon) {
       if (rows[uid].forwarded && this.env.forwardedrepliedicon)
         icn_src = this.env.forwardedrepliedicon;
       else
         icn_src = this.env.repliedicon;
-      }
+    }
     else if (rows[uid].forwarded && this.env.forwardedicon)
       icn_src = this.env.forwardedicon;
     else if (rows[uid].unread && this.env.unreadicon)
       icn_src = this.env.unreadicon;
     else if (this.env.messageicon)
       icn_src = this.env.messageicon;
-      
+
     if (icn_src && rows[uid].icon)
       rows[uid].icon.src = icn_src;
 
     icn_src = '';
-    
+
     if (rows[uid].flagged && this.env.flaggedicon)
       icn_src = this.env.flaggedicon;
     else if (!rows[uid].flagged && this.env.unflaggedicon)
       icn_src = this.env.unflaggedicon;
-
     if (rows[uid].flagged_icon && icn_src)
       rows[uid].flagged_icon.src = icn_src;
-  }
+  };
 
   // set message status
   this.set_message_status = function(uid, flag, status)
-    {
+  {
     var rows = this.message_list.rows;
 
     if (!rows[uid]) return false;
@@ -1797,59 +2092,85 @@
     else if (flag == 'flagged')
       rows[uid].flagged = status;
 
-    this.env.messages[uid] = rows[uid];
-    }
+//    this.env.messages[uid] = rows[uid];
+  };
 
   // set message row status, class and icon
   this.set_message = function(uid, flag, status)
-    {
+  {
     var rows = this.message_list.rows;
 
     if (!rows[uid]) return false;
-    
+
     if (flag)
       this.set_message_status(uid, flag, status);
-    
+
     var rowobj = $(rows[uid].obj);
-    if (rows[uid].unread && rows[uid].classname.indexOf('unread')<0)
-      {
-      rows[uid].classname += ' unread';
+
+    if (rows[uid].unread && !rowobj.hasClass('unread'))
       rowobj.addClass('unread');
-      }
-    else if (!rows[uid].unread && rows[uid].classname.indexOf('unread')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+    else if (!rows[uid].unread && rowobj.hasClass('unread'))
       rowobj.removeClass('unread');
-      }
-    
-    if (rows[uid].deleted && rows[uid].classname.indexOf('deleted')<0)
-      {
-      rows[uid].classname += ' deleted';
+
+    if (rows[uid].deleted && !rowobj.hasClass('deleted'))
       rowobj.addClass('deleted');
-      }
-    else if (!rows[uid].deleted && rows[uid].classname.indexOf('deleted')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
+    else if (!rows[uid].deleted && rowobj.hasClass('deleted'))
       rowobj.removeClass('deleted');
-      }
 
-    if (rows[uid].flagged && rows[uid].classname.indexOf('flagged')<0)
-      {
-      rows[uid].classname += ' flagged';
+    if (rows[uid].flagged && !rowobj.hasClass('flagged'))
       rowobj.addClass('flagged');
-      }
-    else if (!rows[uid].flagged && rows[uid].classname.indexOf('flagged')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*flagged/, '');
+    else if (!rows[uid].flagged && rowobj.hasClass('flagged'))
       rowobj.removeClass('flagged');
-      }
 
+    this.set_unread_children(uid);
     this.set_message_icon(uid);
+  };
+
+  // sets unroot (unread_children) class of parent row
+  this.set_unread_children = function(uid)
+  {
+    var row = this.message_list.rows[uid];
+
+    if (row.parent_uid || !row.has_children)
+      return;
+
+    if (!row.unread && row.unread_children && !row.expanded)
+      $(row.obj).addClass('unroot');
+    else
+      $(row.obj).removeClass('unroot');
+  };
+
+  // copy selected messages to the specified mailbox
+  this.copy_messages = function(mbox)
+  {
+    // exit if current or no mailbox specified or if selection is empty
+    if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
+      return;
+
+    var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+    var a_uids = [];
+
+    if (this.env.uid)
+      a_uids[0] = this.env.uid;
+    else {
+      var selection = this.message_list.get_selection();
+      var id;
+      for (var n=0; n<selection.length; n++) {
+        id = selection[n];
+        a_uids[a_uids.length] = id;
+      }
     }
+
+    // send request to server
+    this.http_post('copy', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, false);
+  };
 
   // move selected messages to the specified mailbox
   this.move_messages = function(mbox)
-    {
+  {
+    if (mbox && typeof mbox == 'object')
+      mbox = mbox.id;
+
     // exit if current or no mailbox specified or if selection is empty
     if (!mbox || mbox == this.env.mailbox || (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length)))
       return;
@@ -1858,11 +2179,10 @@
     var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
 
     // show wait message
-    if (this.env.action=='show')
-      {
+    if (this.env.action=='show') {
       lock = true;
       this.set_busy(true, 'movingmessage');
-      }
+    }
     else
       this.show_contentframe(false);
 
@@ -1870,63 +2190,72 @@
     this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', false);
 
     this._with_selected_messages('moveto', lock, add_url);
-    };
+  };
 
   // delete selected messages from the current mailbox
   this.delete_messages = function()
-    {
-    var selection = this.message_list ? this.message_list.get_selection() : new Array();
+  {
+    var selection = this.message_list ? $.merge([], this.message_list.get_selection()) : [];
 
     // exit if no mailbox specified or if selection is empty
     if (!this.env.uid && !selection.length)
       return;
 
+    // also select childs of collapsed rows
+    for (var uid, i=0; i < selection.length; i++) {
+      uid = selection[i];
+      if (this.message_list.rows[uid].has_children && !this.message_list.rows[uid].expanded)
+        this.message_list.select_childs(uid);
+    }
+
     // if config is set to flag for deletion
-    if (this.env.flag_for_deletion)
+    if (this.env.flag_for_deletion) {
       this.mark_message('delete');
+      return false;
+    }
     // if there isn't a defined trash mailbox or we are in it
-    else if (!this.env.trash_mailbox || String(this.env.mailbox).toLowerCase() == String(this.env.trash_mailbox).toLowerCase()) 
+    else if (!this.env.trash_mailbox || this.env.mailbox == this.env.trash_mailbox) 
       this.permanently_remove_messages();
     // if there is a trash mailbox defined and we're not currently in it
     else {
       // if shift was pressed delete it immediately
-      if (this.message_list && this.message_list.shiftkey)
-        {
+      if (this.message_list && this.message_list.shiftkey) {
         if (confirm(this.get_label('deletemessagesconfirm')))
           this.permanently_remove_messages();
-        }
+      }
       else
         this.move_messages(this.env.trash_mailbox);
-      }
+    }
+
+    return true;
   };
 
   // delete the selected messages permanently
   this.permanently_remove_messages = function()
-    {
+  {
     // exit if no mailbox specified or if selection is empty
     if (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))
       return;
-      
+
     this.show_contentframe(false);
     this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
-    };
+  };
 
-  // Send a specifc request with UIDs of all selected messages
+  // Send a specifc moveto/delete request with UIDs of all selected messages
   // @private
-  this._with_selected_messages = function(action, lock, add_url, remove)
+  this._with_selected_messages = function(action, lock, add_url)
   {
-    var a_uids = new Array();
+    var a_uids = [], count = 0;
 
     if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else
-    {
+    else {
       var selection = this.message_list.get_selection();
-      var rows = this.message_list.rows;
       var id;
       for (var n=0; n<selection.length; n++) {
         id = selection[n];
         a_uids[a_uids.length] = id;
+        count += this.update_thread(id);
         this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
       }
       // make sure there are no selected rows
@@ -1941,34 +2270,38 @@
     if (this.env.display_next && this.env.next_uid)
       add_url += '&_next_uid='+this.env.next_uid;
 
+    if (count < 0)
+      add_url += '&_count='+(count*-1);
+    else if (count > 0) 
+      // remove threads from the end of the list
+      this.delete_excessive_thread_rows();
+
+    add_url += '&_uid='+this.uids_to_list(a_uids);
+
     // send request to server
-    this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+    this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
   };
 
   // set a specific flag to one or more messages
   this.mark_message = function(flag, uid)
-    {
-    var a_uids = new Array();
-    var r_uids = new Array();
-    var selection = this.message_list ? this.message_list.get_selection() : new Array();
+  {
+    var a_uids = [], r_uids = [],
+      selection = this.message_list ? this.message_list.get_selection() : [];
 
     if (uid)
       a_uids[0] = uid;
     else if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else if (this.message_list)
-      {
-      for (var n=0; n<selection.length; n++)
-        {
+    else if (this.message_list) {
+      for (var n=0; n<selection.length; n++) {
           a_uids[a_uids.length] = selection[n];
-        }
       }
+    }
 
     if (!this.message_list)
       r_uids = a_uids;
     else
-      for (var id, n=0; n<a_uids.length; n++)
-      {
+      for (var id, n=0; n<a_uids.length; n++) {
         id = a_uids[n];
         if ((flag=='read' && this.message_list.rows[id].unread) 
             || (flag=='unread' && !this.message_list.rows[id].unread)
@@ -1982,11 +2315,10 @@
       }
 
     // nothing to do
-    if (!r_uids.length)
+    if (!r_uids.length && !this.select_all_mode)
       return;
 
-    switch (flag)
-      {
+    switch (flag) {
         case 'read':
         case 'unread':
           this.toggle_read_status(flag, r_uids);
@@ -1999,8 +2331,8 @@
         case 'unflagged':
           this.toggle_flagged_status(flag, a_uids);
           break;
-      }
-    };
+    }
+  };
 
   // set class to read/unread
   this.toggle_read_status = function(flag, a_uids)
@@ -2009,7 +2341,10 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
+
+    for (var i=0; i<a_uids.length; i++)
+      this.update_thread_root(a_uids[i], flag);
   };
 
   // set image to flagged or unflagged
@@ -2019,16 +2354,15 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
   };
-  
+
   // mark all message rows as deleted/undeleted
   this.toggle_delete_status = function(a_uids)
   {
-    var rows = this.message_list ? this.message_list.rows : new Array();
-    
-    if (a_uids.length==1)
-    {
+    var rows = this.message_list ? this.message_list.rows : [];
+
+    if (a_uids.length==1) {
       if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
         this.flag_as_deleted(a_uids);
       else
@@ -2036,25 +2370,21 @@
 
       return true;
     }
-    
+
     var all_deleted = true;
-    for (var i=0; i<a_uids.length; i++)
-    {
+    for (var uid, i=0; i<a_uids.length; i++) {
       uid = a_uids[i];
-      if (rows[uid]) {
-        if (!rows[uid].deleted)
-        {
-          all_deleted = false;
-          break;
-        }
+      if (rows[uid] && !rows[uid].deleted) {
+        all_deleted = false;
+        break;
       }
     }
-    
+
     if (all_deleted)
       this.flag_as_undeleted(a_uids);
     else
       this.flag_as_deleted(a_uids);
-    
+
     return true;
   };
 
@@ -2063,39 +2393,48 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'deleted', false);
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete');
     return true;
   };
 
   this.flag_as_deleted = function(a_uids)
   {
-    var add_url = '';
-    var r_uids = new Array();
-    var rows = this.message_list ? this.message_list.rows : new Array();
-    
-    for (var i=0; i<a_uids.length; i++)
-      {
+    var add_url = '',
+      r_uids = [],
+      rows = this.message_list ? this.message_list.rows : [],
+      count = 0;
+
+    for (var i=0; i<a_uids.length; i++) {
       uid = a_uids[i];
-      if (rows[uid])
-        {
+      if (rows[uid]) {
         if (rows[uid].unread)
           r_uids[r_uids.length] = uid;
 
-	if (this.env.skip_deleted)
+	    if (this.env.skip_deleted) {
+	      count += this.update_thread(uid);
           this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
-	else
-	  this.set_message(uid, 'deleted', true);
-        }
+	    }
+	    else
+	      this.set_message(uid, 'deleted', true);
       }
+    }
 
     // make sure there are no selected rows
-    if (this.env.skip_deleted && !this.env.display_next && this.message_list)
-      this.message_list.clear_selection();
+    if (this.env.skip_deleted && this.message_list) {
+      if(!this.env.display_next)
+        this.message_list.clear_selection();
+      if (count < 0)
+        add_url += '&_count='+(count*-1);
+      else if (count > 0) 
+        // remove threads from the end of the list
+        this.delete_excessive_thread_rows();
+    }
 
     add_url = '&_from='+(this.env.action ? this.env.action : '');
-    
+
+    // ??
     if (r_uids.length)
-      add_url += '&_ruid='+r_uids.join(',');
+      add_url += '&_ruid='+this.uids_to_list(r_uids);
 
     if (this.env.skip_deleted) {
       // also send search request to get the right messages 
@@ -2104,8 +2443,8 @@
       if (this.env.display_next && this.env.next_uid)
         add_url += '&_next_uid='+this.env.next_uid;
     }
-    
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
+
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);
     return true;  
   };
 
@@ -2113,22 +2452,77 @@
   // argument should be a coma-separated list of uids
   this.flag_deleted_as_read = function(uids)
   {
-    var icn_src;
-    var rows = this.message_list ? this.message_list.rows : new Array();
-    var str = String(uids);
-    var a_uids = new Array();
+    var icn_src, uid,
+      rows = this.message_list ? this.message_list.rows : [],
+      str = String(uids),
+      a_uids = str.split(',');
 
-    a_uids = str.split(',');
-
-    for (var uid, i=0; i<a_uids.length; i++)
-      {
+    for (var i=0; i<a_uids.length; i++) {
       uid = a_uids[i];
       if (rows[uid])
         this.set_message(uid, 'unread', false);
-      }
+    }
   };
-  
-  
+
+  // Converts array of message UIDs to comma-separated list for use in URL
+  // with select_all mode checking
+  this.uids_to_list = function(uids)
+  {
+    return this.select_all_mode ? '*' : uids.join(',');
+  };
+
+
+  /*********************************************************/
+  /*********       mailbox folders methods         *********/
+  /*********************************************************/
+
+  this.expunge_mailbox = function(mbox)
+  {
+    var lock = false;
+    var add_url = '';
+
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox) {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+     }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('expunge', url+add_url, lock);
+  };
+
+  this.purge_mailbox = function(mbox)
+  {
+    var lock = false;
+    var add_url = '';
+
+    if (!confirm(this.get_label('purgefolderconfirm')))
+      return false;
+
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox) {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+     }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('purge', url+add_url, lock);
+    return true;
+  };
+
+  // test if purge command is allowed
+  this.purge_mailbox_test = function()
+  {
+    return (this.env.messagecount && (this.env.mailbox == this.env.trash_mailbox || this.env.mailbox == this.env.junk_mailbox 
+      || this.env.mailbox.match('^' + RegExp.escape(this.env.trash_mailbox) + RegExp.escape(this.env.delimiter)) 
+      || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
+  };
+
+
   /*********************************************************/
   /*********           login form methods          *********/
   /*********************************************************/
@@ -2144,7 +2538,7 @@
       passwd.focus();
       return rcube_event.cancel(e);
     }
-    
+
     return true;
   };
 
@@ -2152,10 +2546,58 @@
   /*********************************************************/
   /*********        message compose methods        *********/
   /*********************************************************/
-  
+
+  // init message compose form: set focus and eventhandlers
+  this.init_messageform = function()
+  {
+    if (!this.gui_objects.messageform)
+      return false;
+
+    //this.messageform = this.gui_objects.messageform;
+    var input_from = $("[name='_from']");
+    var input_to = $("[name='_to']");
+    var input_subject = $("input[name='_subject']");
+    var input_message = $("[name='_message']").get(0);
+    var html_mode = $("input[name='_is_html']").val() == '1';
+
+    // init live search events
+    this.init_address_input_events(input_to);
+    this.init_address_input_events($("[name='_cc']"));
+    this.init_address_input_events($("[name='_bcc']"));
+
+    if (!html_mode) {
+      // add signature according to selected identity
+      // if we have HTML editor, signature is added in callback
+      if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == '') {
+        this.change_identity(input_from[0]);
+      }
+      this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
+    }
+
+    if (input_to.val() == '')
+      input_to.focus();
+    else if (input_subject.val() == '')
+      input_subject.focus();
+    else if (input_message && !html_mode)
+      input_message.focus();
+
+    // get summary of all field values
+    this.compose_field_hash(true);
+
+    // start the auto-save timer
+    this.auto_save_start();
+  };
+
+  this.init_address_input_events = function(obj)
+  {
+    var handler = function(e){ return ref.ksearch_keypress(e,this); };
+    obj.bind((bw.safari || bw.ie ? 'keydown' : 'keypress'), handler);
+    obj.attr('autocomplete', 'off');
+  };
+
   // checks the input fields before sending a message
   this.check_compose_input = function()
-    {
+  {
     // check input fields
     var input_to = $("[name='_to']");
     var input_cc = $("[name='_cc']");
@@ -2165,21 +2607,19 @@
     var input_message = $("[name='_message']");
 
     // check sender (if have no identities)
-    if (input_from.attr('type') == 'text' && !rcube_check_email(input_from.val(), true))
-      {
+    if (input_from.attr('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
       alert(this.get_label('nosenderwarning'));
       input_from.focus();
       return false;
-      }
+    }
 
     // check for empty recipient
     var recipients = input_to.val() ? input_to.val() : (input_cc.val() ? input_cc.val() : input_bcc.val());
-    if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true))
-      {
+    if (!rcube_check_email(recipients.replace(/^\s+/, '').replace(/[\s,;]+$/, ''), true)) {
       alert(this.get_label('norecipientwarning'));
       input_to.focus();
       return false;
-      }
+    }
 
     // check if all files has been uploaded
     for (var key in this.env.attachments) {
@@ -2188,38 +2628,32 @@
         return false;
       }
     }
-    
+
     // display localized warning for missing subject
-    if (input_subject.val() == '')
-      {
+    if (input_subject.val() == '') {
       var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));
 
       // user hit cancel, so don't send
-      if (!subject && subject !== '')
-        {
+      if (!subject && subject !== '') {
         input_subject.focus();
         return false;
-        }
-      else
-        {
-        input_subject.val((subject ? subject : this.get_label('nosubject')));
-        }
       }
+      else
+        input_subject.val((subject ? subject : this.get_label('nosubject')));
+    }
 
     // check for empty body
     if ((!window.tinyMCE || !tinyMCE.get(this.env.composebody))
-	&& input_message.val() == '' && !confirm(this.get_label('nobodywarning')))
-      {
+        && input_message.val() == '' && !confirm(this.get_label('nobodywarning'))) {
       input_message.focus();
       return false;
-      }
+    }
     else if (window.tinyMCE && tinyMCE.get(this.env.composebody)
-	&& !tinyMCE.get(this.env.composebody).getContent()
-	&& !confirm(this.get_label('nobodywarning')))
-      {
+        && !tinyMCE.get(this.env.composebody).getContent()
+        && !confirm(this.get_label('nobodywarning'))) {
       tinyMCE.get(this.env.composebody).focus();
       return false;
-      }
+    }
 
     // Apply spellcheck changes if spell checker is active
     this.stop_spellchecking();
@@ -2229,56 +2663,56 @@
       tinyMCE.triggerSave();
 
     return true;
-    };
+  };
 
   this.stop_spellchecking = function()
-    {
+  {
     if (this.env.spellcheck && !this.spellcheck_ready) {
       $(this.env.spellcheck.spell_span).trigger('click');
       this.set_spellcheck_state('ready');
-      }
-    };
+    }
+  };
 
   this.display_spellcheck_controls = function(vis)
-    {
+  {
     if (this.env.spellcheck) {
       // stop spellchecking process
       if (!vis)
-	this.stop_spellchecking();
+        this.stop_spellchecking();
 
       $(this.env.spellcheck.spell_container).css('visibility', vis ? 'visible' : 'hidden');
-      }
-    };
+    }
+  };
 
   this.set_spellcheck_state = function(s)
-    {
+  {
     this.spellcheck_ready = (s == 'ready' || s == 'no_error_found');
     this.enable_command('spellcheck', this.spellcheck_ready);
-    };
+  };
 
   this.set_draft_id = function(id)
-    {
+  {
     $("input[name='_draft_saveid']").val(id);
-    };
+  };
 
   this.auto_save_start = function()
-    {
+  {
     if (this.env.draft_autosave)
       this.save_timer = self.setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
 
     // Unlock interface now that saving is complete
     this.busy = false;
-    };
+  };
 
   this.compose_field_hash = function(save)
-    {
+  {
     // check input fields
     var value_to = $("[name='_to']").val();
     var value_cc = $("[name='_cc']").val();
     var value_bcc = $("[name='_bcc']").val();
     var value_subject = $("[name='_subject']").val();
     var str = '';
-    
+
     if (value_to)
       str += value_to+':';
     if (value_cc)
@@ -2287,7 +2721,7 @@
       str += value_bcc+':';
     if (value_subject)
       str += value_subject+':';
-    
+
     var editor = tinyMCE.get(this.env.composebody);
     if (editor)
       str += editor.getContent();
@@ -2302,8 +2736,8 @@
       this.cmp_hash = str;
 
     return str;
-    };
-    
+  };
+
   this.change_identity = function(obj, show_sig)
   {
     if (!obj || !obj.options)
@@ -2316,11 +2750,12 @@
     var input_message = $("[name='_message']");
     var message = input_message.val();
     var is_html = ($("input[name='_is_html']").val() == '1');
+    var sig_separator = this.env.sig_above && (this.env.compose_mode == 'reply' || this.env.compose_mode == 'forward') ? '---' : '-- ';
     var sig, cursor_pos, p = -1;
 
     if (!this.env.identity)
       this.env.identity = id
-  
+
     // enable manual signature insert
     if (this.env.signatures && this.env.signatures[id])
       this.enable_command('insert-sig', true);
@@ -2331,20 +2766,22 @@
       // remove the 'old' signature
       if (show_sig && this.env.identity && this.env.signatures && this.env.signatures[this.env.identity]) {
         sig = this.env.signatures[this.env.identity].is_html ? this.env.signatures[this.env.identity].plain_text : this.env.signatures[this.env.identity].text;
-        
-        if (sig.indexOf('-- ') != 0)
-          sig = '-- \n'+sig;
+        sig = sig.replace(/\r\n/, '\n');
+
+        if (!sig.match(/^--[ -]\n/))
+          sig = sig_separator + '\n' + sig;
 
         p = this.env.sig_above ? message.indexOf(sig) : message.lastIndexOf(sig);
         if (p >= 0)
           message = message.substring(0, p) + message.substring(p+sig.length, message.length);
       }
-
       // add the new signature string
       if (show_sig && this.env.signatures && this.env.signatures[id]) {
         sig = this.env.signatures[id]['is_html'] ? this.env.signatures[id]['plain_text'] : this.env.signatures[id]['text'];
-        if (sig.indexOf('-- ') != 0)
-          sig = '-- \n'+sig;
+        sig = sig.replace(/\r\n/, '\n');
+
+        if (!sig.match(/^--[ -]\n/))
+          sig = sig_separator + '\n' + sig;
 
         if (this.env.sig_above) {
           if (p >= 0) { // in place of removed signature
@@ -2370,11 +2807,11 @@
         cursor_pos = this.env.top_posting ? 0 : message.length;
 
       input_message.val(message);
-      
+
       // move cursor before the signature
       this.set_caret_pos(input_message.get(0), cursor_pos);
     }
-    else if (is_html && this.env.signatures) {  // html
+    else if (show_sig && this.env.signatures) {  // html
       var editor = tinyMCE.get(this.env.composebody);
       var sigElem = editor.dom.get('_rc_sig');
 
@@ -2382,14 +2819,14 @@
       if (!sigElem) {
         var body = editor.getBody();
         var doc = editor.getDoc();
-          
+
         sigElem = doc.createElement('div');
         sigElem.setAttribute('id', '_rc_sig');
-          
+
         if (this.env.sig_above) {
           // if no existing sig and top posting then insert at caret pos
           editor.getWin().focus(); // correct focus in IE
-            
+
           var node = editor.selection.getNode();
           if (node.nodeName == 'BODY') {
             // no real focus, insert at start
@@ -2412,13 +2849,13 @@
       if (this.env.signatures[id]) {
         if (this.env.signatures[id].is_html) {
           sig = this.env.signatures[id].text;
-          if (this.env.signatures[id].plain_text.indexOf('-- ') != 0)
-            sig = '-- <br />' + sig;
+          if (!this.env.signatures[id].plain_text.match(/^--[ -]\r?\n/))
+            sig = sig_separator + '<br />' + sig;
         }
         else {
           sig = this.env.signatures[id].text;
-          if (sig.indexOf('-- ') != 0)
-            sig = '-- \n' + sig;
+          if (!sig.match(/^--[ -]\r?\n/))
+            sig = sig_separator + '\n' + sig;
           sig = '<pre>' + sig + '</pre>';
         }
 
@@ -2431,63 +2868,57 @@
   };
 
   this.show_attachment_form = function(a)
-    {
+  {
     if (!this.gui_objects.uploadbox)
       return false;
-      
+
     var elm, list;
-    if (elm = this.gui_objects.uploadbox)
-      {
-      if (a && (list = this.gui_objects.attachmentlist))
-        {
+    if (elm = this.gui_objects.uploadbox) {
+      if (a && (list = this.gui_objects.attachmentlist)) {
         var pos = $(list).offset();
         elm.style.top = (pos.top + list.offsetHeight + 10) + 'px';
         elm.style.left = pos.left + 'px';
-        }
-      
-      elm.style.visibility = a ? 'visible' : 'hidden';
       }
-      
+
+      $(elm).toggle();
+    }
+
     // clear upload form
     try {
       if (!a && this.gui_objects.attachmentform != this.gui_objects.messageform)
         this.gui_objects.attachmentform.reset();
     }
     catch(e){}  // ignore errors
-    
+
     return true;
-    };
+  };
 
   // upload attachment file
   this.upload_file = function(form)
-    {
+  {
     if (!form)
       return false;
-      
+
     // get file input fields
     var send = false;
     for (var n=0; n<form.elements.length; n++)
-      if (form.elements[n].type=='file' && form.elements[n].value)
-        {
+      if (form.elements[n].type=='file' && form.elements[n].value) {
         send = true;
         break;
-        }
-    
+      }
+
     // create hidden iframe and post upload form
-    if (send)
-      {
+    if (send) {
       var ts = new Date().getTime();
       var frame_name = 'rcmupload'+ts;
 
       // have to do it this way for IE
       // otherwise the form will be posted to a new window
-      if(document.all)
-        {
+      if (document.all) {
         var html = '<iframe name="'+frame_name+'" src="program/blank.gif" style="width:0;height:0;visibility:hidden;"></iframe>';
         document.body.insertAdjacentHTML('BeforeEnd',html);
-        }
-      else  // for standards-compilant browsers
-        {
+      }
+      else { // for standards-compilant browsers
         var frame = document.createElement('iframe');
         frame.name = frame_name;
         frame.style.border = 'none';
@@ -2495,7 +2926,7 @@
         frame.style.height = 0;
         frame.style.visibility = 'hidden';
         document.body.appendChild(frame);
-        }
+      }
 
       // handle upload errors, parsing iframe content in onload
       var fr = document.getElementsByName(frame_name)[0];
@@ -2523,7 +2954,7 @@
       form.action = this.env.comm_path+'&_action=upload&_uploadid='+ts;
       form.setAttribute('enctype', 'multipart/form-data');
       form.submit();
-      
+
       // hide upload form
       this.show_attachment_form(false);
       // display upload indicator and cancel button
@@ -2533,12 +2964,12 @@
       if (this.env.cancelicon)
         content = '<a title="'+this.get_label('cancel')+'" onclick="return rcmail.cancel_attachment_upload(\''+ts+'\', \''+frame_name+'\');" href="#cancelupload"><img src="'+this.env.cancelicon+'" alt="" /></a>'+content;
       this.add2attachment_list(ts, { name:'', html:content, complete:false });
-      }
-    
+    }
+
     // set reference to the form object
     this.gui_objects.attachmentform = form;
     return true;
-    };
+  };
 
   // add file name to attachment list
   // called from upload page
@@ -2546,10 +2977,10 @@
   {
     if (!this.gui_objects.attachmentlist)
       return false;
-    
+
     var li = $('<li>').attr('id', name).html(att.html);
     var indicator;
-    
+
     // replace indicator's li
     if (upload_id && (indicator = document.getElementById(upload_id))) {
       li.replaceAll(indicator);
@@ -2557,12 +2988,12 @@
     else { // add new li
       li.appendTo(this.gui_objects.attachmentlist);
     }
-    
+
     if (upload_id && this.env.attachments[upload_id])
       delete this.env.attachments[upload_id];
-    
+
     this.env.attachments[name] = att;
-    
+
     return true;
   };
 
@@ -2570,7 +3001,7 @@
   {
     if (this.env.attachments[name])
       delete this.env.attachments[name];
-    
+
     if (!this.gui_objects.attachmentlist)
       return false;
 
@@ -2581,50 +3012,52 @@
   };
 
   this.remove_attachment = function(name)
-    {
+  {
     if (name && this.env.attachments[name])
       this.http_post('remove-attachment', '_file='+urlencode(name));
 
     return true;
-    };
+  };
 
   this.cancel_attachment_upload = function(name, frame_name)
-    {
+  {
     if (!name || !frame_name)
       return false;
 
     this.remove_from_attachment_list(name);
     $("iframe[name='"+frame_name+"']").remove();
     return false;
-    };
+  };
 
   // send remote request to add a new contact
   this.add_contact = function(value)
-    {
+  {
     if (value)
       this.http_post('addcontact', '_address='+value);
-    
+
     return true;
-    };
+  };
 
   // send remote request to search mail or contacts
   this.qsearch = function(value)
-    {
-    if (value != '')
-      {
+  {
+    if (value != '') {
       var addurl = '';
       if (this.message_list) {
         this.message_list.clear();
         if (this.env.search_mods) {
-          var head_arr = new Array();
-          for (var n in this.env.search_mods)
-            head_arr.push(n);
-          addurl += '&_headers='+head_arr.join(',');
+          var mods = this.env.search_mods[this.env.mailbox] ? this.env.search_mods[this.env.mailbox] : this.env.search_mods['*'];
+          if (mods) {
+            var head_arr = [];
+            for (var n in mods)
+              head_arr.push(n);
+            addurl += '&_headers='+head_arr.join(',');
           }
-        } else if (this.contact_list) {
+        }
+      } else if (this.contact_list) {
         this.contact_list.clear(true);
         this.show_contentframe(false);
-        }
+      }
 
       if (this.gui_objects.search_filter)
         addurl += '&_filter=' + this.gui_objects.search_filter.value;
@@ -2635,26 +3068,27 @@
       this.http_request('search', '_q='+urlencode(value)
         + (this.env.mailbox ? '&_mbox='+urlencode(this.env.mailbox) : '')
         + (this.env.source ? '&_source='+urlencode(this.env.source) : '')
+        + (this.env.group ? '&_gid='+urlencode(this.env.group) : '')
         + (addurl ? addurl : ''), true);
-      }
+    }
     return true;
-    };
+  };
 
   // reset quick-search form
   this.reset_qsearch = function()
-    {
+  {
     if (this.gui_objects.qsearchbox)
       this.gui_objects.qsearchbox.value = '';
-      
+
     this.env.search_request = null;
     return true;
-    };
+  };
 
   this.sent_successfully = function(type, msg)
-    {
+  {
     this.list_mailbox();
     this.display_message(msg, type, true);
-    }
+  };
 
 
   /*********************************************************/
@@ -2671,19 +3105,18 @@
     var key = rcube_event.get_keycode(e);
     var mod = rcube_event.get_modifier(e);
 
-    switch (key)
-      {
+    switch (key) {
       case 38:  // key up
       case 40:  // key down
         if (!this.ksearch_pane)
           break;
-          
+
         var dir = key==38 ? 1 : 0;
-        
+
         highlight = document.getElementById('rcmksearchSelected');
         if (!highlight)
           highlight = this.ksearch_pane.__ul.firstChild;
-        
+
         if (highlight)
           this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);
 
@@ -2706,20 +3139,20 @@
       case 27:  // escape
         this.ksearch_hide();
         break;
-      
+
       case 37:  // left
       case 39:  // right
         if (mod != SHIFT_KEY)
-	  return;
-      }
+	      return;
+    }
 
     // start timer
     this.ksearch_timer = window.setTimeout(function(){ ref.ksearch_get_results(); }, 200);
     this.ksearch_input = obj;
-    
+
     return true;
   };
-  
+
   this.ksearch_select = function(node)
   {
     var current = $('#rcmksearchSelected');
@@ -2737,7 +3170,7 @@
   {
     if (!this.env.contacts[id] || !this.ksearch_input)
       return;
-    
+
     // get cursor pos
     var inp_value = this.ksearch_input.value;
     var cpos = this.get_caret_pos(this.ksearch_input);
@@ -2746,7 +3179,18 @@
     // replace search string with full address
     var pre = this.ksearch_input.value.substring(0, p);
     var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
-    var insert  = this.env.contacts[id]+', ';
+    var insert = '';
+
+    // insert all members of a group
+    if (typeof this.env.contacts[id] == 'object' && this.env.contacts[id].id) {
+      insert += this.env.contacts[id].name + ', ';
+      this.group2expand = $.extend({}, this.env.contacts[id]);
+      this.group2expand.input = this.ksearch_input;
+      this.http_request('group-expand', '_source='+urlencode(this.env.contacts[id].source)+'&_gid='+urlencode(this.env.contacts[id].id), false);
+    }
+    else if (typeof this.env.contacts[id] == 'string')
+      insert = this.env.contacts[id] + ', ';
+
     this.ksearch_input.value = pre + insert + end;
 
     // set caret to insert pos
@@ -2755,13 +3199,21 @@
       this.ksearch_input.setSelectionRange(cpos, cpos);
   };
 
+  this.replace_group_recipients = function(id, recipients)
+  {
+    if (this.group2expand && this.group2expand.id == id) {
+      this.group2expand.input.value = this.group2expand.input.value.replace(this.group2expand.name, recipients);
+      this.group2expand = null;
+    }
+  };
+
   // address search processor
   this.ksearch_get_results = function()
   {
     var inp_value = this.ksearch_input ? this.ksearch_input.value : null;
     if (inp_value === null)
       return;
-      
+
     if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
       this.ksearch_pane.hide();
 
@@ -2776,10 +3228,10 @@
     // Don't (re-)search if the last results are still active
     if (q == this.ksearch_value)
       return;
-    
+
     var old_value = this.ksearch_value;
     this.ksearch_value = q;
-    
+
     // ...string is empty
     if (!q.length)
       return;
@@ -2787,8 +3239,8 @@
     // ...new search value contains old one and previous search result was empty
     if (old_value && old_value.length && this.env.contacts && !this.env.contacts.length && q.indexOf(old_value) == 0)
       return;
-    
-    this.display_message(this.get_label('searching'), 'loading', true);
+
+    this.display_message(this.get_label('searching'), 'loading', false);
     this.http_post('autocomplete', '_search='+urlencode(q));
   };
 
@@ -2797,7 +3249,7 @@
     // ignore this outdated search response
     if (this.ksearch_value && search != this.ksearch_value)
       return;
-      
+
     this.hide_message();
     this.env.contacts = results ? results : [];
     this.ksearch_display_results(this.env.contacts);
@@ -2806,9 +3258,9 @@
   this.ksearch_display_results = function (a_results)
   {
     // display search results
-    if (a_results.length && this.ksearch_input) {
-      var p, ul, li;
-      
+    if (a_results.length && this.ksearch_input && this.ksearch_value) {
+      var p, ul, li, text, s_val = this.ksearch_value;
+
       // create results pane if not present
       if (!this.ksearch_pane) {
         ul = $('<ul>');
@@ -2819,11 +3271,12 @@
       // remove all search results
       ul = this.ksearch_pane.__ul;
       ul.innerHTML = '';
-            
+
       // add each result line to list
-      for (i=0; i<a_results.length; i++) {
+      for (i=0; i < a_results.length; i++) {
+        text = typeof a_results[i] == 'object' ? a_results[i].name : a_results[i];
         li = document.createElement('LI');
-        li.innerHTML = a_results[i].replace(new RegExp('('+this.ksearch_value+')', 'ig'), '##$1%%').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/##([^%]+)%%/g, '<b>$1</b>');
+        li.innerHTML = text.replace(new RegExp('('+s_val+')', 'ig'), '##$1%%').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/##([^%]+)%%/g, '<b>$1</b>');
         li.onmouseover = function(){ ref.ksearch_select(this); };
         li.onmouseup = function(){ ref.ksearch_click(this) };
         li._rcm_id = i;
@@ -2842,7 +3295,7 @@
     else
       this.ksearch_hide();
   };
-  
+
   this.ksearch_click = function(node)
   {
     if (this.ksearch_input)
@@ -2853,24 +3306,23 @@
   };
 
   this.ksearch_blur = function()
-    {
+  {
     if (this.ksearch_timer)
       clearTimeout(this.ksearch_timer);
 
     this.ksearch_value = '';
     this.ksearch_input = null;
-    
     this.ksearch_hide();
-    };
+  };
 
 
   this.ksearch_hide = function()
-    {
+  {
     this.ksearch_selected = null;
-    
+
     if (this.ksearch_pane)
       this.ksearch_pane.hide();
-    };
+  };
 
 
   /*********************************************************/
@@ -2878,74 +3330,83 @@
   /*********************************************************/
 
   this.contactlist_keypress = function(list)
-    {
-      if (list.key_pressed == list.DELETE_KEY)
-        this.command('delete');
-    };
+  {
+    if (list.key_pressed == list.DELETE_KEY)
+      this.command('delete');
+  };
 
   this.contactlist_select = function(list)
-    {
-      if (this.preview_timer)
-        clearTimeout(this.preview_timer);
+  {
+    if (this.preview_timer)
+      clearTimeout(this.preview_timer);
 
-      var id, frame, ref = this;
-      if (id = list.get_single_selection())
-        this.preview_timer = window.setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
-      else if (this.env.contentframe)
-        this.show_contentframe(false);
+    var id, frame, ref = this;
+    if (id = list.get_single_selection())
+      this.preview_timer = window.setTimeout(function(){ ref.load_contact(id, 'show'); }, 200);
+    else if (this.env.contentframe)
+      this.show_contentframe(false);
 
-      this.enable_command('compose', list.selection.length > 0);
-      this.enable_command('edit', (id && this.env.address_sources && !this.env.address_sources[this.env.source].readonly) ? true : false);
-      this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly);
+    this.enable_command('compose', list.selection.length > 0);
+    this.enable_command('edit', (id && this.env.address_sources && !this.env.address_sources[this.env.source].readonly) ? true : false);
+    this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly);
 
-      return false;
-    };
+    return false;
+  };
 
-  this.list_contacts = function(src, page)
-    {
+  this.list_contacts = function(src, group, page)
+  {
     var add_url = '';
     var target = window;
-    
-    if (!src)
+
+    // currently all groups belong to the local address book
+    if (group)
+      src = 0;
+    else if (!src)
       src = this.env.source;
-    
-    if (page && this.current_page==page && src == this.env.source)
+
+    if (page && this.current_page == page && src == this.env.source && group == this.env.group)
       return false;
-      
-    if (src != this.env.source)
-      {
+
+    if (src != this.env.source) {
       page = 1;
       this.env.current_page = page;
       this.reset_qsearch();
-      }
+    }
+    else if (group != this.env.group)
+      page = this.env.current_page = 1;
 
-    this.select_folder(src, this.env.source);
+    this.select_folder((group ? 'G'+group : src), (this.env.group ? 'G'+this.env.group : this.env.source));
+
     this.env.source = src;
+    this.env.group = group;
 
     // load contacts remotely
-    if (this.gui_objects.contactslist)
-      {
-      this.list_contacts_remote(src, page);
+    if (this.gui_objects.contactslist) {
+      this.list_contacts_remote(src, group, page);
       return;
-      }
+    }
 
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
+    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
       target = window.frames[this.env.contentframe];
       add_url = '&_framed=1';
-      }
+    }
+
+    if (group)
+      add_url += '&_gid='+group;
+    if (page)
+      add_url += '&_page='+page;
 
     // also send search request to get the correct listing
     if (this.env.search_request)
       add_url += '&_search='+this.env.search_request;
 
     this.set_busy(true, 'loading');
-    target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
-    };
+    target.location.href = this.env.comm_path + (src ? '&_source='+urlencode(src) : '') + add_url;
+  };
 
   // send remote request to load contacts list
-  this.list_contacts_remote = function(src, page)
-    {
+  this.list_contacts_remote = function(src, group, page)
+  {
     // clear message list first
     this.contact_list.clear(true);
     this.show_contentframe(false);
@@ -2954,83 +3415,88 @@
     // send request to server
     var url = (src ? '_source='+urlencode(src) : '') + (page ? (src?'&':'') + '_page='+page : '');
     this.env.source = src;
-    
+    this.env.group = group;
+
+    if (group)
+      url += '&_gid='+group;
+
     // also send search request to get the right messages 
     if (this.env.search_request) 
       url += '&_search='+this.env.search_request;
 
     this.set_busy(true, 'loading');
     this.http_request('list', url, true);
-    };
+  };
 
   // load contact record
   this.load_contact = function(cid, action, framed)
-    {
+  {
     var add_url = '';
     var target = window;
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
+    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
       add_url = '&_framed=1';
       target = window.frames[this.env.contentframe];
       this.show_contentframe(true);
-      }
+    }
     else if (framed)
       return false;
-      
-    if (action && (cid || action=='add') && !this.drag_active)
-      {
+
+    if (action && (cid || action=='add') && !this.drag_active) {
       this.set_busy(true);
-      target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
-      }
+      target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_cid='+urlencode(cid) + add_url;
+    }
     return true;
-    };
+  };
 
   // copy a contact to the specified target (group or directory)
   this.copy_contact = function(cid, to)
-    {
+  {
     if (!cid)
       cid = this.contact_list.get_selection().join(',');
 
-    if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
-      this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
-    };
+    if (to.type == 'group')
+      this.http_post('group-addmembers', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(to.id));
+    else if (to.id != this.env.source && cid && this.env.address_sources[to.id] && !this.env.address_sources[to.id].readonly)
+      this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to.id));
+  };
 
 
   this.delete_contacts = function()
-    {
+  {
     // exit if no mailbox specified or if selection is empty
     var selection = this.contact_list.get_selection();
-    if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
+    if (!(selection.length || this.env.cid) || (!this.env.group && !confirm(this.get_label('deletecontactconfirm'))))
       return;
-      
-    var a_cids = new Array();
-    var qs = '';
+
+    var a_cids = [], qs = '';
 
     if (this.env.cid)
       a_cids[a_cids.length] = this.env.cid;
-    else
-      {
+    else {
       var id;
-      for (var n=0; n<selection.length; n++)
-        {
+      for (var n=0; n<selection.length; n++) {
         id = selection[n];
         a_cids[a_cids.length] = id;
         this.contact_list.remove_row(id, (n == selection.length-1));
-        }
+      }
 
       // hide content frame if we delete the currently displayed contact
       if (selection.length == 1)
         this.show_contentframe(false);
-      }
+    }
 
     // also send search request to get the right records from the next page
     if (this.env.search_request) 
       qs += '&_search='+this.env.search_request;
 
     // send request to server
-    this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+    if (this.env.group)
+      this.http_post('group-delmembers', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+qs);
+    else
+      this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source)+'&_from='+(this.env.action ? this.env.action : '')+qs);
+
     return true;
-    };
+  };
 
   // update a contact record in the list
   this.update_contact_row = function(cid, cols_arr, newcid)
@@ -3043,11 +3509,11 @@
 
       // cid change
       if (newcid) {
-	row.id = 'rcmrow' + newcid;
+        row.id = 'rcmrow' + newcid;
         this.contact_list.remove_row(cid);
         this.contact_list.init_row(row);
-	this.contact_list.selection[0] = newcid;
-	row.style.display = '';
+        this.contact_list.selection[0] = newcid;
+        ow.style.display = '';
       }
 
       return true;
@@ -3058,18 +3524,18 @@
 
   // add row to contacts list
   this.add_contact_row = function(cid, cols, select)
-    {
+  {
     if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
       return false;
-    
-    var tbody = this.gui_objects.contactslist.tBodies[0];
-    var rowcount = tbody.rows.length;
-    var even = rowcount%2;
-    
-    var row = document.createElement('tr');
+
+    var tbody = this.gui_objects.contactslist.tBodies[0],
+      rowcount = tbody.rows.length,
+      even = rowcount%2,
+      row = document.createElement('tr');
+
     row.id = 'rcmrow'+cid;
     row.className = 'contact '+(even ? 'even' : 'odd');
-	    
+
     if (this.contact_list.in_selection(cid))
       row.className += ' selected';
 
@@ -3080,11 +3546,145 @@
       col.innerHTML = cols[c];
       row.appendChild(col);
     }
-    
+
     this.contact_list.insert_row(row);
-    
+
     this.enable_command('export', (this.contact_list.rowcount > 0));
-    };
+  };
+
+
+  this.add_contact_group = function()
+  {
+    if (!this.gui_objects.folderlist || !this.env.address_sources[this.env.source].groups)
+      return;
+
+    if (!this.name_input) {
+      this.name_input = document.createElement('input');
+      this.name_input.type = 'text';
+      this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
+
+      this.gui_objects.folderlist.parentNode.appendChild(this.name_input);
+    }
+
+    this.name_input.select();
+  };
+
+  this.rename_contact_group = function()
+  {
+    if (!this.env.group || !this.gui_objects.folderlist)
+      return;
+
+    if (!this.name_input) {
+      this.enable_command('list', 'listgroup', false);
+      this.name_input = document.createElement('input');
+      this.name_input.type = 'text';
+      this.name_input.value = this.env.contactgroups['G'+this.env.group].name;
+      this.name_input.onkeypress = function(e){ return rcmail.add_input_keypress(e); };
+      this.env.group_renaming = true;
+
+      var link, li = this.get_folder_li(this.env.group, 'rcmliG');
+      if (li && (link = li.firstChild)) {
+        $(link).hide();
+        li.insertBefore(this.name_input, link);
+      }
+    }
+
+    this.name_input.select();
+  };
+
+  this.delete_contact_group = function()
+  {
+    if (this.env.group)
+      this.http_post('group-delete', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group), true);
+  };
+
+  // callback from server upon group-delete command
+  this.remove_group_item = function(id)
+  {
+    var li, key = 'G'+id;
+    if ((li = this.get_folder_li(key))) {
+      this.triggerEvent('removegroup', { id:id, li:li });
+
+      li.parentNode.removeChild(li);
+      delete this.env.contactfolders[key];
+      delete this.env.contactgroups[key];
+    }
+
+    this.list_contacts(null, 0);
+  };
+
+  // handler for keyboard events on the input field
+  this.add_input_keypress = function(e)
+  {
+    var key = rcube_event.get_keycode(e);
+
+    // enter
+    if (key == 13) {
+      var newname = this.name_input.value;
+
+      if (newname) {
+        this.set_busy(true, 'loading');
+        if (this.env.group_renaming)
+          this.http_post('group-rename', '_source='+urlencode(this.env.source)+'&_gid='+urlencode(this.env.group)+'&_name='+urlencode(newname), true);
+        else
+          this.http_post('group-create', '_source='+urlencode(this.env.source)+'&_name='+urlencode(newname), true);
+      }
+      return false;
+    }
+    // escape
+    else if (key == 27)
+      this.reset_add_input();
+
+    return true;
+  };
+
+  this.reset_add_input = function()
+  {
+    if (this.name_input) {
+      if (this.env.group_renaming) {
+        var li = this.name_input.parentNode;
+        $(li.lastChild).show();
+        this.env.group_renaming = false;
+      }
+
+      this.name_input.parentNode.removeChild(this.name_input);
+      this.name_input = null;
+    }
+
+    this.enable_command('list', 'listgroup', true);
+  };
+
+  // callback for creating a new contact group
+  this.insert_contact_group = function(prop)
+  {
+    this.reset_add_input();
+
+    prop.type = 'group';
+    var key = 'G'+prop.id;
+    this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
+
+    var link = $('<a>').attr('href', '#')
+      .bind('click', function() { return rcmail.command('listgroup', prop.id, this);})
+      .html(prop.name);
+    var li = $('<li>').attr('id', 'rcmli'+key).addClass('contactgroup').append(link);
+    $(this.gui_objects.folderlist).append(li);
+
+    this.triggerEvent('insertgroup', { id:prop.id, name:prop.name, li:li[0] });
+  };
+
+  // callback for renaming a contact group
+  this.update_contact_group = function(id, name)
+  {
+    this.reset_add_input();
+
+    var key = 'G'+id, link, li = this.get_folder_li(key);
+
+    if (li && (link = li.firstChild) && link.tagName.toLowerCase() == 'a')
+      link.innerHTML = name;
+
+    this.env.contactfolders[key].name = this.env.contactgroups[key].name = name;
+    this.triggerEvent('updategroup', { id:id, name:name, li:li[0] });
+  };
 
 
   /*********************************************************/
@@ -3092,14 +3692,13 @@
   /*********************************************************/
 
   this.init_subscription_list = function()
-    {
+  {
     var p = this;
     this.subscription_list = new rcube_list_widget(this.gui_objects.subscriptionlist, {multiselect:false, draggable:true, keyboard:false, toggleselect:true});
     this.subscription_list.addEventListener('select', function(o){ p.subscription_select(o); });
     this.subscription_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
     this.subscription_list.addEventListener('dragend', function(o){ p.subscription_move_folder(o); });
-    this.subscription_list.row_init = function (row)
-      {
+    this.subscription_list.row_init = function (row) {
       var anchors = row.obj.getElementsByTagName('a');
       if (anchors[0])
         anchors[0].onclick = function() { p.rename_folder(row.id); return false; };
@@ -3107,113 +3706,109 @@
         anchors[1].onclick = function() { p.delete_folder(row.id); return false; };
       row.obj.onmouseover = function() { p.focus_subscription(row.id); };
       row.obj.onmouseout = function() { p.unfocus_subscription(row.id); };
-      }
+    };
     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;
+      var add_url = '', 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;
       }
+      target.location.href = this.env.comm_path+'&_action=edit-prefs&_section='+id+add_url;
+    }
 
     return true;
-    };
+  };
 
   this.identity_select = function(list)
-    {
+  {
     var id;
     if (id = list.get_single_selection())
       this.load_identity(id, 'edit-identity');
-    };
+  };
 
   // load identity record
   this.load_identity = function(id, action)
-    {
+  {
     if (action=='edit-identity' && (!id || id==this.env.iid))
       return false;
 
-    var add_url = '';
-    var target = window;
-    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
-      {
+    var add_url = '',  target = window;
+
+    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe]) {
       add_url = '&_framed=1';
       target = window.frames[this.env.contentframe];
       document.getElementById(this.env.contentframe).style.visibility = 'inherit';
-      }
+    }
 
-    if (action && (id || action=='add-identity'))
-      {
+    if (action && (id || action=='add-identity')) {
       this.set_busy(true);
       target.location.href = this.env.comm_path+'&_action='+action+'&_iid='+id+add_url;
-      }
+    }
+
     return true;
-    };
+  };
 
   this.delete_identity = function(id)
-    {
+  {
     // exit if no mailbox specified or if selection is empty
     var selection = this.identity_list.get_selection();
     if (!(selection.length || this.env.iid))
       return;
-    
+
     if (!id)
       id = this.env.iid ? this.env.iid : selection[0];
 
     // append token to request
     this.goto_url('delete-identity', '_iid='+id+'&_token='+this.env.request_token, true);
-    
+
     return true;
-    };
+  };
 
   this.focus_subscription = function(id)
-    {
-    var row, folder;
-    var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
+  {
+    var row, folder,
+      reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
 
     if (this.drag_active && this.env.folder && (row = document.getElementById(id)))
       if (this.env.subscriptionrows[id] &&
-          (folder = this.env.subscriptionrows[id][0]))
-        {
+          (folder = this.env.subscriptionrows[id][0])) {
         if (this.check_droptarget(folder) &&
             !this.env.subscriptionrows[this.get_folder_row_id(this.env.folder)][2] &&
             (folder != this.env.folder.replace(reg, '')) &&
-            (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter)))))
-          {
+            (!folder.match(new RegExp('^'+RegExp.escape(this.env.folder+this.env.delimiter))))) {
           this.set_env('dstfolder', folder);
           $(row).addClass('droptarget');
-          }
         }
-      else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter))))
-        {
+      }
+      else if (this.env.folder.match(new RegExp(RegExp.escape(this.env.delimiter)))) {
         this.set_env('dstfolder', this.env.delimiter);
         $(this.subscription_list.frame).addClass('droptarget');
-        }
-    }
+      }
+  };
 
   this.unfocus_subscription = function(id)
-    {
-      var row = $('#'+id);
-      this.set_env('dstfolder', null);
-      if (this.env.subscriptionrows[id] && row[0])
-        row.removeClass('droptarget');
-      else
-        $(this.subscription_list.frame).removeClass('droptarget');
-    }
+  {
+    var row = $('#'+id);
+
+    this.set_env('dstfolder', null);
+    if (this.env.subscriptionrows[id] && row[0])
+      row.removeClass('droptarget');
+    else
+      $(this.subscription_list.frame).removeClass('droptarget');
+  };
 
   this.subscription_select = function(list)
-    {
+  {
     var id, folder;
     if ((id = list.get_single_selection()) &&
         this.env.subscriptionrows['rcmrow'+id] &&
@@ -3221,71 +3816,66 @@
       this.set_env('folder', folder);
     else
       this.set_env('folder', null);
-      
+
     if (this.gui_objects.createfolderhint)
       $(this.gui_objects.createfolderhint).html(this.env.folder ? this.get_label('addsubfolderhint') : '');
-    };
+  };
 
   this.subscription_move_folder = function(list)
-    {
+  {
     var reg = RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
     if (this.env.folder && this.env.dstfolder && (this.env.dstfolder != this.env.folder) &&
-        (this.env.dstfolder != this.env.folder.replace(reg, '')))
-      {
+        (this.env.dstfolder != this.env.folder.replace(reg, ''))) {
       var reg = new RegExp('[^'+RegExp.escape(this.env.delimiter)+']*['+RegExp.escape(this.env.delimiter)+']', 'g');
       var basename = this.env.folder.replace(reg, '');
       var newname = this.env.dstfolder==this.env.delimiter ? basename : this.env.dstfolder+this.env.delimiter+basename;
 
       this.set_busy(true, 'foldermoving');
       this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.folder)+'&_folder_newname='+urlencode(newname), true);
-      }
+    }
     this.drag_active = false;
     this.unfocus_subscription(this.get_folder_row_id(this.env.dstfolder));
-    };
+  };
 
   // tell server to create and subscribe a new mailbox
   this.create_folder = function(name)
-    {
+  {
     if (this.edit_folder)
       this.reset_folder_rename();
 
     var form;
-    if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
-      {
+    if ((form = this.gui_objects.editform) && form.elements['_folder_name']) {
       name = form.elements['_folder_name'].value;
 
-      if (name.indexOf(this.env.delimiter)>=0)
-        {
+      if (name.indexOf(this.env.delimiter)>=0) {
         alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
         return false;
-        }
+      }
 
       if (this.env.folder && name != '')
         name = this.env.folder+this.env.delimiter+name;
 
       this.set_busy(true, 'foldercreating');
       this.http_post('create-folder', '_name='+urlencode(name), true);
-      }
+    }
     else if (form.elements['_folder_name'])
       form.elements['_folder_name'].focus();
-    };
+  };
 
   // start renaming the mailbox name.
   // this will replace the name string with an input field
   this.rename_folder = function(id)
-    {
+  {
     var temp, row, form;
 
     // reset current renaming
-    if (temp = this.edit_folder)
-      {
+    if (temp = this.edit_folder) {
       this.reset_folder_rename();
       if (temp == id)
         return;
-      }
+    }
 
-    if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id)))
-      {
+    if (id && this.env.subscriptionrows[id] && (row = document.getElementById(id))) {
       var reg = new RegExp('.*['+RegExp.escape(this.env.delimiter)+']');
       this.name_input = document.createElement('input');
       this.name_input.type = 'text';
@@ -3294,103 +3884,101 @@
       reg = new RegExp('['+RegExp.escape(this.env.delimiter)+']?[^'+RegExp.escape(this.env.delimiter)+']+$');
       this.name_input.__parent = this.env.subscriptionrows[id][0].replace(reg, '');
       this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
-      
+
       row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
       this.edit_folder = id;
       this.name_input.select();
-      
+
       if (form = this.gui_objects.editform)
         form.onsubmit = function(){ return false; };
-      }
-    };
+    }
+  };
 
   // remove the input field and write the current mailbox name to the table cell
   this.reset_folder_rename = function()
-    {
+  {
     var cell = this.name_input ? this.name_input.parentNode : null;
 
     if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
       $(cell).html(this.env.subscriptionrows[this.edit_folder][1]);
-      
+
     this.edit_folder = null;
-    };
+  };
 
   // handler for keyboard events on the input field
   this.name_input_keypress = function(e)
-    {
+  {
     var key = rcube_event.get_keycode(e);
 
     // enter
-    if (key==13)
-      {
+    if (key==13) {
       var newname = this.name_input ? this.name_input.value : null;
-      if (this.edit_folder && newname)
-        {
-        if (newname.indexOf(this.env.delimiter)>=0)
-          {
+      if (this.edit_folder && newname) {
+        if (newname.indexOf(this.env.delimiter)>=0) {
           alert(this.get_label('forbiddencharacter')+' ('+this.env.delimiter+')');
           return false;
-          }
+        }
 
         if (this.name_input.__parent)
           newname = this.name_input.__parent + this.env.delimiter + newname;
 
         this.set_busy(true, 'folderrenaming');
         this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname), true);
-        }
       }
+    }
     // escape
     else if (key==27)
       this.reset_folder_rename();
-    };
+  };
 
   // delete a specific mailbox with all its messages
   this.delete_folder = function(id)
-    {
+  {
     var folder = this.env.subscriptionrows[id][0];
 
     if (this.edit_folder)
       this.reset_folder_rename();
 
-    if (folder && confirm(this.get_label('deletefolderconfirm')))
-      {
+    if (folder && confirm(this.get_label('deletefolderconfirm'))) {
       this.set_busy(true, 'folderdeleting');
       this.http_post('delete-folder', '_mboxes='+urlencode(folder), true);
       this.set_env('folder', null);
 
       $(this.gui_objects.createfolderhint).html('');
-      }
-    };
+    }
+  };
 
   // add a new folder to the subscription list by cloning a folder row
   this.add_folder_row = function(name, display_name, replace, before)
-    {
+  {
     if (!this.gui_objects.subscriptionlist)
       return false;
 
-    // find not protected folder    
-    for (var refid in this.env.subscriptionrows)
-      if (this.env.subscriptionrows[refid]!=null && !this.env.subscriptionrows[refid][2])
+    // find not protected folder
+    var refid;
+    for (var rid in this.env.subscriptionrows) {
+      if (this.env.subscriptionrows[rid]!=null && !this.env.subscriptionrows[rid][2]) {
+        refid = rid;
         break;
+      }
+    }
 
-    var refrow, form;
-    var tbody = this.gui_objects.subscriptionlist.tBodies[0];
-    var id = 'rcmrow'+(tbody.childNodes.length+1);
-    var selection = this.subscription_list.get_single_selection();
-    
-    if (replace && replace.id)
-    {
+    var refrow, form,
+      tbody = this.gui_objects.subscriptionlist.tBodies[0],
+      id = 'rcmrow'+(tbody.childNodes.length+1),
+      selection = this.subscription_list.get_single_selection();
+
+    if (replace && replace.id) {
       id = replace.id;
       refid = replace.id;
     }
 
-    if (!id || !(refrow = document.getElementById(refid)))
-      {
+    if (!id || !refid || !(refrow = document.getElementById(refid))) {
       // Refresh page if we don't have a table row to clone
       this.goto_url('folders');
-      }
-    else
-      {
+      return false;
+    }
+    else {
       // clone a table row if there are existing rows
       var row = this.clone_table_row(refrow);
       row.id = id;
@@ -3399,35 +3987,33 @@
         tbody.insertBefore(row, document.getElementById(before));
       else
         tbody.appendChild(row);
-      
+
       if (replace)
         tbody.removeChild(replace);
-      }
+    }
 
     // add to folder/row-ID map
     this.env.subscriptionrows[row.id] = [name, display_name, 0];
 
     // set folder name
     row.cells[0].innerHTML = display_name;
-    
+
     // set messages count to zero
     if (!replace)
       row.cells[1].innerHTML = '*';
-    
-    if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input')
-      {
+
+    if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input') {
       row.cells[2].firstChild.value = name;
       row.cells[2].firstChild.checked = true;
-      }
-    
+    }
+
     // add new folder to rename-folder list and clear input field
-    if (!replace && (form = this.gui_objects.editform))
-      {
+    if (!replace && (form = this.gui_objects.editform)) {
       if (form.elements['_folder_oldname'])
         form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
       if (form.elements['_folder_name'])
         form.elements['_folder_name'].value = ''; 
-      }
+    }
 
     this.init_subscription_list();
     if (selection && document.getElementById('rcmrow'+selection))
@@ -3435,91 +4021,96 @@
 
     if (document.getElementById(id).scrollIntoView)
       document.getElementById(id).scrollIntoView();
-    };
+  };
 
   // replace an existing table row with a new folder line
   this.replace_folder_row = function(oldfolder, newfolder, display_name, before)
-    {
-    var id = this.get_folder_row_id(oldfolder);
-    var row = document.getElementById(id);
-    
+  {
+    var form, elm,
+      id = this.get_folder_row_id(oldfolder),
+      row = document.getElementById(id);
+
     // replace an existing table row (if found)
     this.add_folder_row(newfolder, display_name, row, before);
-    
+
     // rename folder in rename-folder dropdown
-    var form, elm;
-    if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname']))
-      {
-      for (var i=0;i<elm.options.length;i++)
-        {
-        if (elm.options[i].value == oldfolder)
-          {
+    if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
+      for (var i=0; i<elm.options.length; i++) {
+        if (elm.options[i].value == oldfolder) {
           elm.options[i].text = display_name;
           elm.options[i].value = newfolder;
           break;
-          }
         }
+      }
 
       form.elements['_folder_newname'].value = '';
-      }
-    };
+    }
+  };
 
   // remove the table row of a specific mailbox from the table
   // (the row will not be removed, just hidden)
   this.remove_folder_row = function(folder)
-    {
-    var row;
-    var id = this.get_folder_row_id(folder);
+  {
+    var form, elm, row, id = this.get_folder_row_id(folder);
+
     if (id && (row = document.getElementById(id)))
       row.style.display = 'none';
 
     // remove folder from rename-folder list
-    var form;
-    if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'])
-      {
-      for (var i=0;i<form.elements['_folder_oldname'].options.length;i++)
-        {
-        if (form.elements['_folder_oldname'].options[i].value == folder) 
-          {
-          form.elements['_folder_oldname'].options[i] = null;
+    if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname'])) {
+      for (var i=0; i<elm.options.length; i++) {
+        if (elm.options[i].value == folder) {
+          elm.options[i] = null;
           break;
-          }
         }
       }
-    
+    }
+
     if (form && form.elements['_folder_newname'])
       form.elements['_folder_newname'].value = '';
-    };
+  };
 
   this.subscribe_folder = function(folder)
-    {
+  {
     if (folder)
       this.http_post('subscribe', '_mbox='+urlencode(folder));
-    };
+  };
 
   this.unsubscribe_folder = function(folder)
-    {
+  {
     if (folder)
       this.http_post('unsubscribe', '_mbox='+urlencode(folder));
-    };
-    
+  };
+
+  this.enable_threading = function(folder)
+  {
+    if (folder)
+      this.http_post('enable-threading', '_mbox='+urlencode(folder));
+  };
+
+  this.disable_threading = function(folder)
+  {
+    if (folder)
+      this.http_post('disable-threading', '_mbox='+urlencode(folder));
+  };
+
   // helper method to find a specific mailbox row ID
   this.get_folder_row_id = function(folder)
-    {
+  {
     for (var id in this.env.subscriptionrows)
       if (this.env.subscriptionrows[id] && this.env.subscriptionrows[id][0] == folder)
         break;
-        
+
     return id;
-    };
+  };
 
   // duplicate a specific table row
   this.clone_table_row = function(row)
-    {
-    var cell, td;
-    var new_row = document.createElement('tr');
-    for(var n=0; n<row.cells.length; n++)
-      {
+  {
+    var cell, td,
+      new_row = document.createElement('tr');
+
+    for(var n=0; n<row.cells.length; n++) {
       cell = row.cells[n];
       td = document.createElement('td');
 
@@ -3527,13 +4118,13 @@
         td.className = cell.className;
       if (cell.align)
         td.setAttribute('align', cell.align);
-        
+
       td.innerHTML = cell.innerHTML;
       new_row.appendChild(td);
-      }
-    
+    }
+
     return new_row;
-    };
+  };
 
 
   /*********************************************************/
@@ -3548,14 +4139,14 @@
     this.enable_command('previouspage', (this.env.current_page > 1));
     this.enable_command('firstpage', (this.env.current_page > 1));
   };
-  
+
   // set event handlers on registered buttons
   this.init_buttons = function()
   {
     for (var cmd in this.buttons) {
       if (typeof cmd != 'string')
         continue;
-      
+
       for (var i=0; i< this.buttons[cmd].length; i++) {
         var prop = this.buttons[cmd][i];
         var elm = document.getElementById(prop.id);
@@ -3567,7 +4158,7 @@
           elm = elm.parentNode;
           preload = true;
         }
-        
+
         elm._command = cmd;
         elm._id = prop.id;
         if (prop.sel) {
@@ -3588,15 +4179,13 @@
 
   // set button to a specific state
   this.set_button = function(command, state)
-    {
-    var a_buttons = this.buttons[command];
-    var button, obj;
+  {
+    var button, obj, a_buttons = this.buttons[command];
 
-    if(!a_buttons || !a_buttons.length)
+    if (!a_buttons || !a_buttons.length)
       return false;
 
-    for(var n=0; n<a_buttons.length; n++)
-      {
+    for (var n=0; n<a_buttons.length; n++) {
       button = a_buttons[n];
       obj = document.getElementById(button.id);
 
@@ -3611,63 +4200,55 @@
         button.pas = String(obj.className);
 
       // set image according to button state
-      if (obj && button.type=='image' && button[state])
-        {
+      if (obj && button.type=='image' && button[state]) {
         button.status = state;        
         obj.src = button[state];
-        }
+      }
       // set class name according to button state
-      else if (obj && typeof(button[state])!='undefined')
-        {
+      else if (obj && typeof(button[state])!='undefined') {
         button.status = state;        
         obj.className = button[state];        
-        }
+      }
       // disable/enable input buttons
-      if (obj && button.type=='input')
-        {
+      if (obj && button.type=='input') {
         button.status = state;
         obj.disabled = !state;
-        }
       }
-    };
+    }
+  };
 
   // display a specific alttext
   this.set_alttext = function(command, label)
-    {
-      if (!this.buttons[command] || !this.buttons[command].length)
-        return;
-      
-      var button, obj, link;
-      for (var n=0; n<this.buttons[command].length; n++)
-      {
-        button = this.buttons[command][n];
-        obj = document.getElementById(button.id);
-        
-        if (button.type=='image' && obj)
-        {
-          obj.setAttribute('alt', this.get_label(label));
-          if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
-            link.setAttribute('title', this.get_label(label));
-        }
-        else if (obj)
-          obj.setAttribute('title', this.get_label(label));
+  {
+    if (!this.buttons[command] || !this.buttons[command].length)
+      return;
+
+    var button, obj, link;
+    for (var n=0; n<this.buttons[command].length; n++) {
+      button = this.buttons[command][n];
+      obj = document.getElementById(button.id);
+
+      if (button.type=='image' && obj) {
+        obj.setAttribute('alt', this.get_label(label));
+        if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
+          link.setAttribute('title', this.get_label(label));
       }
-    };
+      else if (obj)
+        obj.setAttribute('title', this.get_label(label));
+    }
+  };
 
   // mouse over button
   this.button_over = function(command, id)
   {
-    var a_buttons = this.buttons[command];
-    var button, elm;
+    var button, elm, a_buttons = this.buttons[command];
 
-    if(!a_buttons || !a_buttons.length)
+    if (!a_buttons || !a_buttons.length)
       return false;
 
-    for(var n=0; n<a_buttons.length; n++)
-    {
+    for (var n=0; n<a_buttons.length; n++) {
       button = a_buttons[n];
-      if(button.id==id && button.status=='act')
-      {
+      if (button.id == id && button.status == 'act') {
         elm = document.getElementById(button.id);
         if (elm && button.over) {
           if (button.type == 'image')
@@ -3682,17 +4263,14 @@
   // mouse down on button
   this.button_sel = function(command, id)
   {
-    var a_buttons = this.buttons[command];
-    var button, elm;
+    var button, elm, a_buttons = this.buttons[command];
 
-    if(!a_buttons || !a_buttons.length)
+    if (!a_buttons || !a_buttons.length)
       return;
 
-    for(var n=0; n<a_buttons.length; n++)
-    {
+    for (var n=0; n<a_buttons.length; n++) {
       button = a_buttons[n];
-      if(button.id==id && button.status=='act')
-      {
+      if (button.id == id && button.status == 'act') {
         elm = document.getElementById(button.id);
         if (elm && button.sel) {
           if (button.type == 'image')
@@ -3708,17 +4286,14 @@
   // mouse out of button
   this.button_out = function(command, id)
   {
-    var a_buttons = this.buttons[command];
-    var button, elm;
+    var button, elm, a_buttons = this.buttons[command];
 
-    if(!a_buttons || !a_buttons.length)
+    if (!a_buttons || !a_buttons.length)
       return;
 
-    for(var n=0; n<a_buttons.length; n++)
-    {
+    for (var n=0; n<a_buttons.length; n++) {
       button = a_buttons[n];
-      if(button.id==id && button.status=='act')
-      {
+      if (button.id == id && button.status == 'act') {
         elm = document.getElementById(button.id);
         if (elm && button.act) {
           if (button.type == 'image')
@@ -3735,16 +4310,16 @@
   {
     if (title && document.title)
       document.title = title;
-  }
+  };
 
   // display a system message
   this.display_message = function(msg, type, hold)
-    {
-    if (!this.loaded)  // save message in order to display after page loaded
-      {
+  {
+    if (!this.loaded) {
+      // save message in order to display after page loaded
       this.pending_message = new Array(msg, type);
       return true;
-      }
+    }
 
     // pass command to parent window
     if (this.env.framed && parent.rcmail)
@@ -3755,236 +4330,170 @@
 
     if (this.message_timer)
       clearTimeout(this.message_timer);
-    
+
     var cont = msg;
     if (type)
       cont = '<div class="'+type+'">'+cont+'</div>';
 
     var obj = $(this.gui_objects.message).html(cont).show();
-    
+
     if (type!='loading')
       obj.bind('mousedown', function(){ ref.hide_message(); return true; });
-    
+
     if (!hold)
       this.message_timer = window.setTimeout(function(){ ref.hide_message(true); }, this.message_time);
-    };
+  };
 
   // make a message row disapear
   this.hide_message = function(fade)
-    {
+  {
     if (this.gui_objects.message)
       $(this.gui_objects.message).unbind()[(fade?'fadeOut':'hide')]();
-    };
+  };
 
   // mark a mailbox as selected and set environment variable
-  this.select_folder = function(name, old)
+  this.select_folder = function(name, old, prefix)
   {
-    if (this.gui_objects.folderlist)
-    {
+    if (this.gui_objects.folderlist) {
       var current_li, target_li;
-      
-      if ((current_li = this.get_folder_li(old))) {
+
+      if ((current_li = this.get_folder_li(old, prefix))) {
         $(current_li).removeClass('selected').removeClass('unfocused');
       }
-      if ((target_li = this.get_folder_li(name))) {
+      if ((target_li = this.get_folder_li(name, prefix))) {
         $(target_li).removeClass('unfocused').addClass('selected');
       }
-      
+
       // trigger event hook
-      this.triggerEvent('selectfolder', { folder:name, old:old });
+      this.triggerEvent('selectfolder', { folder:name, old:old, prefix:prefix });
     }
   };
 
   // helper method to find a folder list item
-  this.get_folder_li = function(name)
+  this.get_folder_li = function(name, prefix)
   {
-    if (this.gui_objects.folderlist)
-    {
+    if (!prefix)
+      prefix = 'rcmli';
+
+    if (this.gui_objects.folderlist) {
       name = String(name).replace(this.identifier_expr, '_');
-      return document.getElementById('rcmli'+name);
+      return document.getElementById(prefix+name);
     }
 
     return null;
   };
 
-  // for reordering column array, Konqueror workaround
-  this.set_message_coltypes = function(coltypes) 
+  // for reordering column array (Konqueror workaround)
+  // and for setting some message list global variables
+  this.set_message_coltypes = function(coltypes, repl)
   { 
-    this.coltypes = coltypes;
-    
+    this.env.coltypes = coltypes;
+
     // set correct list titles
-    var cell, col;
     var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
-    for (var n=0; thead && n<this.coltypes.length; n++) 
-      {
-      col = this.coltypes[n];
-      if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to'))
-        {
+
+    // replace old column headers
+    if (thead && repl) {
+      for (var cell, c=0; c < repl.length; c++) {
+        cell = thead.rows[0].cells[c];
+        if (!cell) {
+          cell = document.createElement('td');
+          thead.rows[0].appendChild(cell);
+        }
+        cell.innerHTML = repl[c].html;
+        if (repl[c].id) cell.id = repl[c].id;
+        if (repl[c].className) cell.className = repl[c].className;
+      }
+    }
+
+    var cell, col, n;
+    for (n=0; thead && n<this.env.coltypes.length; n++) {
+      col = this.env.coltypes[n];
+      if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to')) {
         // if we have links for sorting, it's a bit more complicated...
-        if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a')
-          {
-          cell.firstChild.innerHTML = this.get_label(this.coltypes[n]);
+        if (cell.firstChild && cell.firstChild.tagName.toLowerCase()=='a') {
+          cell.firstChild.innerHTML = this.get_label(this.env.coltypes[n]);
           cell.firstChild.onclick = function(){ return rcmail.command('sort', this.__col, this); };
           cell.firstChild.__col = col;
-          }
+        }
         else
-          cell.innerHTML = this.get_label(this.coltypes[n]);
+          cell.innerHTML = this.get_label(this.env.coltypes[n]);
 
         cell.id = 'rcm'+col;
-        }
-      else if (col == 'subject' && this.message_list)
-        this.message_list.subject_col = n+1;
       }
-  };
+    }
 
-  // create a table row in the message list
-  this.add_message_row = function(uid, cols, flags, attachment, attop)
-    {
-    if (!this.gui_objects.messagelist || !this.message_list)
-      return false;
+    // remove excessive columns
+    for (var i=n+1; thead && i<thead.rows[0].cells.length; i++)
+      thead.rows[0].removeChild(thead.rows[0].cells[i]);
 
-    if (this.message_list.background)
-      var tbody = this.message_list.background;
-    else
-      var tbody = this.gui_objects.messagelist.tBodies[0];
-    
-    var rowcount = tbody.rows.length;
-    var even = rowcount%2;
-    
-    this.env.messages[uid] = {
-      deleted: flags.deleted?1:0,
-      replied: flags.replied?1:0,
-      unread: flags.unread?1:0,
-      forwarded: flags.forwarded?1:0,
-      flagged:flags.flagged?1:0
-    };
+    this.env.subject_col = null;
+    this.env.flagged_col = null;
 
-    var css_class = 'message'
-        + (even ? ' even' : ' odd')
-        + (flags.unread ? ' unread' : '')
-        + (flags.deleted ? ' deleted' : '')
-        + (flags.flagged ? ' flagged' : '')
-        + (this.message_list.in_selection(uid) ? ' selected' : '');
-
-    // for performance use DOM instead of jQuery here
-    var row = document.createElement('tr');
-    row.id = 'rcmrow'+uid;
-    row.className = css_class;
-    
-    var icon = this.env.messageicon;
-    if (flags.deleted && this.env.deletedicon)
-      icon = this.env.deletedicon;
-    else if (flags.replied && this.env.repliedicon)
-      {
-      if (flags.forwarded && this.env.forwardedrepliedicon)
-        icon = this.env.forwardedrepliedicon;
-      else
-        icon = this.env.repliedicon;
-      }
-    else if (flags.forwarded && this.env.forwardedicon)
-      icon = this.env.forwardedicon;
-    else if(flags.unread && this.env.unreadicon)
-      icon = this.env.unreadicon;
-    
-    // add icon col
-    var col = document.createElement('td');
-    col.className = 'icon';
-    col.innerHTML = icon ? '<img src="'+icon+'" alt="" />' : '';
-    row.appendChild(col);
-		  
-    // add each submitted col
-    for (var n = 0; n < this.coltypes.length; n++) {
-      var c = this.coltypes[n];
-      col = document.createElement('td');
-      col.className = String(c).toLowerCase();
-            
-      if (c=='flag') {
-        if (flags.flagged && this.env.flaggedicon)
-          col.innerHTML = '<img src="'+this.env.flaggedicon+'" alt="" />';
-        else if(!flags.flagged && this.env.unflaggedicon)
-          col.innerHTML = '<img src="'+this.env.unflaggedicon+'" alt="" />';
-        }
-      else if (c=='attachment')
-        col.innerHTML = (attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" />' : '&nbsp;');
-      else
-        col.innerHTML = cols[c];
-
-      row.appendChild(col);
-      }
-
-    this.message_list.insert_row(row, attop);
-
-    // remove 'old' row
-    if (attop && this.env.pagesize && this.message_list.rowcount > this.env.pagesize) {
-      var uid = this.message_list.get_last_row();
-      this.message_list.remove_row(uid);
-      this.message_list.clear_selection(uid);
-      }
-    };
-
-  // messages list handling in background (for performance)
-  this.offline_message_list = function(flag)
-    {
+    var found;
+    if((found = $.inArray('subject', this.env.coltypes)) >= 0) {
+      this.set_env('subject_col', found);
       if (this.message_list)
-      	this.message_list.set_background_mode(flag);
-    };
+        this.message_list.subject_col = found+1;
+    }
+    if((found = $.inArray('flag', this.env.coltypes)) >= 0)
+      this.set_env('flagged_col', found);
+  };
 
   // replace content of row count display
   this.set_rowcount = function(text)
-    {
+  {
     $(this.gui_objects.countdisplay).html(text);
 
     // update page navigation buttons
     this.set_page_buttons();
-    };
+  };
 
   // replace content of mailboxname display
   this.set_mailboxname = function(content)
-    {
+  {
     if (this.gui_objects.mailboxname && content)
       this.gui_objects.mailboxname.innerHTML = content;
-    };
+  };
 
   // replace content of quota display
   this.set_quota = function(content)
-    {
+  {
     if (content && this.gui_objects.quotadisplay) {
       if (typeof(content) == 'object')
         this.percent_indicator(this.gui_objects.quotadisplay, content);
       else
         $(this.gui_objects.quotadisplay).html(content);
-      }
-    };
+    }
+  };
 
   // update the mailboxlist
   this.set_unread_count = function(mbox, count, set_title)
-    {
+  {
     if (!this.gui_objects.mailboxlist)
       return false;
 
     this.env.unread_counts[mbox] = count;
     this.set_unread_count_display(mbox, set_title);
-    }
+  };
 
   // update the mailbox count display
   this.set_unread_count_display = function(mbox, set_title)
-    {
+  {
     var reg, text_obj, item, mycount, childcount, div;
-    if (item = this.get_folder_li(mbox))
-      {
+    if (item = this.get_folder_li(mbox)) {
       mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
       text_obj = item.getElementsByTagName('a')[0];
       reg = /\s+\([0-9]+\)$/i;
 
       childcount = 0;
       if ((div = item.getElementsByTagName('div')[0]) &&
-          div.className.match(/collapsed/))
-        {
+          div.className.match(/collapsed/)) {
         // add children's counters
         for (var k in this.env.unread_counts) 
           if (k.indexOf(mbox + this.env.delimiter) == 0)
             childcount += this.env.unread_counts[k];
-        }
+      }
 
       if (mycount && text_obj.innerHTML.match(reg))
         text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+mycount+')');
@@ -4003,12 +4512,11 @@
         $(item).addClass('unread');
       else
         $(item).removeClass('unread');
-      }
+    }
 
     // set unread count to window title
     reg = /^\([0-9]+\)\s+/i;
-    if (set_title && document.title)
-      {
+    if (set_title && document.title) {
       var doc_title = String(document.title);
       var new_title = "";
 
@@ -4018,27 +4526,34 @@
         new_title = '('+mycount+') '+doc_title;
       else
         new_title = doc_title.replace(reg, '');
-        
+
       this.set_pagetitle(new_title);
-      }
-    };
+    }
+  };
 
   // notifies that a new message(s) has hit the mailbox
   this.new_message_focus = function()
-    {
+  {
     // focus main window
     if (this.env.framed && window.parent)
       window.parent.focus();
     else
       window.focus();
-    }
+  };
 
   this.toggle_prefer_html = function(checkbox)
-    {
+  {
     var addrbook_show_images;
     if (addrbook_show_images = document.getElementById('rcmfd_addrbook_show_images'))
       addrbook_show_images.disabled = !checkbox.checked;
-    }
+  };
+
+  this.toggle_preview_pane = function(checkbox)
+  {
+    var preview_pane_mark_read;
+    if (preview_pane_mark_read = document.getElementById('rcmfd_preview_pane_mark_read'))
+      preview_pane_mark_read.disabled = !checkbox.checked;
+  };
 
   // display fetched raw headers
   this.set_headers = function(content)
@@ -4055,36 +4570,35 @@
 
   // display all-headers row and fetch raw message headers
   this.load_headers = function(elem)
-    {
+  {
     if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
       return;
-    
+
     $(elem).removeClass('show-headers').addClass('hide-headers');
     $(this.gui_objects.all_headers_row).show();
-    elem.onclick = function() { rcmail.hide_headers(elem); }
+    elem.onclick = function() { rcmail.hide_headers(elem); };
 
     // fetch headers only once
-    if (!this.gui_objects.all_headers_box.innerHTML)
-      {
+    if (!this.gui_objects.all_headers_box.innerHTML) {
       this.display_message(this.get_label('loading'), 'loading', true);
       this.http_post('headers', '_uid='+this.env.uid);
-      }
     }
+  };
 
   // hide all-headers row
   this.hide_headers = function(elem)
-    {
+  {
     if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
       return;
 
     $(elem).removeClass('hide-headers').addClass('show-headers');
     $(this.gui_objects.all_headers_row).hide();
-    elem.onclick = function() { rcmail.load_headers(elem); }
-    }
+    elem.onclick = function() { rcmail.load_headers(elem); };
+  };
 
   // percent (quota) indicator
   this.percent_indicator = function(obj, data)
-    {
+  {
     if (!data || !obj)
       return false;
 
@@ -4098,52 +4612,52 @@
 
     this.env.indicator_width = width;
     this.env.indicator_height = height;
-    
+
     // overlimit
     if (quota_width > width) {
       quota_width = width;
       quota = 100; 
-      }
-  
+    }
+
     // main div
     var main = $('<div>');
     main.css({position: 'absolute', top: pos.top, left: pos.left,
-	width: width + 'px', height: height + 'px', zIndex: 100, lineHeight: height + 'px'})
-	.attr('title', data.title).addClass('quota_text').html(quota + '%');
+	    width: width + 'px', height: height + 'px', zIndex: 100, lineHeight: height + 'px'})
+	  .attr('title', data.title).addClass('quota_text').html(quota + '%');
     // used bar
     var bar1 = $('<div>');
     bar1.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
-	width: quota_width + 'px', height: height + 'px', zIndex: 99});
+	    width: quota_width + 'px', height: height + 'px', zIndex: 99});
     // background
     var bar2 = $('<div>');
     bar2.css({position: 'absolute', top: pos.top + 1, left: pos.left + 1,
-	width: width + 'px', height: height + 'px', zIndex: 98})
-	.addClass('quota_bg');
+	    width: width + 'px', height: height + 'px', zIndex: 98})
+	  .addClass('quota_bg');
 
     if (quota >= limit_high) {
       main.addClass(' quota_text_high');
       bar1.addClass('quota_high');
-      }
+    }
     else if(quota >= limit_mid) {
       main.addClass(' quota_text_mid');
       bar1.addClass('quota_mid');
-      }
+    }
     else {
       main.addClass(' quota_text_normal');
       bar1.addClass('quota_low');
-      }
+    }
 
     // replace quota image
     obj.innerHTML = '';
     $(obj).append(bar1).append(bar2).append(main);
-    }
+  };
 
   /********************************************************/
   /*********  html to text conversion functions   *********/
   /********************************************************/
 
   this.html2plain = function(htmlText, id)
-    {
+  {
     var url = this.env.bin_path+'html2text.php';
     var rcmail = this;
 
@@ -4153,15 +4667,15 @@
     $.ajax({ type: 'POST', url: url, data: htmlText, contentType: 'application/octet-stream',
       error: function(o) { rcmail.http_error(o); },
       success: function(data) { rcmail.set_busy(false); $(document.getElementById(id)).val(data); console.log(data); }
-      });
-    }
+    });
+  };
 
   this.plain2html = function(plainText, id)
-    {
+  {
     this.set_busy(true, 'converting');
     $(document.getElementById(id)).val('<pre>'+plainText+'</pre>');
     this.set_busy(false);
-    }
+  };
 
 
   /********************************************************/
@@ -4169,38 +4683,38 @@
   /********************************************************/
 
   this.redirect = function(url, lock)
-    {
+  {
     if (lock || lock === null)
       this.set_busy(true);
 
     if (this.env.framed && window.parent)
       parent.location.href = url;
-    else  
+    else
       location.href = url;
-    };
+  };
 
   this.goto_url = function(action, query, lock)
-    {
+  {
     var querystring = query ? '&'+query : '';
     this.redirect(this.env.comm_path+'&_action='+action+querystring, lock);
-    };
+  };
 
   // send a http request to the server
   this.http_request = function(action, querystring, lock)
   {
     querystring += (querystring ? '&' : '') + '_remote=1';
     var url = this.env.comm_path + '&_action=' + action + '&' + querystring
-    
+
     // send request
-    console.log('HTTP POST: ' + url);
-    jQuery.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
+    console.log('HTTP GET: ' + url);
+    $.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
   };
 
   // send a http POST request to the server
   this.http_post = function(action, postdata, lock)
   {
     var url = this.env.comm_path+'&_action=' + action;
-    
+
     if (postdata && typeof(postdata) == 'object') {
       postdata._remote = 1;
       postdata._unlock = (lock ? 1 : 0);
@@ -4210,14 +4724,14 @@
 
     // send request
     console.log('HTTP POST: ' + url);
-    jQuery.post(url, postdata, function(data){ ref.http_response(data); }, 'json');
+    $.post(url, postdata, function(data){ ref.http_response(data); }, 'json');
   };
 
   // handle HTTP response
   this.http_response = function(response)
   {
     var console_msg = '';
-    
+
     if (response.unlock)
       this.set_busy(false);
 
@@ -4237,13 +4751,13 @@
       console.log(response.exec);
       eval(response.exec);
     }
-    
+
     // execute callback functions of plugins
     if (response.callbacks && response.callbacks.length) {
       for (var i=0; i < response.callbacks.length; i++)
         this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
     }
- 
+
     // process the response data according to the sent action
     switch (response.action) {
       case 'delete':
@@ -4253,15 +4767,15 @@
           this.enable_command('delete', 'edit', (uid && this.contact_list.rows[uid] && this.env.address_sources && !this.env.address_sources[this.env.source].readonly));
           this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
         }
-      
+
       case 'moveto':
         if (this.env.action == 'show') {
-	  // re-enable commands on move/delete error
-	  this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
+          // re-enable commands on move/delete error
+          this.enable_command('reply', 'reply-all', 'forward', 'delete', 'mark', 'print', 'open', 'edit', 'viewsource', 'download', true);
         } else if (this.message_list)
           this.message_list.init();
         break;
-        
+
       case 'purge':
       case 'expunge':
         if (!this.env.messagecount && this.task == 'mail') {
@@ -4269,29 +4783,38 @@
           if (this.env.contentframe)
             this.show_contentframe(false);
           // disable commands useless when mailbox is empty
-          this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 
-	    'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 
-	    'purge', 'expunge', 'select-all', 'select-none', 'sort', false);
+          this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'copy', 'delete', 
+            'mark', 'viewsource', 'open', 'edit', 'download', 'print', 'load-attachment', 
+            'purge', 'expunge', 'select-all', 'select-none', 'sort',
+            'expand-all', 'expand-unread', 'collapse-all', false);
         }
         break;
 
       case 'check-recent':
       case 'getunread':
+      case 'search':
       case 'list':
         if (this.task == 'mail') {
-          if (this.message_list && response.action == 'list')
+          if (this.message_list && (response.action == 'list' || response.action == 'search')) {
             this.msglist_select(this.message_list);
+            this.expand_threads();
+          }
           this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
           this.enable_command('purge', this.purge_mailbox_test());
-          
+
+          this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount);
+
           if (response.action == 'list')
             this.triggerEvent('listupdate', { folder:this.env.mailbox, rowcount:this.message_list.rowcount });
         }
         else if (this.task == 'addressbook') {
           this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
-          
-          if (response.action == 'list')
+
+          if (response.action == 'list') {
+            this.enable_command('group-create', this.env.address_sources[this.env.source].groups);
+            this.enable_command('group-rename', 'group-delete', this.env.address_sources[this.env.source].groups && this.env.group);
             this.triggerEvent('listupdate', { folder:this.env.source, rowcount:this.contact_list.rowcount });
+          }
         }
         break;
     }
@@ -4299,33 +4822,44 @@
 
   // handle HTTP request errors
   this.http_error = function(request, status, err)
-    {
+  {
     var errmsg = request.statusText;
 
     this.set_busy(false);
     request.abort();
-    
+
     if (errmsg)
       this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
-    };
+  };
 
   // use an image to send a keep-alive siganl to the server
   this.send_keep_alive = function()
-    {
+  {
     var d = new Date();
     this.http_request('keep-alive', '_t='+d.getTime());
-    };
+  };
+
+  // start interval for keep-alive/recent_check signal
+  this.start_keepalive = function()
+  {
+    if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.mailboxlist)
+      this._int = setInterval(function(){ ref.check_for_recent(false); }, this.env.keep_alive * 1000);
+    else if (this.env.keep_alive && !this.env.framed && this.task!='login')
+      this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);
+  };
 
   // send periodic request to check for recent messages
-  this.check_for_recent = function(setbusy)
-    {
+  this.check_for_recent = function(refresh)
+  {
     if (this.busy)
       return;
 
-    if (setbusy)
-      this.set_busy(true, 'checkingmail');
-
     var addurl = '_t=' + (new Date().getTime());
+
+    if (refresh) {
+      this.set_busy(true, 'checkingmail');
+      addurl += '&_refresh=1';
+    }
 
     if (this.gui_objects.messagelist)
       addurl += '&_list=1';
@@ -4335,85 +4869,82 @@
       addurl += '&_search=' + this.env.search_request;
 
     this.http_request('check-recent', addurl, true);
-    };
+  };
 
 
   /********************************************************/
   /*********            helper methods            *********/
   /********************************************************/
-  
+
   // check if we're in show mode or if we have a unique selection
   // and return the message uid
   this.get_single_uid = function()
-    {
+  {
     return this.env.uid ? this.env.uid : (this.message_list ? this.message_list.get_single_selection() : null);
-    };
+  };
 
   // same as above but for contacts
   this.get_single_cid = function()
-    {
+  {
     return this.env.cid ? this.env.cid : (this.contact_list ? this.contact_list.get_single_selection() : null);
-    };
+  };
 
-
+  // gets cursor position
   this.get_caret_pos = function(obj)
-    {
+  {
     if (typeof(obj.selectionEnd)!='undefined')
       return obj.selectionEnd;
-    else if (document.selection && document.selection.createRange)
-      {
+    else if (document.selection && document.selection.createRange) {
       var range = document.selection.createRange();
       if (range.parentElement()!=obj)
         return 0;
 
       var gm = range.duplicate();
-      if (obj.tagName=='TEXTAREA')
+      if (obj.tagName == 'TEXTAREA')
         gm.moveToElementText(obj);
       else
         gm.expand('textedit');
-      
+
       gm.setEndPoint('EndToStart', range);
       var p = gm.text.length;
 
       return p<=obj.value.length ? p : -1;
-      }
+    }
     else
       return obj.value.length;
-    };
+  };
 
+  // moves cursor to specified position
   this.set_caret_pos = function(obj, pos)
-    {
+  {
     if (obj.setSelectionRange)
       obj.setSelectionRange(pos, pos);
-    else if (obj.createTextRange)
-      {
+    else if (obj.createTextRange) {
       var range = obj.createTextRange();
       range.collapse(true);
       range.moveEnd('character', pos);
       range.moveStart('character', pos);
       range.select();
-      }
     }
+  };
 
   // set all fields of a form disabled
   this.lock_form = function(form, lock)
-    {
+  {
     if (!form || !form.elements)
       return;
-    
+
     var type;
-    for (var n=0; n<form.elements.length; n++)
-      {
+    for (var n=0; n<form.elements.length; n++) {
       type = form.elements[n];
       if (type=='hidden')
         continue;
-        
-      form.elements[n].disabled = lock;
-      }
-    };
-    
-}  // end object rcube_webmail
 
+      form.elements[n].disabled = lock;
+    }
+  };
+
+}  // end object rcube_webmail
 
 // copy event engine prototype
 rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;

--
Gitblit v1.9.1