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 | 1241 +++++++++++++++++++++++++++++++++-------------------------
 1 files changed, 711 insertions(+), 530 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 1f72909..bc0962b 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -55,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); }
   });
@@ -131,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;
       }
@@ -170,75 +170,71 @@
             {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.set_message_coltypes(this.env.coltypes);
           this.message_list.init();
           this.enable_command('toggle_status', 'toggle_flag', 'menu-open', 'menu-save', true);
-          
-          if (this.gui_objects.mailcontframe)
-            this.gui_objects.mailcontframe.onmousedown = function(e){ return p.click_on_list(e); };
-          else
-            this.message_list.focus();
           
           // load messages
           if (this.env.messagecount)
             this.command('list');
           }
 
-        if (this.env.search_text != null && document.getElementById('quicksearchbox') != null)
-          document.getElementById('quicksearchbox').value = this.env.search_text;
-        
-        if (this.env.action=='show' || this.env.action=='preview')
-          {
-          this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', '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.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);
             
@@ -247,46 +243,47 @@
           // init message compose form
           this.init_messageform();
           }
+        // show printing dialog
+        else if (this.env.action == 'print')
+          window.print();
 
         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); });
@@ -298,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)
+        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);
@@ -325,7 +320,7 @@
         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;
 
 
@@ -399,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')
@@ -489,14 +483,12 @@
 
       case 'menu-open':
       case 'menu-save':
-	this.triggerEvent(command, {props:props});
-	return false;
-        break;
+        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;
         }
@@ -504,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();
 
@@ -513,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', 'import', (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;
 
 
@@ -575,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':
@@ -690,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;
@@ -711,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)
@@ -737,26 +727,25 @@
         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 && jQuery.inArray(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':
@@ -806,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;
@@ -820,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;
@@ -968,7 +952,7 @@
       case 'add-contact':
         this.add_contact(props);
         break;
-      
+
       // quicksearch
       case 'search':
         if (!props && this.gui_objects.qsearchbox)
@@ -987,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':
@@ -1176,58 +1172,19 @@
   /*********        event handling methods         *********/
   /*********************************************************/
 
-  this.doc_mouse_up = function(e)
-  {
-    var model, list, li;
-
-    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) {
-      var mbox = model[this.env.last_folder_target].id;
-
-      $(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, mbox))
-        this.command('moveto', mbox);
-    }
-    
-    // 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.drag_menu = function(e, mbox)
+  this.drag_menu = function(e, target)
   {
     var modkey = rcube_event.get_modifier(e);
     var menu = $('#'+this.gui_objects.message_dragmenu);
 
-    if (menu && modkey == SHIFT_KEY) {
+    if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
       var pos = rcube_event.get_mouse_pos(e);
-      this.env.drag_mbox = mbox;
+      this.env.drag_target = target;
       menu.css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'}).show();
       return true;
     }
+    
+    return false;
   };
 
   this.drag_menu_action = function(action)
@@ -1236,18 +1193,21 @@
     if (menu) {
       menu.hide();
     }
-    this.command(action, this.env.drag_mbox);
-    this.env.drag_mbox = null;
+    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)
       {
@@ -1323,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')) {
@@ -1332,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) {
@@ -1354,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();
 
@@ -1405,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);
+
+    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', 'copy', 'mark', (list.selection.length > 0 ? true : false));
-      }
-    else
-      {
+    }
+    else {
       this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', 'edit', 'open', 'download', 'viewsource', selected);
       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()
   {
@@ -1479,7 +1501,9 @@
     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);
   };
@@ -1659,13 +1683,13 @@
 
   // messages list handling in background (for performance)
   this.offline_message_list = function(flag)
-    {
-      if (this.message_list)
-      	this.message_list.set_background_mode(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)
@@ -1673,45 +1697,44 @@
     
     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';
@@ -1723,46 +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);
-        this.update_thread_root(id, 'read');
-        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')
@@ -1771,38 +1793,37 @@
       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, add_url)
-    {
+  {
     var url = '';
     var target = window;
 
@@ -1821,48 +1842,45 @@
       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))
       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)
-      {
+    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];
       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 : '')+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();
 
@@ -1870,11 +1888,11 @@
     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;
@@ -1882,20 +1900,20 @@
     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;
+	    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
@@ -1904,20 +1922,20 @@
     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);
     }
+    //  this.message_list.expand(null);
+  }
 
   // update parent in a thread
   this.update_thread_root = function(uid, flag)
