From 186537b2c60517ba8cc9283a80b7092b6d9e2b3e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Fri, 16 Apr 2010 07:50:59 -0400
Subject: [PATCH] - more code formatting - allow re-selecting highlighted row (#1486442)

---
 program/js/app.js | 2822 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 1,735 insertions(+), 1,087 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 9dc9c91..bc0962b 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                               |
@@ -54,7 +55,8 @@
   this.env.blankpage = 'program/blank.gif';
 
   // set jQuery ajax options
-  jQuery.ajaxSetup({ cache:false,
+  jQuery.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); }
   });
@@ -130,8 +132,7 @@
     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;
       }
@@ -160,80 +161,80 @@
     switch (this.task)
       {
       case 'mail':
+        // 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, draggable:true, keyboard:true, dblclick_time:this.dblclick_time});
+          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);
+          
+          // load messages
+          if (this.env.messagecount)
+            this.command('list');
+          }
 
-        // enable mail commands
-        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', 'collapse-folder', true);
-
-        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.gui_objects.qsearchbox) {
+          if (this.env.search_text != null) {
+            this.gui_objects.qsearchbox.value = this.env.search_text;
             }
-          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);
-            }
+          $(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=='compose')
-          {
+        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.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);
             
@@ -242,44 +243,47 @@
           // 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);
           else
             this.http_post('mark', mdnurl+'&_flag=mdnsent');
-        }
+          }
 
         break;
 
 
       case 'addressbook':
+        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:true, keyboard:true});
+          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,21 +295,19 @@
           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); };
+          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(); });
             }
-          else
-            this.contact_list.focus();
-            
-          this.gui_objects.folderlist = this.gui_objects.contactslist;
           }
 
         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);
@@ -313,12 +315,12 @@
         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;
 
 
@@ -333,7 +335,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 +353,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();
@@ -393,8 +394,7 @@
     
     // 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')
@@ -404,101 +404,6 @@
     // start keep-alive interval
     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']"));
-
-    // 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]);
-    }
-
-    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');
-    };
 
 
   /*********************************************************/
@@ -576,10 +481,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;
         }
@@ -587,8 +496,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();
 
@@ -596,15 +504,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;
 
 
@@ -619,15 +531,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);
@@ -663,33 +570,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':
@@ -752,7 +655,6 @@
           this.delete_identity();
         break;
 
-
       // mail task commands
       case 'move':
       case 'moveto':
@@ -760,6 +662,11 @@
           this.move_messages(props);
         else if (this.task == 'addressbook' && this.drag_active)
           this.copy_contact(null, props);
+        break;
+
+      case 'copy':
+        if (this.task == 'mail')
+          this.copy_messages(props);
         break;
 
       case 'mark':
@@ -774,16 +681,16 @@
         var uid;
         var flag = 'read';
         
-        if (props._row.uid)
-          {
+        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;
@@ -795,8 +702,7 @@
         var uid;
         var flag = 'flagged';
 
-        if (props._row.uid)
-          {
+        if (props._row.uid) {
           uid = props._row.uid;
           // toggle flagged/unflagged
           if (this.message_list.rows[uid].flagged)
@@ -821,30 +727,45 @@
         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 && jQuery.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':
@@ -874,12 +795,10 @@
       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;
@@ -888,36 +807,33 @@
              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();
           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;
@@ -986,6 +902,10 @@
         this.remove_attachment(props);
         break;
 
+      case 'insert-sig':
+        this.change_identity($("[name='_from']")[0], true);
+        break;
+
       case 'reply-all':
       case 'reply':
         var uid;
@@ -1032,7 +952,7 @@
       case 'add-contact':
         this.add_contact(props);
         break;
-      
+
       // quicksearch
       case 'search':
         if (!props && this.gui_objects.qsearchbox)
@@ -1051,7 +971,19 @@
         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':
@@ -1066,7 +998,7 @@
           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':
@@ -1108,7 +1040,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;
@@ -1232,51 +1172,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);
+    var 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();
-    }
-
-    // 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();
+    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;
     }
     
