From 77c28206a14b5bee3f3091f10cffd531bce5649c Mon Sep 17 00:00:00 2001
From: yllar <yllar.pajus@gmail.com>
Date: Sat, 16 Dec 2006 13:25:16 -0500
Subject: [PATCH] updated ja and fr translations

---
 program/js/app.js | 2459 +++++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 1,709 insertions(+), 750 deletions(-)

diff --git a/program/js/app.js b/program/js/app.js
index 9825c18..d47f427 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,14 +3,17 @@
  | RoundCube Webmail Client Script                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev, - Switzerland                      |
+ | Copyright (C) 2005-2006, RoundCube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
- | Modified: 2005/11/08 (roundcube)                                      |
- |                                                                       |
  +-----------------------------------------------------------------------+
- | Author: Thomas Bruederli <roundcube@gmail.com>                        |
+ | Authors: Thomas Bruederli <roundcube@gmail.com>                       |
+ |          Charles McNulty <charles@charlesmcnulty.com>                 |
  +-----------------------------------------------------------------------+
+ | Requires: common.js, list.js                                          |
+ +-----------------------------------------------------------------------+
+
+  $Id$
 */
 
 
@@ -23,18 +26,16 @@
   this.buttons = new Object();
   this.gui_objects = new Object();
   this.commands = new Object();
-  this.selection = new Array();
 
   // create public reference to myself
   rcube_webmail_client = this;
   this.ref = 'rcube_webmail_client';
  
   // webmail client settings
-  this.dblclick_time = 600;
+  this.dblclick_time = 500;
   this.message_time = 5000;
-  this.request_timeout = 180000;
+  
   this.mbox_expression = new RegExp('[^0-9a-z\-_]', 'gi');
-  this.env.blank_img = 'skins/default/images/blank.gif';
   
   // mimetypes supported by the browser (default settings)
   this.mimetypes = new Array('text/plain', 'text/html', 'text/xml',
@@ -42,12 +43,16 @@
                              'application/x-javascript', 'application/pdf',
                              'application/x-shockwave-flash');
 
+  // default environment vars
+  this.env.keep_alive = 60;        // seconds
+  this.env.request_timeout = 180;  // seconds
+  this.env.draft_autosave = 0;     // seconds
+
 
   // set environment variable
   this.set_env = function(name, value)
     {
-    //if (!this.busy)
-      this.env[name] = value;    
+    this.env[name] = value;
     };
 
 
@@ -83,12 +88,13 @@
   // initialize webmail client
   this.init = function()
     {
+    var p = this;
     this.task = this.env.task;
     
     // check browser
     if (!bw.dom || !bw.xmlhttp_test())
       {
-      location.href = this.env.comm_path+'&_action=error&_code=0x199';
+      this.goto_url('error', '_code=0x199');
       return;
       }
     
@@ -106,37 +112,78 @@
     switch (this.task)
       {
       case 'mail':
-        var msg_list = this.gui_objects.messagelist;
-        if (msg_list)
+        if (this.gui_objects.messagelist)
           {
-          this.init_messagelist(msg_list);
-          this.enable_command('markread', true);
+          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.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('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_active = true; });
+          this.message_list.addEventListener('dragend', function(o){ p.drag_active = false; });
+
+          this.message_list.init();
+          this.enable_command('toggle_status', true);
+          
+          if (this.gui_objects.mailcontframe)
+            {
+            this.gui_objects.mailcontframe.onmousedown = function(e){ return p.click_on_list(e); };
+            document.onmouseup = function(e){ return p.doc_mouse_up(e); };
+            }
+          else
+            this.message_list.focus();
           }
 
         // enable mail commands
-        this.enable_command('list', 'compose', 'add-contact', true);
+        this.enable_command('list', 'checkmail', 'compose', 'add-contact', 'search', 'reset-search', true);
         
-        if (this.env.action=='show')
+        if (this.env.action=='show' || this.env.action=='preview')
           {
           this.enable_command('show', 'reply', 'reply-all', 'forward', 'moveto', 'delete', 'viewsource', 'print', 'load-attachment', 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);
+            }
+          }
+        
+        // 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_messageframe(true);
+          parent.rcmail.mark_message('read', this.uid);
           }
 
-        if (this.env.action=='show' && this.env.blockedobjects)
+        if ((this.env.action=='show' || this.env.action=='preview') && this.env.blockedobjects)
           {
           if (this.gui_objects.remoteobjectsmsg)
             this.gui_objects.remoteobjectsmsg.style.display = 'block';
           this.enable_command('load-images', true);
-          }  
+          }
 
         if (this.env.action=='compose')
-          this.enable_command('add-attachment', 'send-attachment', 'send', true);
-          
+          {
+          this.enable_command('add-attachment', 'send-attachment', 'remove-attachment', 'send', true);
+          if (this.env.spellcheck)
+            {
+            this.env.spellcheck.spelling_state_observer = function(s){ rcube_webmail_client.set_spellcheck_state(s); };
+            this.set_spellcheck_state('ready');
+            }
+          if (this.env.drafts_mailbox)
+            this.enable_command('savedraft', true);
+          }
+
         if (this.env.messagecount)
-          this.enable_command('select-all', 'select-none', 'sort', true);
+          this.enable_command('select-all', 'select-none', 'sort', 'expunge', true);
+
+        if (this.env.messagecount && (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox))
+          this.enable_command('purge', true);
 
         this.set_page_buttons();
 
@@ -151,23 +198,45 @@
         if (this.env.action=='print')
           window.print();
 
+        // get unread count for each mailbox
+        if (this.gui_objects.mailboxlist)
+          this.http_request('getunread', '');
+
         break;
 
 
       case 'addressbook':
-        var contacts_list = this.gui_objects.contactslist;
-        if (contacts_list)
-          this.init_contactslist(contacts_list);
-      
+        if (this.gui_objects.contactslist)
+          {
+          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:false, keyboard:true});
+          this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
+          this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
+          this.contact_list.init();
+
+          if (this.env.cid)
+            this.contact_list.highlight_row(this.env.cid);
+
+          if (this.gui_objects.contactslist.parentNode)
+            {
+            this.gui_objects.contactslist.parentNode.onmousedown = function(e){ return p.click_on_list(e); };
+            document.onmouseup = function(e){ return p.doc_mouse_up(e); };
+            }
+          else
+            this.contact_list.focus();
+          }
+
         this.set_page_buttons();
-          
+
         if (this.env.cid)
           this.enable_command('show', 'edit', true);
 
         if ((this.env.action=='add' || this.env.action=='edit') && this.gui_objects.editform)
           this.enable_command('save', true);
-      
+
         this.enable_command('list', 'add', true);
+
+        // this.enable_command('ldappublicsearch', this.env.ldappublicsearch);
+
         break;
 
 
@@ -181,11 +250,18 @@
           this.enable_command('save', true);
           
         if (this.env.action=='folders')
-          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'delete-folder', true);
-          
-        var identities_list = this.gui_objects.identitieslist;
-        if (identities_list)
-          this.init_identitieslist(identities_list);
+          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
+
+        if (this.gui_objects.identitieslist)
+          {
+          this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist, {multiselect:false, draggable:false, keyboard:false});
+          this.identity_list.addEventListener('select', function(o){ p.identity_select(o); });
+          this.identity_list.init();
+          this.identity_list.focus();
+
+          if (this.env.iid)
+            this.identity_list.highlight_row(this.env.iid);
+          }
 
         break;
 
@@ -208,70 +284,47 @@
     // enable basic commands
     this.enable_command('logout', true);
 
-    // disable browser's contextmenus
-    //document.oncontextmenu = function(){ return false; }
-
     // flag object as complete
     this.loaded = true;
-          
+
     // show message
     if (this.pending_message)
       this.display_message(this.pending_message[0], this.pending_message[1]);
+
+    // start keep-alive interval
+    this.start_keepalive();
     };
 
 
-  // get all message rows from HTML table and init each row
-  this.init_messagelist = function(msg_list)
+  // start interval for keep-alive/recent_check signal
+  this.start_keepalive = function()
     {
-    if (msg_list && msg_list.tBodies[0])
-      {
-      this.message_rows = new Array();
+    if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.messagelist)
+      this._int = setInterval(this.ref+'.check_for_recent()', this.env.keep_alive * 1000);
+    else if (this.env.keep_alive && !this.env.framed && this.task!='login')
+      this._int = setInterval(this.ref+'.send_keep_alive()', this.env.keep_alive * 1000);    
+    }
 
-      var row;
-      for(var r=0; r<msg_list.tBodies[0].childNodes.length; r++)
-        {
-        row = msg_list.tBodies[0].childNodes[r];
-        //row = msg_list.tBodies[0].rows[r];
-        this.init_message_row(row);
-        }
-      }
-      
-    // alias to common rows array
-    this.list_rows = this.message_rows;
-    };
-    
-    
-  // make references in internal array and set event handlers
+
   this.init_message_row = function(row)
-    {
-    var uid, msg_icon;
-    
-    if (String(row.id).match(/rcmrow([0-9]+)/))
+  {
+    var uid = row.uid;
+    if (uid && this.env.messages[uid])
       {
-      uid = RegExp.$1;
-      row.uid = uid;
-              
-      this.message_rows[uid] = {id:row.id, obj:row,
-                                classname:row.className,
-                                unread:this.env.messages[uid] ? this.env.messages[uid].unread : null,
-                                replied:this.env.messages[uid] ? this.env.messages[uid].replied : null};
-              
-      // set eventhandlers to table row
-      row.onmousedown = function(e){ return rcube_webmail_client.drag_row(e, this.uid); };
-      row.onmouseup = function(e){ return rcube_webmail_client.click_row(e, this.uid); };
-              
-      // set eventhandler to message icon
-      if ((msg_icon = row.cells[0].childNodes[0]) && row.cells[0].childNodes[0].nodeName=='IMG')
-        {                
-        msg_icon.id = 'msgicn_'+uid;
-        msg_icon._row = row;
-        msg_icon.onmousedown = function(e) { rcube_webmail_client.command('markread', this); };
-                
-        // get message icon and save original icon src
-        this.message_rows[uid].icon = msg_icon;
-        }
+      row.deleted = this.env.messages[uid].deleted;
+      row.unread = this.env.messages[uid].unread;
+      row.replied = this.env.messages[uid].replied;
       }
-    };
+
+    // set eventhandler to message icon
+    if ((row.icon = row.obj.cells[0].childNodes[0]) && row.icon.nodeName=='IMG')
+      {
+      var p = this;
+      row.icon.id = 'msgicn_'+row.uid;
+      row.icon._row = row.obj;
+      row.icon.onmousedown = function(e) { p.command('toggle_status', this); };
+      }
+  };
 
 
   // init message compose form: set focus and eventhandlers
@@ -281,13 +334,14 @@
       return false;
     
     //this.messageform = this.gui_objects.messageform;
+    var input_from = rcube_find_object('_from');
     var input_to = rcube_find_object('_to');
     var input_cc = rcube_find_object('_cc');
     var input_bcc = rcube_find_object('_bcc');
     var input_replyto = rcube_find_object('_replyto');
     var input_subject = rcube_find_object('_subject');
     var input_message = rcube_find_object('_message');
-    
+
     // init live search events
     if (input_to)
       this.init_address_input_events(input_to);
@@ -295,109 +349,43 @@
       this.init_address_input_events(input_cc);
     if (input_bcc)
       this.init_address_input_events(input_bcc);
+      
+    // add signature according to selected identity
+    if (input_from && input_from.type=='select-one')
+      this.change_identity(input_from);
 
     if (input_to && input_to.value=='')
       input_to.focus();
     else if (input_subject && input_subject.value=='')
       input_subject.focus();
     else if (input_message)
-      this.set_caret2start(input_message); // input_message.focus();
-    };
+      this.set_caret2start(input_message);
 