@@ -1925,7 +1943,7 @@
     if (!this.env.threading)
       return;
 
-    var root = this.find_thread_root(uid);
+    var root = this.message_list.find_root(uid);
     
     if (uid == root)
       return;
@@ -1945,17 +1963,6 @@
     this.set_unread_children(root);
   };
 
-  // finds root message for specified thread
-  this.find_thread_root = function(uid)
-  {
-    var r = this.message_list.rows[uid];
-  
-    if (r.parent_uid)
-      return this.find_thread_root(r.parent_uid);
-    else
-      return uid;
-  }
-
   // 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)
@@ -1973,10 +1980,10 @@
       count--;
     else if (row.unread) {
       // update unread_children for thread root
-      var parent = this.find_thread_root(uid);
+      var parent = this.message_list.find_root(uid);
       rows[parent].unread_children--;
       this.set_unread_children(parent);
-      }
+    }
 
     parent = row.parent_uid;
 
@@ -1984,39 +1991,38 @@
     row = row.obj.nextSibling;
     while (row) {
       if (row.nodeType == 1 && (r = rows[row.uid])) {
-	if (!r.depth || r.depth <= depth)
-	  break;
+	    if (!r.depth || r.depth <= depth)
+	      break;
 
-	r.depth--; // move left
-	$('#rcmtab'+r.uid).width(r.depth * 15);
+	    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')
+	      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'))
+	          .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); });
+	            function(e) { return e.data.p.expand_message_row(e, e.data.uid); });
 
-	    r.unread_children = 0;
-	    roots[roots.length] = r;
+	        r.unread_children = 0;
+	        roots[roots.length] = r;
+	      }
+	      // show if it was hidden
+	      if (r.obj.style.display == 'none')
+	        $(r.obj).show();
 	    }
-	  // 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++;
+	    else {
+	      if (r.depth == depth)
+	        r.parent_uid = parent;
+	      if (r.unread && roots.length)
+	        roots[roots.length-1].unread_children++;
 	    }
 	  }
-	}
-	row = row.nextSibling;
-      }
+	  row = row.nextSibling;
+    }
     
     // update unread_children for roots
     for (var i=0; i<roots.length; i++)
@@ -2034,15 +2040,15 @@
     
     while (row) {
       if (row.nodeType == 1 && (r = rows[row.uid])) {
-	if (!r.depth && cnt)
-	  cnt--;
+	    if (!r.depth && cnt)
+	      cnt--;
 
         if (!cnt)
-	  this.message_list.remove_row(row.uid);
-	}
-	row = row.nextSibling;
-      }
-  }
+	      this.message_list.remove_row(row.uid);
+	  }
+	  row = row.nextSibling;
+    }
+  };
 
   // set message icon
   this.set_message_icon = function(uid)
@@ -2057,13 +2063,12 @@
     }
     else if (rows[uid].deleted && this.env.deletedicon)
       icn_src = this.env.deletedicon;
-    else if (rows[uid].replied && this.env.repliedicon)
-      {
+    else if (rows[uid].replied && this.env.repliedicon) {
       if (rows[uid].forwarded && this.env.forwardedrepliedicon)
         icn_src = this.env.forwardedrepliedicon;
       else
         icn_src = this.env.repliedicon;
-      }
+    }
     else if (rows[uid].forwarded && this.env.forwardedicon)
       icn_src = this.env.forwardedicon;
     else if (rows[uid].unread && this.env.unreadicon)
@@ -2082,11 +2087,11 @@
       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;
@@ -2103,11 +2108,11 @@
       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;
@@ -2134,13 +2139,13 @@
 
     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;
 