-    // 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 = {};
+    return false;
+  };
+
+  this.drag_menu_action = function(action)
+  {
+    var menu = $('#'+this.gui_objects.message_dragmenu);
+    if (menu) {
+      menu.hide();
     }
+    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)
       {
@@ -1352,7 +1283,7 @@
             && 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')) {
@@ -1361,7 +1292,7 @@
             
             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) {
@@ -1383,49 +1314,90 @@
   };
 
   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);
+    var div = $(li.getElementsByTagName('div')[0]);
+    
+    if (!div || (!div.hasClass('collapsed') && !div.hasClass('expanded')))
+      return;
+    
+    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)+'&');
 
-        // 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);
-        }
+      // 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) &&
-          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 = '';
-        }
-
-      this.http_post('save-pref', '_name=collapsed_folders&_value='+urlencode(this.env.collapsed_folders));
-      this.set_unread_count_display(id, false);
+    // 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();
 
@@ -1434,59 +1406,80 @@
     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);
 
-    var selected = list.selection.length==1;
+    if (this.preview_read_timer)
+      clearTimeout(this.preview_read_timer);
+
+    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) {
+        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()
   {
@@ -1497,12 +1490,20 @@
       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);
   };
@@ -1512,20 +1513,228 @@
   /*********     (message) list functionality      *********/
   /*********************************************************/
 
+  this.init_message_row = function(row)
+  {
+    var self = this;
+    var 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];
+
+    var rows = this.message_list.rows;
+    var rowcount = tbody.rows.length;
+    var even = rowcount%2;
+
+    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 message = this.env.messages[uid];
+
+    var 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
+    var row = document.createElement('tr');
+    row.id = 'rcmrow'+uid;
+    row.className = css_class;
+
+    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;
+
+    var tree = expando = '';
+
+    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
+    var col = document.createElement('td');
+    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';
@@ -1537,45 +1746,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')
@@ -1584,96 +1793,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();
 
@@ -1681,7 +1888,612 @@
     var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : '');
     this.set_busy(true, 'loading');
     this.http_request('list', url+add_url, true);