+    // get summary of all field values
+    this.cmp_hash = this.compose_field_hash();
+ 
+    // start the auto-save timer
+    this.auto_save_start();
+    };
 
   this.init_address_input_events = function(obj)
     {
     var handler = function(e){ return rcube_webmail_client.ksearch_keypress(e,this); };
     var handler2 = function(e){ return rcube_webmail_client.ksearch_blur(e,this); };
-	
+
     if (bw.safari)
-      {
       obj.addEventListener('keydown', handler, false);
-      // obj.addEventListener('blur', handler2, false);
-      }
     else if (bw.mz)
       {
       obj.addEventListener('keypress', handler, false);
       obj.addEventListener('blur', handler2, false);
       }
     else if (bw.ie)
-      {
       obj.onkeydown = handler;
-      //obj.attachEvent('onkeydown', handler);
-      // obj.attachEvent('onblur', handler2, false);
-      }
-	
+
     obj.setAttribute('autocomplete', 'off');       
     };
 
-
-
-  // get all contact rows from HTML table and init each row
-  this.init_contactslist = function(contacts_list)
-    {
-    if (contacts_list && contacts_list.tBodies[0])
-      {
-      this.contact_rows = new Array();
-
-      var row;
-      for(var r=0; r<contacts_list.tBodies[0].childNodes.length; r++)
-        {
-        row = contacts_list.tBodies[0].childNodes[r];
-        this.init_table_row(row, 'contact_rows');
-        }
-      }
-
-    // alias to common rows array
-    this.list_rows = this.contact_rows;
-    
-    if (this.env.cid)
-      this.select(this.env.cid);
-    };
-
-
-  // make references in internal array and set event handlers
-  this.init_table_row = function(row, array_name)
-    {
-    var cid;
-    
-    if (String(row.id).match(/rcmrow([0-9]+)/))
-      {
-      cid = RegExp.$1;
-      row.cid = cid;
-
-      this[array_name][cid] = {id:row.id,
-                               obj:row,
-                               classname:row.className};
-
-      // set eventhandlers to table row
-      row.onmousedown = function(e) { rcube_webmail_client.in_selection_before=this.cid; return false; };  // fake for drag handler
-      row.onmouseup = function(e){ return rcube_webmail_client.click_row(e, this.cid); };
-      }
-    };
-
-
-  // get all contact rows from HTML table and init each row
-  this.init_identitieslist = function(identities_list)
-    {
-    if (identities_list && identities_list.tBodies[0])
-      {
-      this.identity_rows = new Array();
-
-      var row;
-      for(var r=0; r<identities_list.tBodies[0].childNodes.length; r++)
-        {
-        row = identities_list.tBodies[0].childNodes[r];
-        this.init_table_row(row, 'identity_rows');
-        }
-      }
-
-    // alias to common rows array
-    this.list_rows = this.identity_rows;
-    
-    if (this.env.iid)
-      this.select(this.env.iid);    
-    };
-    
 
 
   /*********************************************************/
@@ -423,6 +411,15 @@
 
       return false;
       }
+      
+      
+   // check input before leaving compose step
+   if (this.task=='mail' && this.env.action=='compose' && (command=='list' || command=='mail' || command=='addressbook' || command=='settings'))
+     {
+     if (this.cmp_hash != this.compose_field_hash() && !confirm(this.get_label('notsentwarning')))
+        return false;
+     }
+
 
     // process command
     switch (command)
@@ -433,7 +430,7 @@
         break;
 
       case 'logout':
-        location.href = this.env.comm_path+'&_action=logout';
+        this.goto_url('logout');
         break;      
 
       // commands to switch task
@@ -447,18 +444,33 @@
       // misc list commands
       case 'list':
         if (this.task=='mail')
+          {
+          if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
+            this.reset_qsearch();
+
           this.list_mailbox(props);
+          }
         else if (this.task=='addressbook')
           this.list_contacts();
         break;
+
 
       case 'sort':
         // get the type of sorting
         var a_sort = props.split('_');
         var sort_col = a_sort[0];
-        var sort_order = a_sort[1].toUpperCase();
+        var sort_order = a_sort[1] ? a_sort[1].toUpperCase() : null;
         var header;
         
+        // no sort order specified: toggle
+        if (sort_order==null)
+          {
+          if (this.env.sort_col==sort_col)
+            sort_order = this.env.sort_order=='ASC' ? 'DESC' : 'ASC';
+          else
+            sort_order = this.env.sort_order;
+          }
+
         if (this.env.sort_col==sort_col && this.env.sort_order==sort_order)
           break;
 
@@ -473,15 +485,34 @@
         this.env.sort_order = sort_order;
 
         // reload message list
-        this.list_mailbox('', '', props);
+        this.list_mailbox('', '', sort_col+'_'+sort_order);
         break;
 
       case 'nextpage':
         this.list_page('next');
         break;
 
+      case 'lastpage':
+        this.list_page('last');
+        break;
+
       case 'previouspage':
         this.list_page('prev');
+        break;
+
+      case 'firstpage':
+        this.list_page('first');
+        break;
+
+      case 'expunge':
+        if (this.env.messagecount)
+          this.expunge_mailbox(this.env.mailbox);
+        break;
+
+      case 'purge':
+      case 'empty-mailbox':
+        if (this.env.messagecount)
+          this.purge_mailbox(this.env.mailbox);
         break;
 
 
@@ -491,7 +522,12 @@
           {
           var uid = this.get_single_uid();
           if (uid && (!this.env.uid || uid != this.env.uid))
-            this.show_message(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')
           {
@@ -504,9 +540,21 @@
       case 'add':
         if (this.task=='addressbook')
           this.load_contact(0, 'add');
+
+        /* LDAP stuff, has to be re-written with new address book
+          if (!window.frames[this.env.contentframe].rcmail)
+            this.load_contact(0, 'add');
+          else
+            {
+            if (window.frames[this.env.contentframe].rcmail.selection.length)
+              this.add_ldap_contacts();
+            else
+              this.load_contact(0, 'add');
+            }
+        */
         else if (this.task=='settings')
           {
-          this.clear_selection();
+          this.identity_list.clear_selection();
           this.load_identity(0, 'add-identity');
           }
         break;
@@ -557,9 +605,7 @@
 
       case 'delete':
         // mail task
-        if (this.task=='mail' && this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
-          this.move_messages(this.env.trash_mailbox);
-        else if (this.task=='mail')
+        if (this.task=='mail')
           this.delete_messages();
         // addressbook task
         else if (this.task=='addressbook')
@@ -576,7 +622,7 @@
         this.move_messages(props);
         break;
         
-      case 'markread':
+      case 'toggle_status':
         if (props && !props._row)
           break;
         
@@ -586,10 +632,11 @@
         if (props._row.uid)
           {
           uid = props._row.uid;
-          this.dont_select = true;
-          
+          this.message_list.dont_select = true;
           // toggle read/unread
-          if (!this.message_rows[uid].unread)
+          if (this.message_list.rows[uid].deleted) {
+            flag = 'undelete';
+          } else if (!this.message_list.rows[uid].unread)
             flag = 'unread';
           }
           
@@ -598,16 +645,16 @@
         
       case 'load-images':
         if (this.env.uid)
-          this.show_message(this.env.uid, true);
+          this.show_message(this.env.uid, true, this.env.action=='preview');
         break;
 
       case 'load-attachment':
-        var url = this.env.comm_path+'&_action=get&_mbox='+this.env.mailbox+'&_uid='+this.env.uid+'&_part='+props.part;
+        var qstring = '_mbox='+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)
           {
-          this.attachment_win = window.open(url+'&_frame=1', 'rcubemailattachment');
+          this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
           if (this.attachment_win)
             {
             setTimeout(this.ref+'.attachment_win.focus()', 10);
@@ -615,34 +662,52 @@
             }
           }
 
-        location.href = url;
+        this.goto_url('get', qstring+'&_download=1');
         break;
         
       case 'select-all':
-        this.select_all(props);
+        this.message_list.select_all(props);
         break;
 
       case 'select-none':
-        this.clear_selection();
+        this.message_list.clear_selection();
         break;
 
       case 'nextmessage':
         if (this.env.next_uid)
-          this.show_message(this.env.next_uid);
-          //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.next_uid+'&_mbox='+this.env.mailbox;
+          this.show_message(this.env.next_uid, false, this.env.action=='preview');
+        break;
+
+	  case 'lastmessage':
+        if (this.env.last_uid)
+          this.show_message(this.env.last_uid);
         break;
 
       case 'previousmessage':
         if (this.env.prev_uid)
-          this.show_message(this.env.prev_uid);
-          //location.href = this.env.comm_path+'&_action=show&_uid='+this.env.prev_uid+'&_mbox='+this.env.mailbox;
+          this.show_message(this.env.prev_uid, false, this.env.action=='preview');
         break;
 
+      case 'firstmessage':
+        if (this.env.first_uid)
+          this.show_message(this.env.first_uid);
+        break;
+      
+      case 'checkmail':
+        this.check_for_recent();
+        break;
+      
       case 'compose':
         var url = this.env.comm_path+'&_action=compose';
-        
+       
+        if (this.task=='mail' && this.env.mailbox==this.env.drafts_mailbox)
+          {
+          var uid;
+          if (uid = this.get_single_uid())
+            url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+          } 
         // modify url if we're in addressbook
-        if (this.task=='addressbook')
+        else if (this.task=='addressbook')
           {
           url = this.get_task_url('mail', url);            
           var a_cids = new Array();
@@ -650,107 +715,126 @@
           // use contact_id passed as command parameter
           if (props)
             a_cids[a_cids.length] = props;
-            
           // get selected contacts
           else
             {
-            for (var n=0; n<this.selection.length; n++)
-              a_cids[a_cids.length] = this.selection[n];
-            }
+            var selection = this.contact_list.get_selection();
+            for (var n=0; n<selection.length; n++)
+              a_cids[a_cids.length] = selection[n];
 
+            /* LDAP stuff, has to be re-written with new address book
+            if (!window.frames[this.env.contentframe].rcmail.selection.length)
+              {
+              for (var n=0; n<selection.length; n++)
+                a_cids[a_cids.length] = selection[n];
+              }
+            else
+              {
+              var frameRcmail = window.frames[this.env.contentframe].rcmail;
+              // get the email address(es)
+              for (var n=0; n<frameRcmail.selection.length; n++)
+                a_cids[a_cids.length] = frameRcmail.ldap_contact_rows[frameRcmail.selection[n]].obj.cells[1].innerHTML;
+              }
+            */
+            }
           if (a_cids.length)
             url += '&_to='+a_cids.join(',');
           else
             break;
           }
         else if (props)
-           url += '&_to='+props;
+           url += '&_to='+urlencode(props);
 
+        // don't know if this is necessary...
+        url = url.replace(/&_framed=1/, "");
         this.set_busy(true);
-        location.href = url;
-        break;      
+
+        // need parent in case we are coming from the contact frame
+        if (this.env.framed)
+          parent.location.href = url;
+        else
+          location.href = url;
+        break;
+        
+      case 'spellcheck':
+        if (this.env.spellcheck && this.env.spellcheck.spellCheck && this.spellcheck_ready)
+          {
+          this.env.spellcheck.spellCheck(this.env.spellcheck.check_link);
+          this.set_spellcheck_state('checking');
+          }
+        break;
+
+      case 'savedraft':
+        // Reset the auto-save timer
+        self.clearTimeout(this.save_timer);
+
+        if (!this.gui_objects.messageform)
+          break;
+
+        // if saving Drafts is disabled in main.inc.php
+        // or if compose form did not change
+        if (!this.env.drafts_mailbox || this.cmp_hash == this.compose_field_hash())
+          break;
+
+        this.set_busy(true, 'savingmessage');
+        var form = this.gui_objects.messageform;
+        form.target = "savetarget";
+        form.submit();
+        break;
 
       case 'send':
         if (!this.gui_objects.messageform)
           break;
-          
-        // check input fields
-        var input_to = rcube_find_object('_to');
-        var input_subject = rcube_find_object('_subject');
-        var input_message = rcube_find_object('_message');
 
-        // check for empty recipient
-        if (input_to && !rcube_check_email(input_to.value, true))
-          {
-          alert(this.get_label('norecipientwarning'));
-          input_to.focus();
+        if (!this.check_compose_input())
           break;
-          }
-
-        // display localized warning for missing subject
-        if (input_subject && input_subject.value == '')
-          {
-          var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));
-
-          // user hit cancel, so don't send
-          if (!subject && subject !== '')
-            {
-            input_subject.focus();
-            break;
-            }
-          else
-            {
-            input_subject.value = subject ? subject : this.get_label('nosubject');            
-            }
-          }
-
-        // check for empty body
-        if (input_message.value=='')
-          {
-          if (!confirm(this.get_label('nobodywarning')))
-            {
-            input_message.focus();
-            break;
-            }
-          }
+          
+        // Reset the auto-save timer
+        self.clearTimeout(this.save_timer);
 
         // all checks passed, send message
         this.set_busy(true, 'sendingmessage');
         var form = this.gui_objects.messageform;