@@ -2148,11 +2153,11 @@
       $(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;
@@ -2162,8 +2167,7 @@
 
     if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else
-    {
+    else {
       var selection = this.message_list.get_selection();
       var id;
       for (var n=0; n<selection.length; n++) {
@@ -2174,11 +2178,14 @@
 
     // 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;
@@ -2187,11 +2194,10 @@
     var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
 
     // show wait message
-    if (this.env.action=='show')
-      {
+    if (this.env.action=='show') {
       lock = true;
       this.set_busy(true, 'movingmessage');
-      }
+    }
     else
       this.show_contentframe(false);
 
@@ -2199,7 +2205,7 @@
     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()
@@ -2241,26 +2247,25 @@
 
   // 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();
-    var count = 0;
+    var a_uids = new Array(),
+      count = 0;
 
     if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else
-    {
+    else {
       var selection = this.message_list.get_selection();
       var id;
       for (var n=0; n<selection.length; n++) {
@@ -2287,34 +2292,33 @@
       // remove threads from the end of the list
       this.delete_excessive_thread_rows();
 
+    add_url += '&_uid='+this.uids_to_list(a_uids);
+
     // send request to server
-    this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+    this.http_post(action, '_mbox='+urlencode(this.env.mailbox)+add_url, lock);
   };
 
   // set a specific flag to one or more messages
   this.mark_message = function(flag, uid)
-    {
-    var a_uids = new Array();
-    var r_uids = new Array();
-    var selection = this.message_list ? this.message_list.get_selection() : new Array();
+  {
+    var a_uids = 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++)
-        {
+    else if (this.message_list) {
+      for (var n=0; n<selection.length; n++) {
           a_uids[a_uids.length] = selection[n];
-        }
       }
+    }
 
     if (!this.message_list)
       r_uids = a_uids;
     else
-      for (var id, n=0; n<a_uids.length; n++)
-      {
+      for (var id, n=0; n<a_uids.length; n++) {
         id = a_uids[n];
         if ((flag=='read' && this.message_list.rows[id].unread) 
             || (flag=='unread' && !this.message_list.rows[id].unread)
@@ -2328,11 +2332,10 @@
       }
 
     // nothing to do
-    if (!r_uids.length)
+    if (!r_uids.length && !this.select_all_mode)
       return;
 
-    switch (flag)
-      {
+    switch (flag) {
         case 'read':
         case 'unread':
           this.toggle_read_status(flag, r_uids);
@@ -2345,8 +2348,8 @@
         case 'unflagged':
           this.toggle_flagged_status(flag, a_uids);
           break;
-      }
-    };
+    }
+  };
 
   // set class to read/unread
   this.toggle_read_status = function(flag, a_uids)
@@ -2355,7 +2358,7 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'unread', (flag=='unread' ? true : false));
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
 
     for (var i=0; i<a_uids.length; i++)
       this.update_thread_root(a_uids[i], flag);
@@ -2368,7 +2371,7 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'flagged', (flag=='flagged' ? true : false));
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag='+flag);
   };
   
   // mark all message rows as deleted/undeleted
@@ -2387,15 +2390,12 @@
     }
     
     var all_deleted = true;
-    for (var i=0; i<a_uids.length; i++)
+    for (var uid, i=0; i<a_uids.length; i++)
     {
       uid = a_uids[i];
-      if (rows[uid]) {
-        if (!rows[uid].deleted)
-        {
-          all_deleted = false;
-          break;
-        }
+      if (rows[uid] && !rows[uid].deleted) {
+        all_deleted = false;
+        break;
       }
     }
     
@@ -2412,49 +2412,48 @@
     for (var i=0; i<a_uids.length; i++)
       this.set_message(a_uids[i], 'deleted', false);
 
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=undelete');
     return true;
   };
 
   this.flag_as_deleted = function(a_uids)
   {
-    var add_url = '';
-    var r_uids = new Array();
-    var rows = this.message_list ? this.message_list.rows : new Array();
-    var count = 0;
+    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++)
-      {
+    for (var i=0; i<a_uids.length; i++) {
       uid = a_uids[i];
-      if (rows[uid])
-        {
+      if (rows[uid]) {
         if (rows[uid].unread)
           r_uids[r_uids.length] = uid;
 
-	if (this.env.skip_deleted) {
-	  count += this.update_thread(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);
-        }
+	    }
+	    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();
+        this.message_list.clear_selection();
       if (count < 0)
         add_url += '&_count='+(count*-1);
       else if (count > 0) 
         // remove threads from the end of the list
         this.delete_excessive_thread_rows();
-      }
+    }
 
     add_url = '&_from='+(this.env.action ? this.env.action : '');
     
+    // ??
     if (r_uids.length)
-      add_url += '&_ruid='+r_uids.join(',');
+      add_url += '&_ruid='+this.uids_to_list(r_uids);
 
     if (this.env.skip_deleted) {
       // also send search request to get the right messages 
@@ -2464,7 +2463,7 @@
         add_url += '&_next_uid='+this.env.next_uid;
     }
     
-    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete'+add_url);
+    this.http_post('mark', '_uid='+this.uids_to_list(a_uids)+'&_flag=delete'+add_url);
     return true;  
   };
 
@@ -2472,21 +2471,25 @@
   // argument should be a coma-separated list of uids
   this.flag_deleted_as_read = function(uids)
   {
-    var icn_src;
-    var rows = this.message_list ? this.message_list.rows : new Array();
-    var str = String(uids);
-    var a_uids = new Array();
+    var icn_src, uid,
+      rows = this.message_list ? this.message_list.rows : new Array(),
+      str = String(uids),
+      a_uids = str.split(',');
 
-    a_uids = str.split(',');
-
-    for (var uid, i=0; i<a_uids.length; i++)
-      {
+    for (var i=0; i<a_uids.length; i++) {
       uid = a_uids[i];
       if (rows[uid])
         this.set_message(uid, 'unread', false);
       }
   };
 
+  // Converts array of message UIDs to comma-separated list for use in URL
+  // with select_all mode checking
+  this.uids_to_list = function(uids)
+  {
+    return this.select_all_mode ? '*' : uids.join(',');
+  };
+  
 
   /*********************************************************/
   /*********       mailbox folders methods         *********/
@@ -2583,16 +2586,14 @@
     this.init_address_input_events($("[name='_cc']"));
     this.init_address_input_events($("[name='_bcc']"));
     
-    if (!html_mode)
+    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);
-
-    // add signature according to selected identity
-    if (input_from.attr('type') == 'select-one' && $("input[name='_draft_saveid']").val() == ''
-        && !html_mode) {  // if we have HTML editor, signature is added in callback
-      this.change_identity(input_from[0]);
     }
-    else if (!html_mode) 
-      this.set_caret_pos(input_message, this.env.top_posting ? 0 : $(input_message).val().length);
 
     if (input_to.val() == '')
       input_to.focus();
@@ -2627,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) {
@@ -2703,31 +2702,31 @@
         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();
@@ -2758,7 +2757,7 @@
       this.cmp_hash = str;
 
     return str;
-    };
+  };
     
   this.change_identity = function(obj, show_sig)
   {
@@ -2829,11 +2828,11 @@
         cursor_pos = this.env.top_posting ? 0 : message.length;
 
       input_message.val(message);
-      
+
       // move cursor before the signature
       this.set_caret_pos(input_message.get(0), cursor_pos);
     }
-    else if (is_html && show_sig && this.env.signatures) {  // html
+    else if (show_sig && this.env.signatures) {  // html
       var editor = tinyMCE.get(this.env.composebody);
       var sigElem = editor.dom.get('_rc_sig');
 
@@ -2841,14 +2840,14 @@
       if (!sigElem) {
         var body = editor.getBody();
         var doc = editor.getDoc();
-          
+
         sigElem = doc.createElement('div');
         sigElem.setAttribute('id', '_rc_sig');
-          
+
         if (this.env.sig_above) {
           // if no existing sig and top posting then insert at caret pos
           editor.getWin().focus(); // correct focus in IE
-            
+
           var node = editor.selection.getNode();
           if (node.nodeName == 'BODY') {
             // no real focus, insert at start
@@ -2890,22 +2889,20 @@
   };
 
   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).toggle();
-      }
+    }
       
     // clear upload form
     try {
@@ -2915,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';
@@ -2954,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];
@@ -2992,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
@@ -3040,37 +3033,36 @@
   };
 
   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();
@@ -3081,12 +3073,12 @@
             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;
@@ -3097,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);
-    }
+  };
 
 
   /*********************************************************/
@@ -3208,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
@@ -3250,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));
   };
 
@@ -3269,7 +3281,7 @@
   {
     // display search results
     if (a_results.length && this.ksearch_input && this.ksearch_value) {
-      var p, ul, li, s_val = this.ksearch_value;
+      var p, ul, li, text, s_val = this.ksearch_value;
       
       // create results pane if not present
       if (!this.ksearch_pane) {
@@ -3283,9 +3295,10 @@
       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('('+s_val+')', '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;
@@ -3363,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)
@@ -3380,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;
       }
 
@@ -3396,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);
@@ -3416,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) 
@@ -3442,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;
     };
@@ -3453,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));
     };
 
 
@@ -3462,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();
@@ -3490,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;
     };
 
@@ -3505,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;
@@ -3547,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] });
+  };
 
 
   /*********************************************************/
@@ -4256,31 +4425,33 @@
     };
 
   // 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;
@@ -4455,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
@@ -4713,8 +4891,11 @@
         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;
     }

--
Gitblit v1.9.1