-    };
+  };
+
+  // expand all threads with unread children
+  this.expand_unread = function()
+  {
+    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 = new Array();
+
+    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
+  this.set_message_icon = function(uid)
+  {
+    var icn_src;
+    var rows = this.message_list.rows;
+
+    if (!rows[uid])
+      return false;
+    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) {
+      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;
+
+    if (flag == 'unread')
+      rows[uid].unread = status;
+    else if(flag == 'deleted')
+      rows[uid].deleted = status;
+    else if (flag == 'replied')
+      rows[uid].replied = status;
+    else if (flag == 'forwarded')
+      rows[uid].forwarded = status;
+    else if (flag == 'flagged')
+      rows[uid].flagged = status;
+
+//    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 && !rowobj.hasClass('unread'))
+      rowobj.addClass('unread');
+    else if (!rows[uid].unread && rowobj.hasClass('unread'))
+      rowobj.removeClass('unread');
+    
+    if (rows[uid].deleted && !rowobj.hasClass('deleted'))
+      rowobj.addClass('deleted');
+    else if (!rows[uid].deleted && rowobj.hasClass('deleted'))
+      rowobj.removeClass('deleted');
+
+    if (rows[uid].flagged && !rowobj.hasClass('flagged'))
+      rowobj.addClass('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 = new Array();
+
+    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;
+
+    var lock = false;
+    var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
+
+    // show wait message
+    if (this.env.action=='show') {
+      lock = true;
+      this.set_busy(true, 'movingmessage');
+    }
+    else
+      this.show_contentframe(false);
+
+    // Hide message command buttons until a message is selected
+    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 ? $.merge([], this.message_list.get_selection()) : new Array();
+
+    // 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) {
+      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 || 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 (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 moveto/delete request with UIDs of all selected messages
+  // @private
+  this._with_selected_messages = function(action, lock, add_url)
+  {
+    var a_uids = new Array(),
+      count = 0;
+
+    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;
+        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
+      if (!this.env.display_next)
+        this.message_list.clear_selection();
+    }
+
+    // also send search request to get the right messages 
+    if (this.env.search_request) 
+      add_url += '&_search='+this.env.search_request;
+
+    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, '_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(),
+      r_uids = new Array(),
+      selection = this.message_list ? this.message_list.get_selection() : new Array();
+
+    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++) {
+          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++) {
+        id = a_uids[n];
+        if ((flag=='read' && this.message_list.rows[id].unread) 
+            || (flag=='unread' && !this.message_list.rows[id].unread)
+            || (flag=='delete' && !this.message_list.rows[id].deleted)
+            || (flag=='undelete' && this.message_list.rows[id].deleted)
+            || (flag=='flagged' && !this.message_list.rows[id].flagged)
+            || (flag=='unflagged' && this.message_list.rows[id].flagged))
+        {
+          r_uids[r_uids.length] = id;
+        }
+      }
+
+    // nothing to do
+    if (!r_uids.length && !this.select_all_mode)
+      return;
+
+    switch (flag) {
+        case 'read':
+        case 'unread':
+          this.toggle_read_status(flag, r_uids);
+          break;
+        case 'delete':
+        case 'undelete':
+          this.toggle_delete_status(r_uids);
+          break;
+        case 'flagged':
+        case 'unflagged':
+          this.toggle_flagged_status(flag, a_uids);
+          break;
+    }
+  };
+
+  // set class to read/unread
+  this.toggle_read_status = function(flag, a_uids)
+  {
+    // mark all message rows as read/unread
+    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='+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
+  this.toggle_flagged_status = function(flag, a_uids)
+  {
+    // mark all message rows as flagged/unflagged
+    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='+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)
+    {
+      if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
+        this.flag_as_deleted(a_uids);
+      else
+        this.flag_as_undeleted(a_uids);
+
+      return true;
+    }
+    
+    var all_deleted = true;
+    for (var uid, i=0; i<a_uids.length; i++)
+    {
+      uid = a_uids[i];
+      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;
+  };
+
+  this.flag_as_undeleted = function(a_uids)
+  {
+    for (var i=0; i<a_uids.length; i++)
+      this.set_message(a_uids[i], 'deleted', false);
+
+    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 = '',
+      r_uids = new Array(),
+      rows = this.message_list ? this.message_list.rows : new Array(),
+      count = 0;
+
+    for (var i=0; i<a_uids.length; i++) {
+      uid = a_uids[i];
+      if (rows[uid]) {
+        if (rows[uid].unread)
+          r_uids[r_uids.length] = uid;
+
+	    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);
+      }
+    }
+
+    // make sure there are no selected rows
+    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='+this.uids_to_list(r_uids);
+
+    if (this.env.skip_deleted) {
+      // also send search request to get the right messages 
+      if (this.env.search_request) 
+        add_url += '&_search='+this.env.search_request;
+      if (this.env.display_next && this.env.next_uid)
+        add_url += '&_next_uid='+this.env.next_uid;
+    }
+    
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);
+    return true;  
+  };
+
+  // flag as read without mark request (called from backend)
+  // argument should be a coma-separated list of uids
+  this.flag_deleted_as_read = function(uids)
+  {
+    var icn_src, uid,
+      rows = this.message_list ? this.message_list.rows : new Array(),
+      str = String(uids),
+      a_uids = str.split(',');
+
+    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)
     {
@@ -1731,394 +2543,6 @@
       || this.env.mailbox.match('^' + RegExp.escape(this.env.junk_mailbox) + RegExp.escape(this.env.delimiter))));
   };
 