+        form.target = "savetarget";     
+        form._draft.value = '';
         form.submit();
+        
+        // clear timeout (sending could take longer)
+        clearTimeout(this.request_timer);
         break;
 
       case 'add-attachment':
         this.show_attachment_form(true);
         
       case 'send-attachment':
+        // Reset the auto-save timer
+        self.clearTimeout(this.save_timer);
+
         this.upload_file(props)      
+        break;
+      
+      case 'remove-attachment':
+        this.remove_attachment(props);
         break;
 
       case 'reply-all':
       case 'reply':
         var uid;
         if (uid = this.get_single_uid())
-          {
-          this.set_busy(true);
-          location.href = this.env.comm_path+'&_action=compose&_reply_uid='+uid+'&_mbox='+escape(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : '');
-          }
+          this.goto_url('compose', '_reply_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(command=='reply-all' ? '&_all=1' : ''), true);
         break;      
 
       case 'forward':
         var uid;
         if (uid = this.get_single_uid())
-          {
-          this.set_busy(true);
-          location.href = this.env.comm_path+'&_action=compose&_forward_uid='+uid+'&_mbox='+escape(this.env.mailbox);
-          }
+          this.goto_url('compose', '_forward_uid='+uid+'&_mbox='+urlencode(this.env.mailbox), true);
         break;
         
       case 'print':
         var uid;
         if (uid = this.get_single_uid())
           {
-          this.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+escape(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
+          this.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
           if (this.printwin)
             setTimeout(this.ref+'.printwin.focus()', 20);
           }
@@ -760,7 +844,7 @@
         var uid;
         if (uid = this.get_single_uid())
           {          
-          this.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+this.env.uid+'&_mbox='+escape(this.env.mailbox));
+          this.sourcewin = window.open(this.env.comm_path+'&_action=viewsource&_uid='+this.env.uid+'&_mbox='+urlencode(this.env.mailbox));
           if (this.sourcewin)
             setTimeout(this.ref+'.sourcewin.focus()', 20);
           }
@@ -769,22 +853,47 @@
       case 'add-contact':
         this.add_contact(props);
         break;
+      
+      // mail quicksearch
+      case 'search':
+        if (!props && this.gui_objects.qsearchbox)
+          props = this.gui_objects.qsearchbox.value;
+        if (props)
+          this.qsearch(urlencode(props), this.env.mailbox);
+        break;
+
+      // reset quicksearch        
+      case 'reset-search':
+        var s = this.env.search_request;
+        this.reset_qsearch();
+        
+        if (s)
+          this.list_mailbox(this.env.mailbox);
+        break;
+
+      // ldap search
+      case 'ldappublicsearch':
+        if (this.gui_objects.ldappublicsearchform) 
+          this.gui_objects.ldappublicsearchform.submit();
+        else 
+          this.ldappublicsearch(command);
+        break; 
 
 
       // user settings commands
       case 'preferences':
-        location.href = this.env.comm_path;
+        this.goto_url('');
         break;
 
       case 'identities':
-        location.href = this.env.comm_path+'&_action=identities';
+        this.goto_url('identities');
         break;
           
       case 'delete-identity':
         this.delete_identity();
         
       case 'folders':
-        location.href = this.env.comm_path+'&_action=folders';
+        this.goto_url('folders');
         break;
 
       case 'subscribe':
@@ -799,8 +908,12 @@
         this.create_folder(props);
         break;
 
+      case 'rename-folder':
+        this.rename_folder(props);
+        break;
+
       case 'delete-folder':
-        if (confirm('Do you really want to delete this folder?'))
+        if (confirm(this.get_label('deletefolderconfirm')))
           this.delete_folder(props);
         break;
 
@@ -813,7 +926,7 @@
   // set command enabled or disabled
   this.enable_command = function()
     {
-    var args = this.enable_command.arguments;
+    var args = arguments;
     if(!args.length) return -1;
 
     var command;
@@ -825,6 +938,7 @@
       this.commands[command] = enable;
       this.set_button(command, (enable ? 'act' : 'pas'));
       }
+      return true;
     };
 
 
@@ -853,8 +967,8 @@
       clearTimeout(this.request_timer);
 
     // set timer for requests
-    if (a && this.request_timeout)
-      this.request_timer = setTimeout(this.ref+'.request_timed_out()', this.request_timeout);
+    if (a && this.env.request_timeout)
+      this.request_timer = setTimeout(this.ref+'.request_timed_out()', this.env.request_timeout * 1000);
     };
 
 
@@ -905,96 +1019,100 @@
   /*********************************************************/
 
 
+  this.doc_mouse_up = function(e)
+    {
+    if (this.message_list)
+      this.message_list.blur();
+    else if (this.contact_list)
+      this.contact_list.blur();
+    };
+
+
   // onmouseup handler for mailboxlist item
   this.mbox_mouse_up = function(mbox)
     {
     if (this.drag_active)
+      {
+      this.unfocus_mailbox(mbox);
       this.command('moveto', mbox);
+      }
     else
       this.command('list', mbox);
-      
+  
     return false;
     };
 
 
-  // onmousedown-handler of message list row
-  this.drag_row = function(e, id)
+  this.click_on_list = function(e)
     {
-    this.in_selection_before = this.in_selection(id) ? id : false;
+    if (this.message_list)
+      this.message_list.focus();
+    else if (this.contact_list)
+        this.contact_list.focus();
 
-    // don't do anything (another action processed before)
-    if (this.dont_select)
-      return false;
+    var mbox_li;
+    if (mbox_li = this.get_mailbox_li())
+      this.set_classname(mbox_li, 'unfocused', true);
 
-    if (!this.in_selection_before)
-      {
-      var shift = this.check_shiftkey(e);
-      this.select(id, shift);
-      }
-    
-    if (this.selection.length)
-      {
-      this.drag_start = true;
-      document.onmousemove = function(e){ return rcube_webmail_client.drag_mouse_move(e); };
-      document.onmouseup = function(e){ return rcube_webmail_client.drag_mouse_up(e); };
-      }
-
-    return false;
+    rcube_event.cancel(e);
     };
 
 
-  // onmouseup-handler of message list row
-  this.click_row = function(e, id)
+  this.msglist_select = function(list)
     {
-    var shift = this.check_shiftkey(e);
-    
-    // don't do anything (another action processed before)
-    if (this.dont_select)
+    if (this.preview_timer)
+      clearTimeout(this.preview_timer);
+
+    var selected = list.selection.length==1;
+    if (this.env.mailbox == this.env.drafts_mailbox)
       {
-      this.dont_select = false;
-      return false;
+      this.enable_command('show', selected);
+      this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
       }
-    
-    if (!this.drag_active && this.in_selection_before==id)
-      this.select(id, (shift && this.task!='settings'));
-    
-    this.drag_start = false;
-    this.in_selection_before = false;
-        
-    // row was double clicked
-    if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && !shift)
+    else
       {
-      this.show_message(id);
-      return false;
-      }
-    else if (this.task=='addressbook')
-      {
-      if (this.selection.length==1 && this.env.contentframe)
-        this.load_contact(this.selection[0], 'show', true);
-      else if (this.task=='addressbook' && this.list_rows && this.list_rows[id].clicked)
-        {
-        this.load_contact(id, 'show');
-        return false;
-        }
+      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
+      this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
+
+      // start timer for message preview (wait for double click)
+      if (selected && this.env.contentframe)
+        this.preview_timer = setTimeout(this.ref+'.msglist_get_preview()', this.dblclick_time + 10);
       else if (this.env.contentframe)
-        {
-        var elm = document.getElementById(this.env.contentframe);
-        elm.style.visibility = 'hidden';
-        }
+        this.show_messageframe(false);
       }
-    else if (this.task=='settings')
-      {
-      if (this.selection.length==1)
-        this.command('edit', this.selection[0]);
-      }
-
-    this.list_rows[id].clicked = true;
-    setTimeout(this.ref+'.list_rows['+id+'].clicked=false;', this.dblclick_time);
-      
-    return false;
     };
 
 