-  // set message icon
-  this.set_message_icon = function(uid)
-  {
-    var icn_src;
-    var rows = this.message_list.rows;
-
-    if (!rows[uid])
-      return false;
-
-    if (rows[uid].deleted && this.env.deletedicon)
-      icn_src = this.env.deletedicon;
-    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;
-
-    if (flag == 'unread')
-      rows[uid].unread = status;
-    else if(flag == 'deleted')
-      rows[uid].deleted = status;
-    else if (flag == 'replied')
-      rows[uid].replied = status;
-    else if (flag == 'forwarded')
-      rows[uid].forwarded = status;
-    else if (flag == 'flagged')
-      rows[uid].flagged = status;
-
-    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';
-      rowobj.addClass('unread');
-      }
-    else if (!rows[uid].unread && rows[uid].classname.indexOf('unread')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
-      rowobj.removeClass('unread');
-      }
-    
-    if (rows[uid].deleted && rows[uid].classname.indexOf('deleted')<0)
-      {
-      rows[uid].classname += ' deleted';
-      rowobj.addClass('deleted');
-      }
-    else if (!rows[uid].deleted && rows[uid].classname.indexOf('deleted')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
-      rowobj.removeClass('deleted');
-      }
-
-    if (rows[uid].flagged && rows[uid].classname.indexOf('flagged')<0)
-      {
-      rows[uid].classname += ' flagged';
-      rowobj.addClass('flagged');
-      }
-    else if (!rows[uid].flagged && rows[uid].classname.indexOf('flagged')>=0)
-      {
-      rows[uid].classname = rows[uid].classname.replace(/\s*flagged/, '');
-      rowobj.removeClass('flagged');
-      }
-
-    this.set_message_icon(uid);
-    }
-
-  // move selected messages to the specified mailbox
-  this.move_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 lock = false;
-    var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
-
-    // show wait message
-    if (this.env.action=='show')
-      {
-      lock = true;
-      this.set_busy(true, 'movingmessage');
-      }
-    else
-      this.show_contentframe(false);
-
-    // Hide message command buttons until a message is selected
-    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();
-
-    // exit if no mailbox specified or if selection is empty
-    if (!this.env.uid && !selection.length)
-      return;
-
-    // if config is set to flag for deletion
-    if (this.env.flag_for_deletion)
-      this.mark_message('delete');
-    // 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()) 
-      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 (confirm(this.get_label('deletemessagesconfirm')))
-          this.permanently_remove_messages();
-        }
-      else
-        this.move_messages(this.env.trash_mailbox);
-      }
-  };
-
-  // 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
-  // @private
-  this._with_selected_messages = function(action, lock, add_url, remove)
-  {
-    var a_uids = new Array();
-
-    if (this.env.uid)
-      a_uids[0] = this.env.uid;
-    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;
-        this.message_list.remove_row(id, (this.env.display_next && n == selection.length-1));
-      }
-      // make sure there are no selected rows
-      if (!this.env.display_next)
-        this.message_list.clear_selection();
-    }
-
-    // also send search request to get the right messages 
-    if (this.env.search_request) 
-      add_url += '&_search='+this.env.search_request;
-
-    if (this.env.display_next && this.env.next_uid)
-      add_url += '&_next_uid='+this.env.next_uid;
-
-    // send request to server
-    this.http_post(action, '_uid='+a_uids.join(',')+'&_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();
-
-    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++)
-        {
-          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++)
-      {
-        id = a_uids[n];
-        if ((flag=='read' && this.message_list.rows[id].unread) 
-            || (flag=='unread' && !this.message_list.rows[id].unread)
-            || (flag=='delete' && !this.message_list.rows[id].deleted)
-            || (flag=='undelete' && this.message_list.rows[id].deleted)
-            || (flag=='flagged' && !this.message_list.rows[id].flagged)
-            || (flag=='unflagged' && this.message_list.rows[id].flagged))
-        {
-          r_uids[r_uids.length] = id;
-        }
-      }
-
-    // nothing to do
-    if (!r_uids.length)
-      return;
-
-    switch (flag)
-      {
-        case 'read':
-        case 'unread':
-          this.toggle_read_status(flag, r_uids);
-          break;
-        case 'delete':
-        case 'undelete':
-          this.toggle_delete_status(r_uids);
-          break;
-        case 'flagged':
-        case 'unflagged':
-          this.toggle_flagged_status(flag, a_uids);
-          break;
-      }
-    };
-
-  // set class to read/unread
-  this.toggle_read_status = function(flag, a_uids)
-  {
-    // mark all message rows as read/unread
-    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);
-  };
-
-  // set image to flagged or unflagged
-  this.toggle_flagged_status = function(flag, a_uids)
-  {
-    // mark all message rows as flagged/unflagged
-    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);
-  };
-  
-  // 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)
-    {
-      if (!rows.length || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
-        this.flag_as_deleted(a_uids);
-      else
-        this.flag_as_undeleted(a_uids);
-
-      return true;
-    }
-    
-    var all_deleted = true;
-    for (var i=0; i<a_uids.length; i++)
-    {
-      uid = a_uids[i];
-      if (rows[uid]) {
-        if (!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;
-  };
-
-  this.flag_as_undeleted = function(a_uids)
-  {
-    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');
-    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++)
-      {
-      uid = a_uids[i];
-      if (rows[uid])
-        {
-        if (rows[uid].unread)
-          r_uids[r_uids.length] = uid;
-
-	if (this.env.skip_deleted)
-          this.message_list.remove_row(uid, (this.env.display_next && i == this.message_list.selection.length-1));
-	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();
-
-    add_url = '&_from='+(this.env.action ? this.env.action : '');
-    
-    if (r_uids.length)
-      add_url += '&_ruid='+r_uids.join(',');
-
-    if (this.env.skip_deleted) {
-      // also send search request to get the right messages 
-      if (this.env.search_request) 
-        add_url += '&_search='+this.env.search_request;
-      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);
-    return true;  
-  };
-
-  // flag as read without mark request (called from backend)
-  // 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();
-
-    a_uids = str.split(',');
-
-    for (var uid, i=0; i<a_uids.length; i++)
-      {
-      uid = a_uids[i];
-      if (rows[uid])
-        this.set_message(uid, 'unread', false);
-      }
-  };
-  
   
   /*********************************************************/
   /*********           login form methods          *********/
@@ -2144,9 +2568,57 @@
   /*********        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']");
@@ -2156,21 +2628,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) {
@@ -2181,36 +2651,30 @@
     }
     
     // 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();
@@ -2220,49 +2684,49 @@
       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();
@@ -2293,126 +2757,152 @@
       this.cmp_hash = str;
 
     return str;
-    };
+  };
     
-  this.change_identity = function(obj)
-    {
+  this.change_identity = function(obj, show_sig)
+  {
     if (!obj || !obj.options)
       return false;
+
+    if (!show_sig)
+      show_sig = this.env.show_sig;
 
     var id = obj.options[obj.selectedIndex].value;
     var input_message = $("[name='_message']");
     var message = input_message.val();
     var is_html = ($("input[name='_is_html']").val() == '1');
-    var sig, p, len;
+    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
   
-    if (!is_html)
-      {
-      // remove the 'old' signature
-      if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
-        {
-        if (this.env.signatures[this.env.identity]['is_html'])
-          sig = this.env.signatures[this.env.identity]['plain_text'];
-        else
-          sig = this.env.signatures[this.env.identity]['text'];
-        
-        if (sig.indexOf('-- ')!=0)
-          sig = '-- \n'+sig;
-
-        p = message.lastIndexOf(sig);
-        if (p>=0)
-          message = message.substring(0, p-1) + message.substring(p+sig.length, message.length);
-        }
-
-      message = message.replace(/[\r\n]+$/, '');
-      len = message.length;
-
-      // add the new signature string
-      if (this.env.signatures && this.env.signatures[id])
-        {
-        sig = this.env.signatures[id]['text'];
-        if (this.env.signatures[id]['is_html'])
-          {
-          sig = this.env.signatures[id]['plain_text'];
-          }
-        if (sig.indexOf('-- ')!=0)
-          sig = '-- \n'+sig;
-        message += '\n\n'+sig;
-	if (len) len += 1;
-        }
-      }
+    // enable manual signature insert
+    if (this.env.signatures && this.env.signatures[id])
+      this.enable_command('insert-sig', true);
     else
-      {
-      var editor = tinyMCE.get(this.env.composebody);
+      this.enable_command('insert-sig', false);
 
-      if (this.env.signatures)
-        {
-        // Append the signature as a div within the body
-        var sigElem = editor.dom.get('_rc_sig');
-        var newsig = '';
-        var htmlsig = true;
+    if (!is_html) {
+      // 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;
+        sig = sig.replace(/\r\n/, '\n');
 
-        if (!sigElem)
-          {
-          // add empty line before signature on IE
-          if (bw.ie)
-            editor.getBody().appendChild(editor.getDoc().createElement('br'));
+        if (!sig.match(/^--[ -]\n/))
+          sig = sig_separator + '\n' + sig;
 
-          sigElem = editor.getDoc().createElement('div');
-          sigElem.setAttribute('id', '_rc_sig');
-          editor.getBody().appendChild(sigElem);
+        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'];
+        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
+            message = message.substring(0, p) + sig + message.substring(p, message.length);
+            cursor_pos = p - 1;
+          } 
+          else if (pos = this.get_caret_pos(input_message.get(0))) { // at cursor position
+            message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
+            cursor_pos = pos;
           }
+          else { // on top
+            cursor_pos = 0;
+            message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
+          } 
+        }
+        else {
+          message = message.replace(/[\r\n]+$/, '');
+          cursor_pos = !this.env.top_posting && message.length ? message.length+1 : 0;
+          message += '\n\n' + sig;
+        }
+      }
+      else
+        cursor_pos = this.env.top_posting ? 0 : message.length;
 
-        if (this.env.signatures[id])
-        {
-          newsig = this.env.signatures[id]['text'];
-          htmlsig = this.env.signatures[id]['is_html'];
+      input_message.val(message);
 
-          if (newsig) {
-            if (htmlsig && this.env.signatures[id]['plain_text'].indexOf('-- ')!=0)
-              newsig = '<p>-- </p>' + newsig;
-            else if (!htmlsig && newsig.indexOf('-- ')!=0)
-              newsig = '-- \n' + newsig;
+      // move cursor before the signature
+      this.set_caret_pos(input_message.get(0), cursor_pos);
+    }
+    else if (show_sig && this.env.signatures) {  // html
+      var editor = tinyMCE.get(this.env.composebody);
+      var sigElem = editor.dom.get('_rc_sig');
+
+      // Append the signature as a div within the body
+      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
+            body.insertBefore(sigElem, body.firstChild);
+            body.insertBefore(doc.createElement('br'), body.firstChild);
+          }
+          else {
+            body.insertBefore(sigElem, node.nextSibling);
+            body.insertBefore(doc.createElement('br'), node.nextSibling);
           }
         }
+        else {
+          if (bw.ie)  // add empty line before signature on IE
+            body.appendChild(doc.createElement('br'));
 
-        if (htmlsig)
-          sigElem.innerHTML = newsig;
-        else
-          sigElem.innerHTML = '<pre>' + newsig + '</pre>';
+          body.appendChild(sigElem);
         }
       }
 
-    input_message.val(message);
+      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.match(/^--[ -]\r?\n/))
+            sig = sig_separator + '<br />' + sig;
+        }
+        else {
+          sig = this.env.signatures[id].text;
+          if (!sig.match(/^--[ -]\r?\n/))
+            sig = sig_separator + '\n' + sig;
+          sig = '<pre>' + sig + '</pre>';
+        }
 
-    // move cursor before the signature
-    if (!is_html)
-      this.set_caret_pos(input_message.get(0), len);
+        sigElem.innerHTML = sig;
+      }
+    }
 
     this.env.identity = id;
     return true;
-    };
+  };
 
   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 {
@@ -2422,38 +2912,34 @@
     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';
@@ -2461,7 +2947,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];
@@ -2499,12 +2985,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
@@ -2547,50 +3033,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 = new Array();
+            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;
@@ -2601,26 +3089,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);
-    }
+  };
 
 
   /*********************************************************/
@@ -2712,13 +3201,32 @@
     // 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
     cpos = p+insert.length;
     if (this.ksearch_input.setSelectionRange)
       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
@@ -2754,7 +3262,7 @@
     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));
   };
 