+  this.msglist_dbl_click = function(list)
+    {
+      if (this.preview_timer)
+        clearTimeout(this.preview_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');
+    };
+
+
+  this.msglist_get_preview = function()
+  {
+    var uid = this.get_single_uid();
+    if (uid && this.env.contentframe)
+      this.show_message(uid, false, true);
+    else if (this.env.contentframe)
+      this.show_messageframe(false);
+  };
 
 
   /*********************************************************/
@@ -1002,109 +1120,48 @@
   /*********************************************************/
 
 
-  // select/unselect a row
-  this.select = function(id, multiple)
-    {
-    var selected = false
-    
-    if (this.list_rows[id] && !multiple)
-      {
-      this.clear_selection();
-      this.selection[0] = id;
-      this.list_rows[id].obj.className += ' selected';
-      selected = true;
-      }
-    
-    else if (this.list_rows[id])
-      {
-      if (!this.in_selection(id))  // select row
-        {
-        this.selection[this.selection.length] = id;
-        this.set_classname(this.list_rows[id].obj, 'selected', true);        
-        }
-      else  // unselect row
-        {
-        var p = find_in_array(id, this.selection);
-        var a_pre = this.selection.slice(0, p);
-        var a_post = this.selection.slice(p+1, this.selection.length);
-        this.selection = a_pre.concat(a_post);
-        this.set_classname(this.list_rows[id].obj, 'selected', false);
-        }
-        
-      selected = (this.selection.length==1);
-      }
-
-    // enable/disable commands for message
-    if (this.task=='mail')
-      {
-      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
-      this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
-      }
-    else if (this.task=='addressbook')
-      {
-      this.enable_command('edit', /*'print',*/ selected);
-      this.enable_command('delete', 'compose', this.selection.length>0 ? true : false);
-      }
-    };
-
-
-  this.clear_selection = function()
-    {
-    for(var n=0; n<this.selection.length; n++)
-      if (this.list_rows[this.selection[n]])
-        this.set_classname(this.list_rows[this.selection[n]].obj, 'selected', false);
-
-    this.selection = new Array();    
-    };
-
-
-  // check if given id is part of the current selection
-  this.in_selection = function(id)
-    {
-    for(var n in this.selection)
-      if (this.selection[n]==id)
-        return true;
-
-    return false;    
-    };
-
-
-  // select each row in list
-  this.select_all = function(filter)
-    {
-    if (!this.list_rows || !this.list_rows.length)
-      return false;
-      
-    // reset selection first
-    this.clear_selection();
-    
-    for (var n in this.list_rows)
-      if (!filter || this.list_rows[n][filter]==true)
-      this.select(n, true);
-    };
-    
-
   // when user doble-clicks on a row
-  this.show_message = function(id, safe)
+  this.show_message = function(id, safe, preview)
     {
     var add_url = '';
+    var action = preview ? 'preview': 'show';
     var target = window;
-    if (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';
 
     if (id)
       {
-      this.set_busy(true, 'loading');
-      target.location.href = this.env.comm_path+'&_action=show&_uid='+id+'&_mbox='+escape(this.env.mailbox)+add_url;
+      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_messageframe(true);
+      else
+        {
+        this.set_busy(true, 'loading');
+        target.location.href = this.env.comm_path+url;
+        }
       }
     };
 
+
+  this.show_messageframe = function(show)
+    {
+    var frm;
+    if (this.env.contentframe && (frm = rcube_find_object(this.env.contentframe)))
+      {
+      if (window.frames[this.env.contentframe] && !show)
+        window.frames[this.env.contentframe].location.href = 'program/blank.gif';
+      frm.style.display = show ? 'block' : 'none';
+      }
+      
+    if (!show && this.busy)
+      this.set_busy(false);
+    };
 
 
   // list a specific page
@@ -1112,8 +1169,12 @@
     {
     if (page=='next')
       page = this.env.current_page+1;
+    if (page=='last')
+      page = this.env.pagecount;
     if (page=='prev' && this.env.current_page>1)
       page = this.env.current_page-1;
+    if (page=='first' && this.env.current_page>1)
+      page = 1;
       
     if (page > 0 && page <= this.env.pagecount)
       {
@@ -1130,6 +1191,7 @@
   // list messages of a specific mailbox
   this.list_mailbox = function(mbox, page, sort)
     {
+    this.last_selected = 0;
     var add_url = '';
     var target = window;
 
@@ -1146,11 +1208,14 @@
       page = 1;
       add_url += '&_refresh=1';
       this.env.current_page = page;
-      this.clear_selection();
+      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.mailbox!=mbox)
-      this.select_mailbox(mbox);
+    this.select_mailbox(mbox);
 
     // load message list remotely
     if (this.gui_objects.messagelist)
@@ -1169,7 +1234,7 @@
     if (mbox)
       {
       this.set_busy(true, 'loading');
-      target.location.href = this.env.comm_path+'&_mbox='+escape(mbox)+(page ? '&_page='+page : '')+add_url;
+      target.location.href = this.env.comm_path+'&_mbox='+urlencode(mbox)+(page ? '&_page='+page : '')+add_url;
       }
     };
 
@@ -1177,90 +1242,188 @@
   // send remote request to load message list
   this.list_mailbox_remote = function(mbox, page, add_url)
     {
-    // clear message list
-    var table = this.gui_objects.messagelist;
-    var tbody = document.createElement('TBODY');
-    table.insertBefore(tbody, table.tBodies[0]);
-    table.removeChild(table.tBodies[1]);
-    
-    this.message_rows = new Array();
-    this.list_rows = this.message_rows;
+    // clear message list first
+    this.message_list.clear();
 
     // send request to server
-    var url = '_mbox='+escape(mbox)+(page ? '&_page='+page : '');
+    var url = '_mbox='+urlencode(mbox)+(page ? '&_page='+page : '');
     this.set_busy(true, 'loading');
-    this.http_request('list', url+add_url);
+    this.http_request('list', url+add_url, true);
     };
 
 
+  this.expunge_mailbox = function(mbox)
+    {
+    var lock = false;
+    var add_url = '';
+    
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox)
+       {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+       }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_request('expunge', url+add_url, lock);
+    };
+
+
+  this.purge_mailbox = function(mbox)
+    {
+    var lock = false;
+    var add_url = '';
+    
+    if (!confirm(this.get_label('purgefolderconfirm')))
+      return false;
+    
+    // lock interface if it's the active mailbox
+    if (mbox == this.env.mailbox)
+       {
+       lock = true;
+       this.set_busy(true, 'loading');
+       add_url = '&_reload=1';
+       }
+
+    // send request to server
+    var url = '_mbox='+urlencode(mbox);
+    this.http_request('purge', url+add_url, lock);
+    return true;
+    };
+    
+  this.focus_mailbox = function(mbox)
+    {
+    var mbox_li;
+    if (this.drag_active && mbox != this.env.mailbox && (mbox_li = this.get_mailbox_li(mbox)))
+      this.set_classname(mbox_li, 'droptarget', true);
+    }
+    
+  this.unfocus_mailbox = function(mbox)
+    {
+    var mbox_li;
+    if (this.drag_active && (mbox_li = this.get_mailbox_li(mbox)))
+      this.set_classname(mbox_li, 'droptarget', false);
+    }
+  
   // move selected messages to the specified mailbox
   this.move_messages = function(mbox)
     {
-    // exit if no mailbox specified or if selection is empty
-    if (!mbox || !(this.selection.length || this.env.uid) || mbox==this.env.mailbox)
-      return;
-    
+    // exit if current or no mailbox specified or if selection is empty
+    if (!mbox || !this.env.uid || mbox==this.env.mailbox)
+      {
+      if (!this.message_list || !this.message_list.get_selection().length)
+        return;
+      }
+
     var a_uids = new Array();
 
     if (this.env.uid)
       a_uids[a_uids.length] = this.env.uid;
     else
       {
+      var selection = this.message_list.get_selection();
       var id;
-      for (var n=0; n<this.selection.length; n++)
+      for (var n=0; n<selection.length; n++)
         {
-        id = this.selection[n];
+        id = selection[n];
         a_uids[a_uids.length] = id;
-      
-        // 'remove' message row from list (just hide it)
-        if (this.message_rows[id].obj)
-          this.message_rows[id].obj.style.display = 'none';
+        this.message_list.remove_row(id);
         }
+
+      this.message_list.select_next();
       }
+      
+    var lock = false;
 
     // show wait message
     if (this.env.action=='show')
+      {
+      lock = true;
       this.set_busy(true, 'movingmessage');
+      }
 
     // send request to server
-    this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_target_mbox='+escape(mbox)+'&_from='+(this.env.action ? this.env.action : ''));
+    this.http_request('moveto', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+'&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : ''), lock);
     };
 
+  this.permanently_remove_messages = function()
+    {
+    // exit if no mailbox specified or if selection is empty
+    if (!this.env.uid)
+      {
+      if (!this.message_list || !this.message_list.get_selection().length)
+        return;
+      }
 
+    var a_uids = new Array();
+
+    if (this.env.uid)
+      a_uids[a_uids.length] = 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;
+        this.message_list.remove_row(id);
+        }
+
+      this.message_list.select_next();
+      }
+      
+    // send request to server
+    this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+'&_from='+(this.env.action ? this.env.action : ''));
+  }
+    
+    
   // delete selected messages from the current mailbox
   this.delete_messages = function()
     {
     // exit if no mailbox specified or if selection is empty
-    if (!(this.selection.length || this.env.uid))
-      return;
-    
-    var a_uids = new Array();
-
-    if (this.env.uid)
-      a_uids[a_uids.length] = this.env.uid;
-    else
+    if (!this.env.uid)
       {
-      var id;
-      for (var n=0; n<this.selection.length; n++)
-        {
-        id = this.selection[n];
-        a_uids[a_uids.length] = id;
-      
-        // 'remove' message row from list (just hide it)
-        if (this.message_rows[id].obj)
-          this.message_rows[id].obj.style.display = 'none';
-        }
+      if (!this.message_list || !this.message_list.get_selection().length)
+        return;
       }
 
-    // send request to server
-    this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+escape(this.env.mailbox)+'&_from='+(this.env.action ? this.env.action : ''));
-    };
+    // if there is a trash mailbox defined and we're not currently in it:
+    if (this.env.trash_mailbox && String(this.env.mailbox).toLowerCase()!=String(this.env.trash_mailbox).toLowerCase())
+      // 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);
+    // if there is a trash mailbox defined but 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 isn't a defined trash mailbox and the config is set to flag for deletion
+    else if (!this.env.trash_mailbox && this.env.flag_for_deletion)
+      {
+      flag = 'delete';
+      this.mark_message(flag);
+      if(this.env.action=="show")
+        this.command('nextmessage','',this);
+      else if (selection.length == 1)
+        this.message_list.select_next();
+      }
+    // if there isn't a defined trash mailbox and the config is set NOT to flag for deletion
+    else if (!this.env.trash_mailbox) 
+      this.permanently_remove_messages();
+  };
 
 
   // set a specific flag to one or more messages
   this.mark_message = function(flag, uid)
     {
     var a_uids = new Array();
+    var selection = this.message_list ? this.message_list.get_selection() : new Array();
     
     if (uid)
       a_uids[0] = uid;
@@ -1269,59 +1432,350 @@
     else
       {
       var id;
-      for (var n=0; n<this.selection.length; n++)
+      for (var n=0; n<selection.length; n++)
         {
-        id = this.selection[n];
-        a_uids[a_uids.length] = id;
-      
-        // 'remove' message row from list (just hide it)
-        if (this.message_rows[id].obj)
-          this.message_rows[id].obj.style.display = 'none';
+        id = selection[n];
+        if ((flag=='read' && this.message_list.rows[id].unread) || (flag=='unread' && !this.message_list.rows[id].unread))
+          a_uids[a_uids.length] = id;
         }
       }
+    
+    // nothing to do
+    if (!a_uids.length)
+      return;
+      
+    switch (flag)
+      {
+        case 'read':
+        case 'unread':
+          this.toggle_read_status(flag, a_uids);
+          break;
+        case 'delete':
+        case 'undelete':
+          this.toggle_delete_status(a_uids);
+          break;
+      }
+    };
 
+  // set class to read/unread
+  this.toggle_read_status = function(flag, a_uids)
+  {
     // mark all message rows as read/unread
     var icn_src;
+    var rows = this.message_list.rows;
     for (var i=0; i<a_uids.length; i++)
       {
       uid = a_uids[i];
-      if (this.message_rows[uid])
+      if (rows[uid])
         {
-        this.message_rows[uid].unread = (flag=='unread' ? true : false);
+        rows[uid].unread = (flag=='unread' ? true : false);
         
-        if (this.message_rows[uid].classname.indexOf('unread')<0 && this.message_rows[uid].unread)
+        if (rows[uid].classname.indexOf('unread')<0 && rows[uid].unread)
           {
-          this.message_rows[uid].classname += ' unread';
-          this.set_classname(this.message_rows[uid].obj, 'unread', true);
+          rows[uid].classname += ' unread';
+          this.set_classname(rows[uid].obj, 'unread', true);
 
           if (this.env.unreadicon)
             icn_src = this.env.unreadicon;
           }
-        else if (!this.message_rows[uid].unread)
+        else if (!rows[uid].unread)
           {
-          this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*unread/, '');
-          this.set_classname(this.message_rows[uid].obj, 'unread', false);
+          rows[uid].classname = rows[uid].classname.replace(/\s*unread/, '');
+          this.set_classname(rows[uid].obj, 'unread', false);
 
-          if (this.message_rows[uid].replied && this.env.repliedicon)
+          if (rows[uid].replied && this.env.repliedicon)
             icn_src = this.env.repliedicon;
           else if (this.env.messageicon)
             icn_src = this.env.messageicon;
           }
 
-        if (this.message_rows[uid].icon && icn_src)
-          this.message_rows[uid].icon.src = icn_src;
+        if (rows[uid].icon && icn_src)
+          rows[uid].icon.src = icn_src;
         }
       }
-
-    // send request to server
+      
     this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
+  };
+  
+  // mark all message rows as deleted/undeleted
+  this.toggle_delete_status = function(a_uids)
+  {
+    if (this.env.read_when_deleted)
+      this.toggle_read_status('read',a_uids);
+
+    // if deleting message from "view message" don't bother with delete icon
+    if (this.env.action == "show")
+      return false;
+
+    var rows = this.message_list.rows;
+    if (a_uids.length==1) {
+      if (rows[a_uids[0]] && rows[a_uids[0]].classname.indexOf('deleted') < 0)
+        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].classname.indexOf('deleted')<0) {
+          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)
+  {
+    // if deleting message from "view message" don't bother with delete icon
+    if (this.env.action == "show")
+      return false;
+
+    var icn_src;
+    var rows = this.message_list.rows;
+      
+    for (var i=0; i<a_uids.length; i++) {
+      uid = a_uids[i];
+      if (rows[uid]) {
+        rows[uid].deleted = false;
+        
+        if (rows[uid].classname.indexOf('deleted') > 0) {
+          rows[uid].classname = rows[uid].classname.replace(/\s*deleted/, '');
+          this.set_classname(rows[uid].obj, 'deleted', false);
+        }
+        if (rows[uid].unread && this.env.unreadicon)
+          icn_src = this.env.unreadicon;
+        else if (rows[uid].replied && this.env.repliedicon)
+          icn_src = this.env.repliedicon;
+        else if (this.env.messageicon)
+          icn_src = this.env.messageicon;
+        if (rows[uid].icon && icn_src)
+          rows[uid].icon.src = icn_src;
+      }
+    }
+
+    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+    return true;
+  };
+
+  
+  this.flag_as_deleted = function(a_uids)
+  {
+    // if deleting message from "view message" don't bother with delete icon
+    if (this.env.action == "show")
+      return false;
+
+    var rows = this.message_list.rows;
+    for (var i=0; i<a_uids.length; i++) {
+      uid = a_uids[i];
+      if (rows[uid]) {
+        rows[uid].deleted = true;
+        
+        if (rows[uid].classname.indexOf('deleted')<0) {
+          rows[uid].classname += ' deleted';
+          this.set_classname(rows[uid].obj, 'deleted', true);
+        }
+        if (rows[uid].icon && this.env.deletedicon)
+          rows[uid].icon.src = this.env.deletedicon;
+      }
+    }
+
+    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+    return true;  
+  };
+
+
+  this.get_mailbox_li = function(mbox)
+    {
+    if (this.gui_objects.mailboxlist)
+      {
+      mbox = String((mbox ? mbox : this.env.mailbox)).toLowerCase().replace(this.mbox_expression, '');
+      return document.getElementById('rcmbx'+mbox);
+      }
+    
+    return null;
     };
-
-
+    
 
   /*********************************************************/
   /*********        message compose methods        *********/
   /*********************************************************/
+  
+  
+  // checks the input fields before sending a message
+  this.check_compose_input = function()
+    {
+    // check input fields
+    var input_to = rcube_find_object('_to');
+    var input_subject = rcube_find_object('_subject');
+    var input_message = rcube_find_object('_message');
+
+    // check for empty recipient
+    if (input_to && !rcube_check_email(input_to.value, true))
+      {
+      alert(this.get_label('norecipientwarning'));
+      input_to.focus();
+      return false;
+      }
+
+    // display localized warning for missing subject
+    if (input_subject && input_subject.value == '')
+      {
+      var subject = prompt(this.get_label('nosubjectwarning'), this.get_label('nosubject'));
+
+      // user hit cancel, so don't send
+      if (!subject && subject !== '')
+        {
+        input_subject.focus();
+        return false;
+        }
+      else
+        {
+        input_subject.value = subject ? subject : this.get_label('nosubject');            
+        }
+      }
+
+    // check for empty body
+    if ((input_message.value=='')&&(tinyMCE.getContent()==''))
+      {
+      if (!confirm(this.get_label('nobodywarning')))
+        {
+        input_message.focus();
+        return false;
+        }
+      }
+
+    return true;
+    };
+
+
+  this.set_spellcheck_state = function(s)
+    {
+  this.spellcheck_ready = (s=='check_spelling' || s=='ready');
+    this.enable_command('spellcheck', this.spellcheck_ready);
+  };
+
+
+  this.auto_save_start = function()
+    {
+    if (this.env.draft_autosave)
+      this.save_timer = self.setTimeout(this.ref+'.command("savedraft")', this.env.draft_autosave * 1000);
+    };
+
+
+  this.compose_field_hash = function()
+    {
+    // check input fields
+    var input_to = rcube_find_object('_to');
+    var input_cc = rcube_find_object('_to');
+    var input_bcc = rcube_find_object('_to');
+    var input_subject = rcube_find_object('_subject');
+    var input_message = rcube_find_object('_message');
+    
+    var str = '';
+    if (input_to && input_to.value)
+      str += input_to.value+':';
+    if (input_cc && input_cc.value)
+      str += input_cc.value+':';
+    if (input_bcc && input_bcc.value)
+      str += input_bcc.value+':';
+    if (input_subject && input_subject.value)
+      str += input_subject.value+':';
+    if (input_message && input_message.value)
+      str += input_message.value;
+
+    return str;
+    };
+    
+  
+  this.change_identity = function(obj)
+    {
+    if (!obj || !obj.options)
+      return false;
+
+    var id = obj.options[obj.selectedIndex].value;
+    var input_message = rcube_find_object('_message');
+    var message = input_message ? input_message.value : '';
+    var is_html = (rcube_find_object('_is_html').value == '1');
+    var sig, p;
+
+    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])
+        {
+        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);
+        }
+
+      // 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'+sig;
+        }
+      }
+    else
+      {
+      var eid = tinyMCE.getEditorId('_message');
+      // editor is a TinyMCE_Control object
+      var editor = tinyMCE.getInstanceById(eid);
+      var msgDoc = editor.getDoc();
+      var msgBody = msgDoc.body;
+
+      if (this.env.signatures && this.env.signatures[id])
+        {
+        // Append the signature as a span within the body
+        var sigElem = msgDoc.getElementById("_rc_sig");
+        if (!sigElem)
+          {
+          sigElem = msgDoc.createElement("span");
+          sigElem.setAttribute("id", "_rc_sig");
+          msgBody.appendChild(sigElem);
+          }
+        if (this.env.signatures[id]['is_html'])
+          {
+          sigElem.innerHTML = this.env.signatures[id]['text'];
+          }
+        else
+          {
+          sigElem.innerHTML = '<pre>' + this.env.signatures[id]['text'] + '</pre>';
+          }
+        }
+      }
+
+    if (input_message)
+      input_message.value = message;
+
+    this.env.identity = id;
+    return true;
+    };
 
 
   this.show_attachment_form = function(a)
@@ -1348,12 +1802,15 @@
     // clear upload form
     if (!a && this.gui_objects.attachmentform && this.gui_objects.attachmentform!=this.gui_objects.messageform)
       this.gui_objects.attachmentform.reset();
+    
+    return true;  
     };
 
 
   // upload attachment file
   this.upload_file = function(form)
     {
+    
     if (!form)
       return false;
       
@@ -1397,28 +1854,80 @@
     
     // set reference to the form object
     this.gui_objects.attachmentform = form;
+    return true;
     };
 
 
   // add file name to attachment list
   // called from upload page
-  this.add2attachment_list = function(name)
+  this.add2attachment_list = function(name, content)
     {
     if (!this.gui_objects.attachmentlist)
       return false;
       
     var li = document.createElement('LI');
-    li.innerHTML = name;
+    li.id = name;
+    li.innerHTML = content;
     this.gui_objects.attachmentlist.appendChild(li);
+    return true;
     };
 
+  this.remove_from_attachment_list = function(name)
+    {
+    if (!this.gui_objects.attachmentlist)
+      return false;
+
+    var list = this.gui_objects.attachmentlist.getElementsByTagName("li");
+    for (i=0;i<list.length;i++)
+      if (list[i].id == name)
+        this.gui_objects.attachmentlist.removeChild(list[i]);
+    };
+
+  this.remove_attachment = function(name)
+    {
+    if (name)
+      this.http_request('remove-attachment', '_file='+urlencode(name));
+
+    return true;
+    };
 
   // send remote request to add a new contact
   this.add_contact = function(value)
     {
     if (value)
       this.http_request('addcontact', '_address='+value);
+    
+    return true;
     };
+
+  // send remote request to search mail
+  this.qsearch = function(value, mbox)
+    {
+    if (value && mbox)
+      {
+      this.message_list.clear();
+      this.set_busy(true, 'searching');
+      this.http_request('search', '_search='+value+'&_mbox='+mbox, 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(msg)
+    {
+    this.list_mailbox();
+    this.display_message(msg, 'confirmation', true);
+    }
 
 
   /*********************************************************/
@@ -1651,6 +2160,30 @@
   /*********************************************************/
 
 
+  this.contactlist_keypress = function(list)
+    {
+      if (list.key_pressed == list.DELETE_KEY)
+        this.command('delete');
+    };
+
+
+  this.contactlist_select = function(list)
+    {
+      var id, frame;
+      if (id = list.get_single_selection())
+        this.load_contact(id, 'show');
+      else if (frame = document.getElementById(this.env.contentframe))
+        frame.style.visibility = 'hidden';
+
+      this.enable_command('edit', id?true:false);
+
+      if (list.selection.length)
+        this.enable_command('delete', 'compose', true);
+
+      return false; 
+    };
+
+
   this.list_contacts = function(page)
     {
     var add_url = '';
@@ -1673,26 +2206,20 @@
       }
 
     this.set_busy(true, 'loading');
-    location.href = this.env.comm_path+(page ? '&_page='+page : '')+add_url;
+    target.location.href = this.env.comm_path+(page ? '&_page='+page : '')+add_url;
     };
 
 
   // send remote request to load contacts list
   this.list_contacts_remote = function(page)
     {
-    // clear list
-    var table = this.gui_objects.contactslist;
-    var tbody = document.createElement('TBODY');
-    table.insertBefore(tbody, table.tBodies[0]);
-    table.tBodies[1].style.display = 'none';
-    
-    this.contact_rows = new Array();
-    this.list_rows = this.contact_rows;
+    // clear message list first
+    this.contact_list.clear();
 
     // send request to server
     var url = page ? '&_page='+page : '';
     this.set_busy(true, 'loading');
-    this.http_request('list', url);
+    this.http_request('list', url, true);
     };
 
 
@@ -1709,24 +2236,23 @@
       }
     else if (framed)
       return false;
-      
-    //if (this.env.framed && add_url=='')
-    //  add_url = '&_framed=1';
-    
+
     if (action && (cid || action=='add'))
       {
       this.set_busy(true);
       target.location.href = this.env.comm_path+'&_action='+action+'&_cid='+cid+add_url;
       }
+    return true;
     };
 
 
   this.delete_contacts = function()
     {
     // exit if no mailbox specified or if selection is empty
-    if (!(this.selection.length || this.env.cid))
+    var selection = this.contact_list.get_selection();
+    if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
       return;
-    
+      
     var a_cids = new Array();
 
     if (this.env.cid)
@@ -1734,18 +2260,15 @@
     else
       {
       var id;
-      for (var n=0; n<this.selection.length; n++)
+      for (var n=0; n<selection.length; n++)
         {
-        id = this.selection[n];
+        id = selection[n];
         a_cids[a_cids.length] = id;
-      
-        // 'remove' row from list (just hide it)
-        if (this.contact_rows[id].obj)
-          this.contact_rows[id].obj.style.display = 'none';
+        this.contact_list.remove_row(id);
         }
 
       // hide content frame if we delete the currently displayed contact
-      if (this.selection.length==1 && this.env.contentframe)
+      if (selection.length==1 && this.env.contentframe)
         {
         var elm = document.getElementById(this.env.contentframe);
         elm.style.visibility = 'hidden';
@@ -1754,34 +2277,88 @@
 
     // send request to server
     this.http_request('delete', '_cid='+a_cids.join(',')+'&_from='+(this.env.action ? this.env.action : ''));
+    return true;
     };
 
 
   // update a contact record in the list
   this.update_contact_row = function(cid, cols_arr)
     {
-    if (!this.contact_rows[cid] || !this.contact_rows[cid].obj)
-      return false;
-      
-    var row = this.contact_rows[cid].obj;
-    for (var c=0; c<cols_arr.length; c++)
-      if (row.cells[c])
-        row.cells[c].innerHTML = cols_arr[c];
+    var row;
+    if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj))
+      {
+      for (var c=0; c<cols_arr.length; c++)
+        if (row.cells[c])
+          row.cells[c].innerHTML = cols_arr[c];
 
+      return true;
+      }
+
+    return false;
     };