@@ -2772,8 +3280,8 @@
   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) {
@@ -2785,11 +3293,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;
@@ -2867,15 +3376,18 @@
       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)
@@ -2884,14 +3396,18 @@
       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);
+      this.list_contacts_remote(src, group, page);
       return;
       }
 
@@ -2900,17 +3416,22 @@
       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);
@@ -2920,6 +3441,10 @@
     // 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) 
@@ -2946,7 +3471,7 @@
     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;
     };
@@ -2957,8 +3482,10 @@
     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));
     };
 
 
@@ -2966,7 +3493,7 @@
     {
     // 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();
@@ -2994,7 +3521,11 @@
       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;
     };
 
@@ -3009,11 +3540,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;
@@ -3051,6 +3582,140 @@
     
     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;
+    var 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] });
+  };
 
 
   /*********************************************************/
@@ -3334,10 +3999,13 @@
     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];
@@ -3350,10 +4018,11 @@
       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');
+      return false;
       }
     else
       {
@@ -3379,7 +4048,7 @@
     // set messages count to zero
     if (!replace)
       row.cells[1].innerHTML = '*';
-    
+
     if (!replace && row.cells[2] && row.cells[2].firstChild.tagName.toLowerCase()=='input')
       {
       row.cells[2].firstChild.value = name;
@@ -3468,7 +4137,20 @@
     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)
     {
@@ -3743,157 +4425,97 @@
     };
 
   // 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)
     {
       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 (!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++) 
+
+    // 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.coltypes[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]);
+          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;
-
-    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
-    };
-
-    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 excessive columns
+    for (var i=n+1; thead && i<thead.rows[0].cells.length; i++)
+      thead.rows[0].removeChild(thead.rows[0].cells[i]);
 
-    // 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);
-      }
-    };
+    this.env.subject_col = null;
+    this.env.flagged_col = null;
 