-  
+
+  // load ldap search form
+  // deprecated
+  this.ldappublicsearch = function(action)
+    {
+    var add_url = '';
+    var target = window;
+    if (this.env.contentframe && window.frames && window.frames[this.env.contentframe])
+      {
+      add_url = '&_framed=1';
+      target = window.frames[this.env.contentframe];
+      document.getElementById(this.env.contentframe).style.visibility = 'inherit';
+      }
+    else
+      return false;
+
+    if (action == 'ldappublicsearch')
+      target.location.href = this.env.comm_path+'&_action='+action+add_url;
+      
+    return true;
+    };
+ 
+  // add ldap contacts to address book
+  this.add_ldap_contacts = function()
+    {
+    if (window.frames[this.env.contentframe].rcmail)
+      {
+      var frame = window.frames[this.env.contentframe];
+
+      // build the url
+      var url    = '&_framed=1';
+      var emails = '&_emails=';
+      var names  = '&_names=';
+      var end    = '';
+      for (var n=0; n<frame.rcmail.selection.length; n++)
+        {
+        end = n < frame.rcmail.selection.length - 1 ? ',' : '';
+        emails += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[1].innerHTML + end;
+        names  += frame.rcmail.ldap_contact_rows[frame.rcmail.selection[n]].obj.cells[0].innerHTML + end;
+        }
+       
+      frame.location.href = this.env.comm_path + '&_action=save&_framed=1' + emails + names;
+      }
+    return false;
+    }
 
 
   /*********************************************************/
   /*********        user settings methods          *********/
   /*********************************************************/
 
+  this.identity_select = function(list)
+    {
+    var id;
+    if (id = list.get_single_selection())
+      this.load_identity(id, 'edit-identity');
+    };
 
   // load contact record
   this.load_identity = function(id, action)
     {
     if (action=='edit-identity' && (!id || id==this.env.iid))
-      return;
+      return false;
 
     var add_url = '';
     var target = window;
@@ -1797,6 +2374,7 @@
       this.set_busy(true);
       target.location.href = this.env.comm_path+'&_action='+action+'&_iid='+id+add_url;
       }
+    return true;
     };
 
 
@@ -1804,11 +2382,12 @@
   this.delete_identity = function(id)
     {
     // exit if no mailbox specified or if selection is empty
-    if (!(this.selection.length || this.env.iid))
+    var selection = this.identity_list.get_selection();
+    if (!(selection.length || this.env.iid))
       return;
     
     if (!id)
-      id = this.env.iid ? this.env.iid : this.selection[0];
+      id = this.env.iid ? this.env.iid : selection[0];
 
 /*
     // 'remove' row from list (just hide it)
@@ -1820,40 +2399,234 @@
 */
 
     // if (this.env.framed && id)
-      this.set_busy(true);
-      location.href = this.env.comm_path+'&_action=delete-identity&_iid='+id;
-    // else if (id)
-    //  this.http_request('delete-identity', '_iid='+id);
+    this.goto_url('delete-identity', '_iid='+id, true);
+    return true;
     };
 
 
+  // tell server to create and subscribe a new mailbox
   this.create_folder = function(name)
     {
+  if (this.edit_folder)
+    this.reset_folder_rename();
+
     var form;
     if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
       name = form.elements['_folder_name'].value;
 
     if (name)
-      this.http_request('create-folder', '_name='+escape(name));
+      this.http_request('create-folder', '_name='+urlencode(name), true);
     else if (form.elements['_folder_name'])
       form.elements['_folder_name'].focus();
     };
 
 
+  // entry point for folder renaming
+  this.rename_folder = function(props)
+    {
+    var form, oldname, newname;
+    
+    // rename a specific mailbox
+    if (props)
+      this.edit_foldername(props);
+
+    // use a dropdown and input field (old behavior)
+    else if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'] && form.elements['_folder_newname'])
+      {
+      oldname = form.elements['_folder_oldname'].value;
+      newname = form.elements['_folder_newname'].value;
+      }
+
+    if (oldname && newname)
+      this.http_request('rename-folder', '_folder_oldname='+urlencode(oldname)+'&_folder_newname='+urlencode(newname));
+    };
+
+
+  // start editing the mailbox name.
+  // this will replace the name string with an input field
+  this.edit_foldername = function(folder)
+    {
+    var temp, row, form;
+    var id = this.get_folder_row_id(folder);
+
+    // reset current renaming
+  if (temp = this.edit_folder)
+    {
+    this.reset_folder_rename();
+    if (temp == id)
+      return;
+    }
+
+    if (id && (row = document.getElementById(id)))
+      {
+      this.name_input = document.createElement('INPUT');
+      this.name_input.value = this.env.subscriptionrows[id][1];
+      this.name_input.style.width = '100%';
+      this.name_input.onkeypress = function(e){ rcmail.name_input_keypress(e); };
+      
+      row.cells[0].replaceChild(this.name_input, row.cells[0].firstChild);
+      this.edit_folder = id;
+      this.name_input.select();
+      
+      if (form = this.gui_objects.editform)
+        form.onsubmit = function(){ return false; };
+      }
+    };
+
+
+  // remove the input field and write the current mailbox name to the table cell
+  this.reset_folder_rename = function()
+    {
+    var cell = this.name_input ? this.name_input.parentNode : null;
+    if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
+      cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
+      
+    this.edit_folder = null;
+    };
+
+
+  // handler for keyboard events on the input field
+  this.name_input_keypress = function(e)
+    {
+    var key = document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
+
+    // enter
+    if (key==13)
+      {
+      var newname = this.name_input ? this.name_input.value : null;
+      if (this.edit_folder && newname)
+        this.http_request('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));        
+      }
+    // escape
+    else if (key==27)
+      this.reset_folder_rename();
+    };
+
+
+  // delete a specific mailbox with all its messages
   this.delete_folder = function(folder)
     {
+  if (this.edit_folder)
+    this.reset_folder_rename();
+    
     if (folder)
-      {
-      for (var id in this.env.subscriptionrows)
-        if (this.env.subscriptionrows[id]==folder)
-          break;
-          
-      var row;
-      if (id && (row = document.getElementById(id)))
-        row.style.display = 'none';
+      this.http_request('delete-folder', '_mboxes='+urlencode(folder));
+    };
 
-      this.http_request('delete-folder', '_mboxes='+escape(folder));
+
+  // add a new folder to the subscription list by cloning a folder row
+  this.add_folder_row = function(name, display_name, replace)
+    {
+    name = name.replace('\\',"");
+    if (!this.gui_objects.subscriptionlist)
+      return false;
+
+    for (var refid in this.env.subscriptionrows)
+      if (this.env.subscriptionrows[refid]!=null)
+        break;
+
+    var refrow, form;
+    var tbody = this.gui_objects.subscriptionlist.tBodies[0];
+    var id = replace && replace.id ? replace.id : tbody.childNodes.length+1;
+
+    if (!id || !(refrow = document.getElementById(refid)))
+      {
+      // Refresh page if we don't have a table row to clone
+      this.goto_url('folders');
       }
+    else
+      {
+      // clone a table row if there are existing rows
+      var row = this.clone_table_row(refrow);
+      row.id = 'rcmrow'+id;
+      if (replace)
+        tbody.replaceChild(row, replace);
+      else
+        tbody.appendChild(row);
+      }
+
+    // add to folder/row-ID map
+    this.env.subscriptionrows[row.id] = [name, display_name];
+
+    // set folder name
+    row.cells[0].innerHTML = display_name;
+    if (row.cells[1] && row.cells[1].firstChild.tagName=='INPUT')
+      {
+      row.cells[1].firstChild.value = name;
+      row.cells[1].firstChild.checked = true;
+      }
+       
+    if (row.cells[2] && row.cells[2].firstChild.tagName=='A')
+      row.cells[2].firstChild.onclick = new Function(this.ref+".command('rename-folder','"+name.replace('\'','\\\'')+"')");
+    if (row.cells[3] && row.cells[3].firstChild.tagName=='A')
+      row.cells[3].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name.replace('\'','\\\'')+"')");
+
+    // add new folder to rename-folder list and clear input field
+    if (!replace && (form = this.gui_objects.editform))
+      {
+      if (form.elements['_folder_oldname'])
+        form.elements['_folder_oldname'].options[form.elements['_folder_oldname'].options.length] = new Option(name,name);
+      if (form.elements['_folder_name'])
+        form.elements['_folder_name'].value = ''; 
+      }
+
+    };
+
+
+  // replace an existing table row with a new folder line
+  this.replace_folder_row = function(oldfolder, newfolder, display_name)
+    {
+    var id = this.get_folder_row_id(oldfolder);
+    var row = document.getElementById(id);
+    
+    // replace an existing table row (if found)
+    this.add_folder_row(newfolder, display_name, row);
+    this.env.subscriptionrows[id] = null;
+    
+    // rename folder in rename-folder dropdown
+    var form, elm;
+    if ((form = this.gui_objects.editform) && (elm = form.elements['_folder_oldname']))
+      {
+      for (var i=0;i<elm.options.length;i++)
+        {
+        if (elm.options[i].value == oldfolder)
+          {
+          elm.options[i].text = display_name;
+          elm.options[i].value = newfolder;
+          break;
+          }
+        }
+
+      form.elements['_folder_newname'].value = '';
+      }
+    };
+    
+
+  // remove the table row of a specific mailbox from the table
+  // (the row will not be removed, just hidden)
+  this.remove_folder_row = function(folder)
+    {
+    var row;
+    var id = this.get_folder_row_id(folder);
+    if (id && (row = document.getElementById(id)))
+      row.style.display = 'none';    
+
+    // remove folder from rename-folder list
+    var form;
+    if ((form = this.gui_objects.editform) && form.elements['_folder_oldname'])
+      {
+      for (var i=0;i<form.elements['_folder_oldname'].options.length;i++)
+        {
+        if (form.elements['_folder_oldname'].options[i].value == folder) 
+          {
+          form.elements['_folder_oldname'].options[i] = null;
+          break;
+          }
+        }
+      }
+    
+    if (form && form.elements['_folder_newname'])
+      form.elements['_folder_newname'].value = '';
     };
 
 
@@ -1863,7 +2636,7 @@
     if ((form = this.gui_objects.editform) && form.elements['_unsubscribed'])
       this.change_subscription('_unsubscribed', '_subscribed', 'subscribe');
     else if (folder)
-      this.http_request('subscribe', '_mboxes='+escape(folder));
+      this.http_request('subscribe', '_mboxes='+urlencode(folder));
     };
 
 
@@ -1873,7 +2646,7 @@
     if ((form = this.gui_objects.editform) && form.elements['_subscribed'])
       this.change_subscription('_subscribed', '_unsubscribed', 'unsubscribe');
     else if (folder)
-      this.http_request('unsubscribe', '_mboxes='+escape(folder));
+      this.http_request('unsubscribe', '_mboxes='+urlencode(folder));
     };
     
 
@@ -1907,45 +2680,21 @@
           list_to[index] = new Option(a_folders[n]);
           }
           
-        this.http_request(action, '_mboxes='+escape(a_folders.join(',')));
+        this.http_request(action, '_mboxes='+urlencode(a_folders.join(',')));
         }
       }
       
     };
 
-
-   // add a new folder to the subscription list by cloning a folder row
-   this.add_folder_row = function(name)
-     {
-     if (!this.gui_objects.subscriptionlist)
-       return false;
-
-     var tbody = this.gui_objects.subscriptionlist.tBodies[0];
-     var id = tbody.childNodes.length+1;
-     
-     // clone a table row
-     var row = this.clone_table_row(tbody.rows[0]);
-     row.id = 'rcmrow'+id;
-     tbody.appendChild(row);
-
-     // add to folder/row-ID map
-     this.env.subscriptionrows[row.id] = name;
-
-     // set folder name
-     row.cells[0].innerHTML = name;
-     if (row.cells[1].firstChild.tagName=='INPUT')
-       {
-       row.cells[1].firstChild.value = name;
-       row.cells[1].firstChild.checked = true;
-       }
-     if (row.cells[2].firstChild.tagName=='A')
-       row.cells[2].firstChild.onclick = new Function(this.ref+".command('delete-folder','"+name+"')");
-
-    var form;
-    if ((form = this.gui_objects.editform) && form.elements['_folder_name'])
-      form.elements['_folder_name'].value = '';
-     };
-
+  // helper method to find a specific mailbox row ID
+  this.get_folder_row_id = function(folder)
+    {
+    for (var id in this.env.subscriptionrows)
+      if (this.env.subscriptionrows[id] && this.env.subscriptionrows[id][0] == folder)
+        break;
+        
+    return id;
+    };
 
   // duplicate a specific table row
   this.clone_table_row = function(row)
@@ -1979,7 +2728,9 @@
   this.set_page_buttons = function()
     {
     this.enable_command('nextpage', (this.env.pagecount > this.env.current_page));
+    this.enable_command('lastpage', (this.env.pagecount > this.env.current_page));
     this.enable_command('previouspage', (this.env.current_page > 1));
+    this.enable_command('firstpage', (this.env.current_page > 1));
     }
 
 
@@ -2046,6 +2797,26 @@
       }
     };
 
+  // mouse down on button
+  this.button_sel = function(command, id)
+    {
+    var a_buttons = this.buttons[command];
+    var button, img;
+
+    if(!a_buttons || !a_buttons.length)
+      return;
+
+    for(var n=0; n<a_buttons.length; n++)
+      {
+      button = a_buttons[n];
+      if(button.id==id && button.status=='act')
+        {
+        img = document.getElementById(button.id);
+        if (img && button.sel)
+          img.src = button.sel;
+        }
+      }
+    };
 
   // mouse out of button
   this.button_out = function(command, id)