-  // messages list handling in background (for performance)
-  this.offline_message_list = function(flag)
-    {
+    var found;
+    if((found = jQuery.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 = jQuery.inArray('flag', this.env.coltypes)) >= 0)
+      this.set_env('flagged_col', found);
+  };
 
   // replace content of row count display
   this.set_rowcount = function(text)
@@ -4004,6 +4626,13 @@
     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
@@ -4141,7 +4770,7 @@
 
     if (this.env.framed && window.parent)
       parent.location.href = url;
-    else  
+    else
       location.href = url;
     };
 
@@ -4158,7 +4787,7 @@
     var url = this.env.comm_path + '&_action=' + action + '&' + querystring
     
     // send request
-    console.log('HTTP POST: ' + url);
+    console.log('HTTP GET: ' + url);
     jQuery.get(url, { _unlock:(lock?1:0) }, function(data){ ref.http_response(data); }, 'json');
   };
 
@@ -4209,7 +4838,7 @@
       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':
@@ -4222,8 +4851,8 @@
       
       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;
@@ -4235,29 +4864,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;
     }
@@ -4282,16 +4920,27 @@
     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';
@@ -4379,7 +5028,6 @@
     };
     
 }  // end object rcube_webmail
-
 
 // copy event engine prototype
 rcube_webmail.prototype.addEventListener = rcube_event_engine.prototype.addEventListener;

--
Gitblit v1.9.1