@@ -2090,15 +2861,16 @@
   // display a system message
   this.display_message = function(msg, type, hold)
     {
+    this.set_busy(false);
     if (!this.loaded)  // save message in order to display after page loaded
       {
       this.pending_message = new Array(msg, type);
       return true;
       }
-    
+  
     if (!this.gui_objects.message)
       return false;
-      
+
     if (this.message_timer)
       clearTimeout(this.message_timer);
     
@@ -2109,7 +2881,7 @@
     this.gui_objects.message._rcube = this;
     this.gui_objects.message.innerHTML = cont;
     this.gui_objects.message.style.display = 'block';
-    
+ 
     if (type!='loading')
       this.gui_objects.message.onmousedown = function(){ this._rcube.hide_message(); return true; };
     
@@ -2132,48 +2904,91 @@
   // mark a mailbox as selected and set environment variable
   this.select_mailbox = function(mbox)
     {
-    if (this.gui_objects.mailboxlist)
+    if (this.gui_objects.mailboxlist )
       {
-      var item, reg, text_obj;
-      var s_current = this.env.mailbox.toLowerCase().replace(this.mbox_expression, '');
-      var s_mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
-      var s_current = this.env.mailbox.toLowerCase().replace(this.mbox_expression, '');
-      
-      var current_li = document.getElementById('rcmbx'+s_current);
-      var mbox_li = document.getElementById('rcmbx'+s_mbox);
+      var item, reg, text_obj;      
+      var current_li = this.get_mailbox_li();
+      var mbox_li = this.get_mailbox_li(mbox);
       
       if (current_li)
+        {
         this.set_classname(current_li, 'selected', false);
-      if (mbox_li)
+        this.set_classname(current_li, 'unfocused', false);
+        }
+
+      if (mbox_li || this.env.mailbox == mbox)
+        {
+        this.set_classname(mbox_li, 'unfocused', false);
         this.set_classname(mbox_li, 'selected', true);
+        }
+      }
+
+    // also update mailbox name in window title
+    if (document.title)
+      {
+      var doc_title = String(document.title);
+      var reg = new RegExp(this.env.mailbox.toLowerCase(), 'i');
+      if (this.env.mailbox && doc_title.match(reg))
+        document.title = doc_title.replace(reg, mbox).replace(/^\([0-9]+\)\s+/i, '');
       }
     
     this.env.mailbox = mbox;
     };
 
 
-  // create a table row in the message list
-  this.add_message_row = function(uid, cols, flags, attachment)
-    {
-    if (!this.gui_objects.messagelist || !this.gui_objects.messagelist.tBodies[0])
-      return false;
+  // for reordering column array, Konqueror workaround
+  this.set_message_coltypes = function(coltypes) 
+  { 
+    this.coltypes = coltypes;
     
+    // set correct list titles
+    var cell, col;
+    var thead = this.gui_objects.messagelist ? this.gui_objects.messagelist.tHead : null;
+    for (var n=0; thead && n<this.coltypes.length; n++) 
+      {
+      col = this.coltypes[n];
+      if ((cell = thead.rows[0].cells[n+1]) && (col=='from' || col=='to'))
+        {
+        // if we have links for sorting, it's a bit more complicated...
+        if (cell.firstChild && cell.firstChild.tagName=='A')
+          {
+          cell.firstChild.innerHTML = this.get_label(this.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.id = 'rcmHead'+col;
+        }
+      }
+
+  };
+
+  // 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;
+
     var tbody = this.gui_objects.messagelist.tBodies[0];
     var rowcount = tbody.rows.length;
     var even = rowcount%2;
     
-    this.env.messages[uid] = {replied:flags.replied?1:0,
+    this.env.messages[uid] = {deleted:flags.deleted?1:0,
+                              replied:flags.replied?1:0,
                               unread:flags.unread?1:0};
     
     var row = document.createElement('TR');
     row.id = 'rcmrow'+uid;
-    row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '');
+    row.className = 'message '+(even ? 'even' : 'odd')+(flags.unread ? ' unread' : '')+(flags.deleted ? ' deleted' : '');
 
-    if (this.in_selection(uid))
+    if (this.message_list.in_selection(uid))
       row.className += ' selected';
 
-    var icon = flags.unread && this.env.unreadicon ? this.env.unreadicon :
-               (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon);
+    var icon = flags.deleted && this.env.deletedicon ? this.env.deletedicon:
+               (flags.unread && this.env.unreadicon ? this.env.unreadicon :
+               (flags.replied && this.env.repliedicon ? this.env.repliedicon : this.env.messageicon));
 
     var col = document.createElement('TD');
     col.className = 'icon';
@@ -2181,8 +2996,9 @@
     row.appendChild(col);
 
     // add each submitted col
-    for (var c in cols)
-      {
+    for (var n = 0; n < this.coltypes.length; n++) 
+      { 
+      var c = this.coltypes[n];
       col = document.createElement('TD');
       col.className = String(c).toLowerCase();
       col.innerHTML = cols[c];
@@ -2193,9 +3009,8 @@
     col.className = 'icon';
     col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : '';
     row.appendChild(col);
-    
-    tbody.appendChild(row);
-    this.init_message_row(row);
+
+    this.message_list.insert_row(row, attop);
     };
 
 
@@ -2209,43 +3024,62 @@
     this.set_page_buttons();
     };
 
+  // replace content of quota display
+   this.set_quota = function(text)
+     {
+     if (this.gui_objects.quotadisplay)
+       this.gui_objects.quotadisplay.innerHTML = text;
+     };
+
 
   // update the mailboxlist
-  this.set_unread_count = function(mbox, count)
+  this.set_unread_count = function(mbox, count, set_title)
     {
     if (!this.gui_objects.mailboxlist)
       return false;
-      
+
+    if (mbox==this.env.mailbox)
+      set_title = true;
+
+    var reg, text_obj;
+    var item = this.get_mailbox_li(mbox);
     mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
-    
-    var item, reg, text_obj;
-    for (var n=0; n<this.gui_objects.mailboxlist.childNodes.length; n++)
+
+    if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
       {
-      item = this.gui_objects.mailboxlist.childNodes[n];
+      // set new text
+      text_obj = item.firstChild;
+      reg = /\s+\([0-9]+\)$/i;
 
-      if (item.className && item.className.indexOf('mailbox '+mbox)>=0)
-        {
-        // set new text
-        text_obj = item.firstChild;
-        reg = /\s+\([0-9]+\)$/i;
+      if (count && text_obj.innerHTML.match(reg))
+        text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')');
+      else if (count)
+        text_obj.innerHTML += ' ('+count+')';
+      else
+        text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
 
-        if (count && text_obj.innerHTML.match(reg))
-          text_obj.innerHTML = text_obj.innerHTML.replace(reg, ' ('+count+')');
-        else if (count)
-          text_obj.innerHTML += ' ('+count+')';
-        else
-          text_obj.innerHTML = text_obj.innerHTML.replace(reg, '');
-          
-        // set the right classes
-        this.set_classname(item, 'unread', count>0 ? true : false);        
-        break;
-        }
+      // set the right classes
+      this.set_classname(item, 'unread', count>0 ? true : false);
+      }
+
+    // set unread count to window title
+    reg = /^\([0-9]+\)\s+/i;
+    if (set_title && document.title)
+      {
+      var doc_title = String(document.title);
+
+      if (count && doc_title.match(reg))
+        document.title = doc_title.replace(reg, '('+count+') ');
+      else if (count)
+        document.title = '('+count+') '+doc_title;
+      else
+        document.title = doc_title.replace(reg, '');
       }
     };
 
 
   // add row to contacts list
-  this.add_contact_row = function(cid, cols)
+  this.add_contact_row = function(cid, cols, select)
     {
     if (!this.gui_objects.contactslist || !this.gui_objects.contactslist.tBodies[0])
       return false;
@@ -2258,7 +3092,7 @@
     row.id = 'rcmrow'+cid;
     row.className = 'contact '+(even ? 'even' : 'odd');
     
-    if (this.in_selection(cid))
+    if (this.contact_list.in_selection(cid))
       row.className += ' selected';
 
     // add each submitted col
@@ -2270,73 +3104,21 @@
       row.appendChild(col);
       }
     
-    tbody.appendChild(row);
-    this.init_table_row(row, 'contact_rows');
+    this.contact_list.insert_row(row);
     };
 
 
-
-  /********************************************************/
-  /*********          drag & drop methods         *********/
-  /********************************************************/
-
-
-  this.drag_mouse_move = function(e)
+  this.toggle_editor = function(checkbox, textElementName)
     {
-    if (this.drag_start)
+    var ischecked = checkbox.checked;
+    if (ischecked)
       {
-      if (!this.draglayer)
-        this.draglayer = new rcube_layer('rcmdraglayer', {x:0, y:0, width:300, vis:0, zindex:2000});
-      
-      // get subjects of selectedd messages
-      var names = '';
-      var c, subject, obj;
-      for(var n=0; n<this.selection.length; n++)
-        {
-        if (n>12)  // only show 12 lines
-          {
-          names += '...';
-          break;
-          }
-
-        if (this.message_rows[this.selection[n]].obj)
-          {
-          obj = this.message_rows[this.selection[n]].obj;
-          subject = '';
-
-          for(c=0; c<obj.childNodes.length; c++)
-            if (!subject && obj.childNodes[c].nodeName=='TD' && obj.childNodes[c].firstChild && obj.childNodes[c].firstChild.nodeType==3)
-              {
-              subject = obj.childNodes[c].firstChild.data;
-              names += (subject.length > 50 ? subject.substring(0, 50)+'...' : subject) + '<br />';
-              }
-          }
-        }
-        
-      this.draglayer.write(names);
-      this.draglayer.show(1);
+        tinyMCE.execCommand('mceAddControl', true, textElementName);
       }
-
-    var pos = this.get_mouse_pos(e);
-    this.draglayer.move(pos.x+20, pos.y-5);
-    
-    this.drag_start = false;
-    this.drag_active = true;
-    
-    return false;
-    };
-
-
-  this.drag_mouse_up = function()
-    {
-    document.onmousemove = null;
-    
-    if (this.draglayer && this.draglayer.visible)
-      this.draglayer.show(0);
-      
-    this.drag_active = false;
-    
-    return false;
+    else
+      {
+        tinyMCE.execCommand('mceRemoveControl', true, textElementName);
+      }
     };
 
 
@@ -2346,69 +3128,138 @@
   /********************************************************/
 
 
-  // send a http request to the server
-  this.http_request = function(action, querystring)
+  this.goto_url = function(action, query, lock)
     {
-    if (window.XMLHttpRequest)
-      this.request_obj = new XMLHttpRequest();
-    else if (window.ActiveXObject)
-      this.request_obj = new ActiveXObject("Microsoft.XMLHTTP");
-    else
-      {
-      
-      }
+    if (lock)
+    this.set_busy(true);
 
-    querystring += '&_remote=1';
+    var querystring = query ? '&'+query : '';
+    location.href = this.env.comm_path+'&_action='+action+querystring;
+    };
+
+
+  this.http_sockets = new Array();
+  
+  // find a non-busy socket or create a new one
+  this.get_request_obj = function()
+    {
+    for (var n=0; n<this.http_sockets.length; n++)
+      {
+      if (!this.http_sockets[n].busy)
+        return this.http_sockets[n];
+      }
+    
+    // create a new XMLHTTP object
+    var i = this.http_sockets.length;
+    this.http_sockets[i] = new rcube_http_request();
+
+    return this.http_sockets[i];
+    };
+  
+
+  // send a http request to the server
+  this.http_request = function(action, querystring, lock)
+    {
+    var request_obj = this.get_request_obj();
+    querystring += (querystring ? '&' : '') + '_remote=1';
     
     // add timestamp to request url to avoid cacheing problems in Safari
     if (bw.safari)
       querystring += '&_ts='+(new Date().getTime());
 
     // send request
-    if (this.request_obj)
+    if (request_obj)
       {
-      // prompt('request', this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
-      console('HTTP request: '+this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
-      this.set_busy(true);
-      this.request_action = action;
-      this.request_obj.onreadystatechange = function(){ rcube_webmail_client.http_response(); };
-      this.request_obj.open('GET', this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
-      this.request_obj.send(null);
+      // prompt('request', this.env.comm_path+'&_action='+urlencode(action)+'&'+querystring);
+      console('HTTP request: '+this.env.comm_path+'&_action='+action+'&'+querystring);
+
+      if (lock)
+        this.set_busy(true);
+
+      request_obj.__lock = lock ? true : false;
+      request_obj.__action = action;
+      request_obj.onerror = function(o){ rcube_webmail_client.http_error(o); };
+      request_obj.oncomplete = function(o){ rcube_webmail_client.http_response(o); };
+      request_obj.GET(this.env.comm_path+'&_action='+action+'&'+querystring);
       }
     };
 
 
-  // handle http response
-  this.http_response = function()
+  // handle HTTP response
+  this.http_response = function(request_obj)
     {
-    if (this.request_obj.readyState == 4) // || this.request_obj.readyState == 2)
-      {
-      var ctype = this.request_obj.getResponseHeader('Content-Type');
-      if (ctype)
-        ctype = String(ctype).toLowerCase();
+    var ctype = request_obj.get_header('Content-Type');
+    if (ctype){
+      ctype = String(ctype).toLowerCase();
+      var ctype_array=ctype.split(";");
+      ctype = ctype_array[0];
+    }
 
+    this.set_busy(false);
+
+  console(request_obj.get_text());
+
+    // if we get javascript code from server -> execute it
+    if (request_obj.get_text() && (ctype=='text/javascript' || ctype=='application/x-javascript'))
+      eval(request_obj.get_text());
+
+    // process the response data according to the sent action
+    switch (request_obj.__action)
+      {
+      case 'delete':
+      case 'moveto':
+        if (this.env.action=='show')
+          this.command('list');
+        else if (this.message_list)
+          this.message_list.init();
+        break;
+
+      case 'list':
+        if (this.env.messagecount)
+          this.enable_command('purge', (this.env.mailbox==this.env.trash_mailbox || this.env.mailbox==this.env.junk_mailbox));
+
+      case 'expunge':
+        this.enable_command('select-all', 'select-none', 'expunge', this.env.messagecount ? true : false);
+        break;
+      }
+
+    request_obj.reset();
+    };
+
+
+  // handle HTTP request errors
+  this.http_error = function(request_obj)
+    {
+    //alert('Error sending request: '+request_obj.url);
+
+    if (request_obj.__lock)
       this.set_busy(false);
 
-  console(this.request_obj.responseText);
+    request_obj.reset();
+    request_obj.__lock = false;
+    };
 
-      // if we get javascript code from server -> execute it
-      if (this.request_obj.responseText && (ctype=='text/javascript' || ctype=='application/x-javascript'))
-        eval(this.request_obj.responseText);
 
-      // process the response data according to the sent action
-      switch (this.request_action)
-        {
-        case 'delete':
-        case 'moveto':
-          if (this.env.action=='show')
-            this.command('list');
-          break;
-          
-        case 'list':
-          this.enable_command('select-all', 'select-none', this.env.messagecount ? true : false);
-          break;
-        }
+  // use an image to send a keep-alive siganl to the server
+  this.send_keep_alive = function()
+    {
+    var d = new Date();
+    this.http_request('keep-alive', '_t='+d.getTime());
+    };
+
+    
+  // send periodic request to check for recent messages
+  this.check_for_recent = function()
+    {
+    if (this.busy)
+      {
+      this.send_keep_alive();
+      return;
       }
+
+    this.set_busy(true, 'checkingmail');
+    var d = new Date();
+    this.http_request('check-recent', '_t='+d.getTime());
     };
 
 
@@ -2420,47 +3271,16 @@
   // and return the message uid
   this.get_single_uid = function()
     {
-    return this.env.uid ? this.env.uid : (this.selection.length==1 ? this.selection[0] : null);
+    return this.env.uid ? this.env.uid : (this.message_list ? this.message_list.get_single_selection() : null);
     };
 
   // same as above but for contacts
   this.get_single_cid = function()
     {
-    return this.env.cid ? this.env.cid : (this.selection.length==1 ? this.selection[0] : null);
+    return this.env.cid ? this.env.cid : (this.contact_list ? this.contact_list.get_single_selection() : null);
     };
 
 
-  // check if Shift-key is pressed on event
-  this.check_shiftkey = function(e)
-    {
-    if(!e && window.event)
-      e = window.event;
-
-    if(bw.linux && bw.ns4 && e.modifiers)
-      return true;
-    else if((bw.ns4 && e.modifiers & Event.SHIFT_MASK) || (e && e.shiftKey))
-      return true;
-    else
-      return false;
-    }
-
-
-  this.get_mouse_pos = function(e)
-    {
-    if(!e) e = window.event;
-    var mX = (e.pageX) ? e.pageX : e.clientX;
-    var mY = (e.pageY) ? e.pageY : e.clientY;
-
-    if(document.body && document.all)
-      {
-      mX += document.body.scrollLeft;
-      mY += document.body.scrollTop;
-      }
-
-    return { x:mX, y:mY };
-    };
-    
-  
   this.get_caret_pos = function(obj)
     {
     if (typeof(obj.selectionEnd)!='undefined')
@@ -2525,6 +3345,152 @@
 
 
 
+/**
+ * Class for sending HTTP requests
+ * @constructor
+ */
+function rcube_http_request()
+  {
+  this.url = '';
+  this.busy = false;
+  this.xmlhttp = null;
+
+
+  // reset object properties
+  this.reset = function()
+    {
+    // set unassigned event handlers
+    this.onloading = function(){ };
+    this.onloaded = function(){ };
+    this.oninteractive = function(){ };
+    this.oncomplete = function(){ };
+    this.onabort = function(){ };
+    this.onerror = function(){ };
+    
+    this.url = '';
+    this.busy = false;
+    this.xmlhttp = null;
+    }
+
+
+  // create HTMLHTTP object
+  this.build = function()
+    {
+    if (window.XMLHttpRequest)
+      this.xmlhttp = new XMLHttpRequest();
+    else if (window.ActiveXObject)
+      this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+    else
+      {
+      
+      }
+    }
+
+  // send GET request
+  this.GET = function(url)
+    {
+    this.build();
+
+    if (!this.xmlhttp)
+      {
+      this.onerror(this);
+      return false;
+      }
+
+    var ref = this;
+    this.url = url;
+    this.busy = true;
+
+    this.xmlhttp.onreadystatechange = function(){ ref.xmlhttp_onreadystatechange(); };
+    this.xmlhttp.open('GET', url);
+    this.xmlhttp.send(null);
+    };
+
+
+  this.POST = function(url, body, contentType)
+    {
+    // default value for contentType if not provided
+    contentType = typeof(contentType) != 'undefined' ?
+      contentType : 'application/x-www-form-urlencoded';
+
+    this.build();
+    
+    if (!this.xmlhttp)
+    {
+       this.onerror(this);
+       return false;
+    }
+
+    var ref=this;
+    this.url = url;
+    this.busy = true;
+    
+    this.xmlhttp.onreadystatechange = function() { ref.xmlhttp_onreadystatechange(); };
+    this.xmlhttp.open('POST', url, true);
+    this.xmlhttp.setRequestHeader('Content-Type', contentType);
+    this.xmlhttp.send(body);
+    };
+
+
+  // handle onreadystatechange event
+  this.xmlhttp_onreadystatechange = function()
+    {
+    if(this.xmlhttp.readyState == 1)
+      this.onloading(this);
+
+    else if(this.xmlhttp.readyState == 2)
+      this.onloaded(this);
+
+    else if(this.xmlhttp.readyState == 3)
+      this.oninteractive(this);
+
+    else if(this.xmlhttp.readyState == 4)
+      {
+      try {
+        if (this.xmlhttp.status == 0)
+          this.onabort(this);
+        else if(this.xmlhttp.status == 200)
+          this.oncomplete(this);
+        else
+          this.onerror(this);
+
+        this.busy = false;
+        }
+      catch(err)
+        {
+        this.onerror(this);
+        this.busy = false;
+        }
+      }
+    }
+
+  // getter method for HTTP headers
+  this.get_header = function(name)
+    {
+    return this.xmlhttp.getResponseHeader(name);
+    };
+
+  this.get_text = function()
+    {
+    return this.xmlhttp.responseText;
+    };
+
+  this.get_xml = function()
+    {
+    return this.xmlhttp.responseXML;
+    };
+
+  this.reset();
+  
+  }  // end class rcube_http_request
+
+
+// helper function to call the init method with a delay
+function call_init(o)
+  {
+  if (window[o] && window[o].init)
+    setTimeout(o+'.init()', 200);
+  }
 
 function console(str)
   {
@@ -2532,10 +3498,3 @@
     document.debugform.console.value += str+'\n--------------------------------------\n';
   }
 
-
-// set onload handler
-window.onload = function(e)
-  {
-  if (window.rcube_webmail_client)
-    rcube_webmail_client.init();
-  };

--
Gitblit v1.9.1