X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=program%2Fjs%2Fapp.js;h=5ae67104ad4403d480e373f082cb2aca6f1a8a5b;hb=8bb10dbda276f4c5f1050a05786ba5a5a6cc787d;hp=7622f1f2cd221a4e11470cac5ce37b4a79c59cb7;hpb=0af63e79917234f76cfa7ec74e9d97b24fbf9b55;p=roundcube.git

diff --git a/program/js/app.js b/program/js/app.js
index 7622f1f..5ae6710 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -3,21 +3,19 @@
  | RoundCube Webmail Client Script                                       |
  |                                                                       |
  | This file is part of the RoundCube Webmail client                     |
- | Copyright (C) 2005, RoundCube Dev, - Switzerland                      |
+ | Copyright (C) 2005-2007, RoundCube Dev, - Switzerland                 |
  | Licensed under the GNU GPL                                            |
  |                                                                       |
  +-----------------------------------------------------------------------+
  | Authors: Thomas Bruederli <roundcube@gmail.com>                       |
  |          Charles McNulty <charles@charlesmcnulty.com>                 |
  +-----------------------------------------------------------------------+
- 
-  $Id: app.js 431 2006-12-23 10:44:16Z thomasb $
+ | Requires: common.js, list.js                                          |
+ +-----------------------------------------------------------------------+
+
+  $Id: app.js 575 2007-05-18 12:35:28Z thomasb $
 */
 
-// Constants
-var CONTROL_KEY = 1;
-var SHIFT_KEY = 2;
-var CONTROL_SHIFT_KEY = 3;
 
 var rcube_webmail_client;
 
@@ -28,19 +26,18 @@ function rcube_webmail()
   this.buttons = new Object();
   this.gui_objects = new Object();
   this.commands = new Object();
-  this.selection = new Array();
-  this.last_selected = 0;
-  this.in_message_list = false;
+  this.onloads = new Array();
 
-  // create public reference to myself
+  // create protected reference to myself
   rcube_webmail_client = this;
   this.ref = 'rcube_webmail_client';
+  var ref = this;
  
   // webmail client settings
-  this.dblclick_time = 600;
+  this.dblclick_time = 500;
   this.message_time = 5000;
   
-  this.mbox_expression = new RegExp('[^0-9a-z\-_]', 'gi');
+  this.identifier_expr = new RegExp('[^0-9a-z\-_]', 'gi');
   
   // mimetypes supported by the browser (default settings)
   this.mimetypes = new Array('text/plain', 'text/html', 'text/xml',
@@ -51,13 +48,20 @@ function rcube_webmail()
   // default environment vars
   this.env.keep_alive = 60;        // seconds
   this.env.request_timeout = 180;  // seconds
-  this.env.draft_autosave = 300;   // seconds
+  this.env.draft_autosave = 0;     // seconds
+  this.env.comm_path = './';
+  this.env.bin_path = './bin/';
+  this.env.blankpage = 'program/blank.gif';
 
 
-  // set environment variable
-  this.set_env = function(name, value)
+  // set environment variable(s)
+  this.set_env = function(p, value)
     {
-    this.env[name] = value;
+    if (p != null && typeof(p) == 'object' && !value)
+      for (var n in p)
+        this.env[n] = p[n];
+    else
+      this.env[p] = value;
     };
 
 
@@ -82,30 +86,35 @@ function rcube_webmail()
     this.buttons[command][this.buttons[command].length] = button_prop;    
     };
 
-
   // register a specific gui object
   this.gui_object = function(name, id)
     {
     this.gui_objects[name] = id;
     };
-
+  
+  // execute the given script on load
+  this.add_onload = function(f)
+    {
+      this.onloads[this.onloads.length] = f;
+    };
 
   // 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;
       }
     
     // find all registered gui objects
     for (var n in this.gui_objects)
       this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);
-      
+
     // tell parent window that this frame is loaded
     if (this.env.framed && parent.rcmail && parent.rcmail.set_busy)
       parent.rcmail.set_busy(false);
@@ -116,43 +125,73 @@ function rcube_webmail()
     switch (this.task)
       {
       case 'mail':
-        var msg_list_frame = this.gui_objects.mailcontframe;
-        var msg_list = this.gui_objects.messagelist;
-        if (msg_list)
+        if (this.gui_objects.messagelist)
           {
-          msg_list_frame.onmousedown = function(e){return rcube_webmail_client.click_on_list(e);};
-          this.init_messagelist(msg_list);
+          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', '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_contentframe(true);
+          parent.rcmail.mark_message('read', this.env.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', 'remove-attachment', 'send', true);
           if (this.env.spellcheck)
-            this.enable_command('spellcheck', true);
+            {
+            this.env.spellcheck.spelling_state_observer = function(s){ ref.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', 'expunge', true);
 
@@ -171,36 +210,53 @@ function rcube_webmail()
         // show printing dialog
         if (this.env.action=='print')
           window.print();
-          
+
         // get unread count for each mailbox
         if (this.gui_objects.mailboxlist)
+        {
+          this.gui_objects.folderlist = this.gui_objects.mailboxlist;
           this.http_request('getunread', '');
+        }
 
         break;
 
 
       case 'addressbook':
-        var contacts_list      = this.gui_objects.contactslist;
-        var ldap_contacts_list = this.gui_objects.ldapcontactslist;
+        if (this.gui_objects.contactslist)
+          {
+          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist, {multiselect:true, draggable:true, keyboard:true});
+          this.contact_list.addEventListener('keypress', function(o){ p.contactlist_keypress(o); });
+          this.contact_list.addEventListener('select', function(o){ p.contactlist_select(o); });
+          this.contact_list.addEventListener('dragstart', function(o){ p.drag_active = true; });
+          this.contact_list.addEventListener('dragend', function(o){ p.drag_active = false; });
+          this.contact_list.init();
 
-        if (contacts_list)
-          this.init_contactslist(contacts_list);
-      
-        if (ldap_contacts_list)
-          this.init_ldapsearchlist(ldap_contacts_list);
+          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.address_sources && !this.env.address_sources[this.env.source].readonly)
+          this.enable_command('add', true);
+        
         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);
+        else
+          this.enable_command('search', 'reset-search', 'moveto', true);
 
+        this.enable_command('list', true);
         break;
 
 
@@ -215,16 +271,25 @@ function rcube_webmail()
           
         if (this.env.action=='folders')
           this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', 'delete-folder', true);
-          
-        var identities_list = this.gui_objects.identitieslist;
-        if (identities_list)
-          this.init_identitieslist(identities_list);
+
+        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;
 
       case 'login':
         var input_user = rcube_find_object('_user');
         var input_pass = rcube_find_object('_pass');
+        if (input_user)
+          input_user.onkeypress = function(e){ return rcmail.login_user_keypress(e); };
         if (input_user && input_user.value=='')
           input_user.focus();
         else if (input_pass)
@@ -241,13 +306,6 @@ function rcube_webmail()
     // enable basic commands
     this.enable_command('logout', true);
 
-    // disable browser's contextmenus
-    // document.oncontextmenu = function(){ return false; }
-
-    // load body click event
-    document.onmousedown = function(){ return rcube_webmail_client.reset_click(); };
-    document.onkeydown   = function(e){ return rcube_webmail_client.key_pressed(e, msg_list_frame); };
-    
     // flag object as complete
     this.loaded = true;
 
@@ -257,167 +315,48 @@ function rcube_webmail()
 
     // start keep-alive interval
     this.start_keepalive();
+    
+    
+    // execute all foreign onload scripts
+    for (var i=0; i<this.onloads.length; i++)
+      {
+      if (typeof(this.onloads[i]) == 'string')
+        eval(this.onloads[i]);
+      else if (typeof(this.onloads[i]) == 'function')
+        this.onloads[i]();
+      }
     };
 
 
   // start interval for keep-alive/recent_check signal
   this.start_keepalive = function()
     {
-    if (this.env.keep_alive && 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.task!='login')
-      this._int = setInterval(this.ref+'.send_keep_alive()', this.env.keep_alive * 1000);    
+    if (this.env.keep_alive && !this.env.framed && this.task=='mail' && this.gui_objects.messagelist)
+      this._int = setInterval(function(){ ref.check_for_recent(); }, this.env.keep_alive * 1000);
+    else if (this.env.keep_alive && !this.env.framed && this.task!='login')
+      this._int = setInterval(function(){ ref.send_keep_alive(); }, this.env.keep_alive * 1000);    
     }
 
 
-  // reset last clicked if user clicks on anything other than the message table
-  this.reset_click = function()
-    {
-    var id;
-    this.in_message_list = false;
-	for (var n=0; n<this.selection.length; n++)
-	  {
-      id = this.selection[n];
-      if (this.list_rows[id] && this.list_rows[id].obj)
-        {
-        this.set_classname(this.list_rows[id].obj, 'selected', false);
-		this.set_classname(this.list_rows[id].obj, 'unfocused', true);
-        }
-      }
-    };
-	
-  this.click_on_list = function(e)
-    {
-    if (!e)
-      e = window.event;
-
-    for (var n=0; n<this.selection.length; n++)
+  this.init_message_row = function(row)
+  {
+    var uid = row.uid;
+    if (uid && this.env.messages[uid])
       {
-      id = this.selection[n];
-      if (this.list_rows[id].obj)
-        {
-        this.set_classname(this.list_rows[id].obj, 'selected', true);
-		this.set_classname(this.list_rows[id].obj, 'unfocused', false);
-        }
+      row.deleted = this.env.messages[uid].deleted ? true : false;
+      row.unread = this.env.messages[uid].unread ? true : false;
+      row.replied = this.env.messages[uid].replied ? true : false;
       }
 
-    var mbox_li;
-    if (mbox_li = this.get_mailbox_li()) 
-      this.set_classname(mbox_li, 'unfocused', true);
-    
-    this.in_message_list = true;
-    e.cancelBubble = true;
-    };
-
-  this.key_pressed = function(e, msg_list_frame) {
-    if (this.in_message_list != true) 
-      return true;
-    var keyCode = document.layers ? e.which : document.all ? event.keyCode : document.getElementById ? e.keyCode : 0;
-    var mod_key = this.get_modifier(e);
-    switch (keyCode) {
-      case 13:
-        this.command('show','',this);
-        break;
-      case 40:
-      case 38: 
-        return this.use_arrow_key(keyCode, mod_key, msg_list_frame);
-        break;
-      case 46:
-        return this.use_delete_key(keyCode, mod_key, msg_list_frame);
-        break;
-      default:
-        return true;
-    }
-    return true;
-  }
-
-  this.use_arrow_key = function(keyCode, mod_key, msg_list_frame) {
-    var scroll_to = 0;
-    if (keyCode == 40) { // down arrow key pressed
-      new_row = this.get_next_row();
-      if (!new_row) return false;
-      scroll_to = (Number(new_row.offsetTop) + Number(new_row.offsetHeight)) - Number(msg_list_frame.offsetHeight);
-    } else if (keyCode == 38) { // up arrow key pressed
-      new_row = this.get_prev_row();
-      if (!new_row) return false;
-      scroll_to = new_row.offsetTop;
-    } else {return true;}
-	
-    this.select_row(new_row.uid,mod_key,true);
-
-    if (((Number(new_row.offsetTop)) < (Number(msg_list_frame.scrollTop))) || 
-       ((Number(new_row.offsetTop) + Number(new_row.offsetHeight)) > (Number(msg_list_frame.scrollTop) + Number(msg_list_frame.offsetHeight)))) {
-      msg_list_frame.scrollTop = scroll_to;
-    }
-    return false;
-  };
-  
-  this.use_delete_key = function(keyCode, mod_key, msg_list_frame){
-    this.command('delete','',this);
-    return false;
-  }
-
-  // get all message rows from HTML table and init each row
-  this.init_messagelist = function(msg_list)
-    {
-    if (msg_list && msg_list.tBodies[0])
+    // set eventhandler to message icon
+    if ((row.icon = row.obj.cells[0].childNodes[0]) && row.icon.nodeName=='IMG')
       {
-		  
-      this.message_rows = new Array();
-
-      var row;
-      for(var r=0; r<msg_list.tBodies[0].childNodes.length; r++)
-        {
-        row = msg_list.tBodies[0].childNodes[r];
-        while (row && (row.nodeType != 1 || row.style.display == 'none')) {
-          row = row.nextSibling;
-          r++;
-        }
-        //row = msg_list.tBodies[0].rows[r];
-        if (row) 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]+)/))
-      {
-      uid = RegExp.$1;
-      row.uid = uid;
-              
-      this.message_rows[uid] = {id:row.id, obj:row,
-                                classname:row.className,
-                                deleted:this.env.messages[uid] ? this.env.messages[uid].deleted : null,
-                                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); };
-
-      if (document.all)
-        row.onselectstart = function() { return false; };
-
-      // 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('toggle_status', this); };
-                
-        // get message icon and save original icon src
-        this.message_rows[uid].icon = msg_icon;
-        }
+      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
@@ -434,7 +373,7 @@ function rcube_webmail()
     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);
@@ -452,10 +391,10 @@ function rcube_webmail()
     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();
+    this.compose_field_hash(true);
  
     // start the auto-save timer
     this.auto_save_start();
@@ -463,118 +402,24 @@ function rcube_webmail()
 
   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;
+    var handler = function(e){ return ref.ksearch_keypress(e,this); };
+    var handler2 = function(e){ return ref.ksearch_blur(e,this); };
     
-    if (this.env.cid)
-      this.highlight_row(this.env.cid);
-    };
-
-
-  // get all contact rows from HTML table and init each row
-  this.init_ldapsearchlist = function(ldap_contacts_list)
+    if (obj.addEventListener)
     {
-    if (ldap_contacts_list && ldap_contacts_list.tBodies[0])
-      {
-      this.ldap_contact_rows = new Array();
-
-      var row;
-      for(var r=0; r<ldap_contacts_list.tBodies[0].childNodes.length; r++)
-        {
-        row = ldap_contacts_list.tBodies[0].childNodes[r];
-        this.init_table_row(row, 'ldap_contact_rows');
-        }
-      }
-
-    // alias to common rows array
-    this.list_rows = this.ldap_contact_rows;
-    };
-
-
-  // make references in internal array and set event handlers
-  this.init_table_row = function(row, array_name)
+      obj.addEventListener(bw.safari ? 'keydown' : 'keypress', handler, false);
+      obj.addEventListener('blur', handler2, false);
+    }
+    else
     {
-    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};
+      obj.onkeydown = handler;
+      obj.onblur = handler2;
+    }
 
-      // 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); };
-      }
+    obj.setAttribute('autocomplete', 'off');       
     };
 
 
-  // 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.highlight_row(this.env.iid);    
-    };
-    
-
 
   /*********************************************************/
   /*********       client command interface        *********/
@@ -618,7 +463,7 @@ function rcube_webmail()
         break;
 
       case 'logout':
-        location.href = this.env.comm_path+'&_action=logout';
+        this.goto_url('logout');
         break;      
 
       // commands to switch task
@@ -636,15 +481,16 @@ function rcube_webmail()
           if (this.env.search_request<0 || (this.env.search_request && props != this.env.mailbox))
             this.reset_qsearch();
 
-          // Reset message list header, unless returning from compose/read/etc
-          // don't know what this is good for (thomasb, 2006/07/25)
-          //if (this.env.mailbox != props && this.message_rows)
-          //  this.clear_message_list_header();
-
           this.list_mailbox(props);
           }
         else if (this.task=='addressbook')
-          this.list_contacts();
+          {
+          if (this.env.search_request<0 || (this.env.search_request && props != this.env.source))
+            this.reset_qsearch();
+
+          this.list_contacts(props);
+          this.enable_command('add', (this.env.address_sources && !this.env.address_sources[props].readonly));
+          }
         break;
 
 
@@ -685,10 +531,18 @@ function rcube_webmail()
         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);
@@ -708,11 +562,8 @@ function rcube_webmail()
           var uid = this.get_single_uid();
           if (uid && (!this.env.uid || uid != this.env.uid))
             {
-            if (this.env.mailbox==this.env.drafts_mailbox)
-              {
-              this.set_busy(true);
-              location.href = this.env.comm_path+'&_action=compose&_draft_uid='+uid+'&_mbox='+escape(this.env.mailbox);
-              }
+            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);
             }
@@ -727,18 +578,10 @@ function rcube_webmail()
 
       case 'add':
         if (this.task=='addressbook')
-          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');
-            }
+          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;
@@ -803,7 +646,10 @@ function rcube_webmail()
       // mail task commands
       case 'move':
       case 'moveto':
-        this.move_messages(props);
+        if (this.task == 'mail')
+          this.move_messages(props);
+        else if (this.task == 'addressbook' && this.drag_active)
+          this.copy_contact(null, props);
         break;
         
       case 'toggle_status':
@@ -816,11 +662,11 @@ function rcube_webmail()
         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].deleted) {
-          	flag = 'undelete';
-          } else 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';
           }
           
@@ -829,44 +675,54 @@ function rcube_webmail()
         
       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');
+          if (props.mimetype == 'text/html')
+            qstring += '&_safe=1';
+          this.attachment_win = window.open(this.env.comm_path+'&_action=get&'+qstring+'&_frame=1', 'rcubemailattachment');
           if (this.attachment_win)
             {
-            setTimeout(this.ref+'.attachment_win.focus()', 10);
+            setTimeout(function(){ ref.attachment_win.focus(); }, 10);
             break;
             }
           }
 
-        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':
@@ -880,58 +736,51 @@ function rcube_webmail()
           {
           var uid;
           if (uid = this.get_single_uid())
-            url += '&_draft_uid='+uid+'&_mbox='+escape(this.env.mailbox);
-          } 
+            url += '&_draft_uid='+uid+'&_mbox='+urlencode(this.env.mailbox);
+          }
         // modify url if we're in addressbook
         else if (this.task=='addressbook')
           {
-          url = this.get_task_url('mail', url);            
-          var a_cids = new Array();
+          // switch to mail compose step directly
+          if (props && props.indexOf('@') > 0)
+          {
+            url = this.get_task_url('mail', url);
+            this.redirect(url + '&_to='+urlencode(props));
+            break;
+          }
           
           // use contact_id passed as command parameter
+          var a_cids = new Array();
           if (props)
             a_cids[a_cids.length] = props;
-            
           // get selected contacts
-          else
+          else if (this.contact_list)
             {
-            if (!window.frames[this.env.contentframe].rcmail.selection.length)
-              {
-              for (var n=0; n<this.selection.length; n++)
-                a_cids[a_cids.length] = this.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;
-              }
+            var selection = this.contact_list.get_selection();
+            for (var n=0; n<selection.length; n++)
+              a_cids[a_cids.length] = selection[n];
             }
-          if (a_cids.length)
-            url += '&_to='+a_cids.join(',');
-          else
-            break;
             
+          if (a_cids.length)
+            this.http_request('mailto', '_cid='+urlencode(a_cids.join(','))+'&_source='+urlencode(this.env.source), true);
+
+          break;
           }
         else if (props)
-           url += '&_to='+encodeURIComponent(props);
+           url += '&_to='+urlencode(props);
 
         // don't know if this is necessary...
         url = url.replace(/&_framed=1/, "");
 
-        this.set_busy(true);
-
-        // need parent in case we are coming from the contact frame
-        if (this.env.framed)
-          parent.location.href = url;
-        else
-          location.href = url;
+        this.redirect(url);
         break;
         
       case 'spellcheck':
-        if (this.env.spellcheck && this.env.spellcheck.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':
@@ -942,7 +791,8 @@ function rcube_webmail()
           break;
 
         // if saving Drafts is disabled in main.inc.php
-        if (!this.env.drafts_mailbox)
+        // 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');
@@ -990,38 +840,32 @@ function rcube_webmail()
       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' : ''));
+          ref.printwin = window.open(this.env.comm_path+'&_action=print&_uid='+uid+'&_mbox='+urlencode(this.env.mailbox)+(this.env.safemode ? '&_safe=1' : ''));
           if (this.printwin)
-            setTimeout(this.ref+'.printwin.focus()', 20);
+            setTimeout(function(){ ref.printwin.focus(); }, 20);
           }
         break;
 
       case 'viewsource':
         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));
+          {
+          ref.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);
+            setTimeout(function(){ ref.sourcewin.focus(); }, 20);
           }
         break;
 
@@ -1029,46 +873,42 @@ function rcube_webmail()
         this.add_contact(props);
         break;
       
-      // mail quicksearch
+      // quicksearch
       case 'search':
         if (!props && this.gui_objects.qsearchbox)
           props = this.gui_objects.qsearchbox.value;
         if (props)
-          this.qsearch(escape(props), this.env.mailbox);
-        break;
+        {
+          this.qsearch(props);
+          break;
+        }
 
       // reset quicksearch        
       case 'reset-search':
         var s = this.env.search_request;
         this.reset_qsearch();
         
-        if (s)
+        if (s && this.env.mailbox)
           this.list_mailbox(this.env.mailbox);
+        else if (s && this.task == 'addressbook')
+          this.list_contacts(this.env.source);
         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':
@@ -1128,7 +968,7 @@ function rcube_webmail()
 
       this.display_message(msg, 'loading', true);
       }
-    else if (!a && this.busy)
+    else if (!a)
       this.hide_message();
 
     this.busy = a;
@@ -1143,7 +983,7 @@ function rcube_webmail()
 
     // set timer for requests
     if (a && this.env.request_timeout)
-      this.request_timer = setTimeout(this.ref+'.request_timed_out()', this.env.request_timeout * 1000);
+      this.request_timer = setTimeout(function(){ ref.request_timed_out(); }, this.env.request_timeout * 1000);
     };
 
 
@@ -1167,8 +1007,7 @@ function rcube_webmail()
     if (task=='mail')
       url += '&_mbox=INBOX';
 
-    this.set_busy(true);
-    location.href = url;
+    this.redirect(url);
     };
 
 
@@ -1194,346 +1033,182 @@ function rcube_webmail()
   /*********************************************************/
 
 
-  // onmouseup handler for mailboxlist item
-  this.mbox_mouse_up = function(mbox)
+  this.doc_mouse_up = function(e)
+    {
+    if (this.message_list)
+      this.message_list.blur();
+    else if (this.contact_list)
+      this.contact_list.blur();
+    };
+
+  this.focus_folder = function(id)
+    {
+    var li;
+    if (this.drag_active && this.check_droptarget(id) && (li = this.get_folder_li(id)))
+      this.set_classname(li, 'droptarget', true);
+    }
+
+  this.unfocus_folder = function(id)
+    {
+    var li;
+    if (this.drag_active && (li = this.get_folder_li(id)))
+      this.set_classname(li, 'droptarget', false);
+    }
+
+  // onmouseup handler for folder list item
+  this.folder_mouse_up = function(id)
     {
     if (this.drag_active)
       {
-      this.unfocus_mailbox(mbox);
-      this.command('moveto', mbox);
+      this.unfocus_folder(id);
+      this.command('moveto', id);
       }
-    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();
+
+    var mbox_li;
+    if (mbox_li = this.get_folder_li())
+      this.set_classname(mbox_li, 'unfocused', true);
+
+    rcube_event.cancel(e);
+    };
 
-    // don't do anything (another action processed before)
-    if (this.dont_select)
-      return false;
 
-    // selects currently unselected row
-    if (!this.in_selection_before && !this.list_rows[id].clicked)
+  this.msglist_select = function(list)
     {
-	  var mod_key = this.get_modifier(e);
-	  this.select_row(id,mod_key,false);
-    }
-    
-    if (this.selection.length)
+    if (this.preview_timer)
+      clearTimeout(this.preview_timer);
+
+    var selected = list.selection.length==1;
+    if (this.env.mailbox == this.env.drafts_mailbox)
+      {
+      this.enable_command('show', selected);
+      this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
+      }
+    else
       {
-      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); };
+      this.enable_command('show', 'reply', 'reply-all', 'forward', 'print', selected);
+      this.enable_command('delete', 'moveto', list.selection.length>0 ? true : false);
       }
 
-    return false;
+    // start timer for message preview (wait for double click)
+    if (selected && this.env.contentframe)
+      this.preview_timer = setTimeout(function(){ ref.msglist_get_preview(); }, this.dblclick_time + 10);
+    else if (this.env.contentframe)
+      this.show_contentframe(false);
     };
 
 
-  // onmouseup-handler of message list row
-  this.click_row = function(e, id)
+  this.msglist_dbl_click = function(list)
     {
-    var mod_key = this.get_modifier(e);
+      if (this.preview_timer)
+        clearTimeout(this.preview_timer);
 
-    // don't do anything (another action processed before)
-    if (this.dont_select)
-      {
-      this.dont_select = false;
-      return false;
-      }
-    
-    // unselects currently selected row    
-    if (!this.drag_active && this.in_selection_before==id && !this.list_rows[id].clicked)
-      this.select_row(id,mod_key,false);
+    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.drag_start = false;
-    this.in_selection_before = false;
-        
-    // row was double clicked
-    if (this.task=='mail' && this.list_rows && this.list_rows[id].clicked && this.in_selection(id))
-      {
-      if (this.env.mailbox==this.env.drafts_mailbox)
-        {
-        this.set_busy(true);
-        location.href = this.env.comm_path+'&_action=compose&_draft_uid='+id+'&_mbox='+escape(this.env.mailbox);
-        }
-      else
-        {
-        this.show_message(id);
-        }
-      return false;
-      }
-    else if (this.task=='addressbook')
-      {
-      if (this.contact_rows && this.selection.length==1)
-        {
-        this.load_contact(this.selection[0], 'show', true);
-        // change the text for the add contact button
-        var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A');
-        for (i = 0; i < links.length; i++)
-          {
-          var onclickstring = new String(links[i].onclick);
-          if (onclickstring.search('\"add\"') != -1)
-            links[i].title = this.env.newcontact;
-          }
-        }
-      else if (this.contact_rows && this.contact_rows[id].clicked)
-        {
-        this.load_contact(id, 'show');
-        return false;
-        }
-      else if (this.ldap_contact_rows && !this.ldap_contact_rows[id].clicked)
-        {
-        // clear selection
-        parent.rcmail.clear_selection();
 
-        // disable delete
-        parent.rcmail.set_button('delete', 'pas');
-
-        // change the text for the add contact button
-        var links = parent.document.getElementById('abooktoolbar').getElementsByTagName('A');
-        for (i = 0; i < links.length; i++)
-          {
-          var onclickstring = new String(links[i].onclick);
-          if (onclickstring.search('\"add\"') != -1)
-            links[i].title = this.env.addcontact;
-          }
-        }
-      // handle double click event
-      else if (this.ldap_contact_rows && this.selection.length==1 && this.ldap_contact_rows[id].clicked)
-        this.command('compose', this.ldap_contact_rows[id].obj.cells[1].innerHTML);
-      else if (this.env.contentframe)
-        {
-        var elm = document.getElementById(this.env.contentframe);
-        elm.style.visibility = 'hidden';
-        }
-      }
-    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;
-    };
-
-
-
-  /*********************************************************/
-  /*********     (message) list functionality      *********/
-  /*********************************************************/
-
-  // get next and previous rows that are not hidden
-  this.get_next_row = function(){
-  	if (!this.list_rows) return false;
-    var last_selected_row = this.list_rows[this.last_selected];
-    var new_row = last_selected_row.obj.nextSibling;
-    while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
-      new_row = new_row.nextSibling;
-    }
-    return new_row;
-  }
-  
-  this.get_prev_row = function(){
-    if (!this.list_rows) return false;
-    var last_selected_row = this.list_rows[this.last_selected];
-    var new_row = last_selected_row.obj.previousSibling;
-    while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none')) {
-      new_row = new_row.previousSibling;
-    }
-    return new_row;
-  }
-  
-  // highlight/unhighlight a row
-  this.highlight_row = function(id, multiple)
+  this.msglist_keypress = function(list)
     {
-    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);
-        this.set_classname(this.list_rows[id].obj, 'unfocused', false);
-        }
-      selected = (this.selection.length==1);
-      }
-
-    // enable/disable commands for message
-    if (this.task=='mail')
-      {
-      if (this.env.mailbox==this.env.drafts_mailbox)
-	{
-	this.enable_command('show', selected);
-	this.enable_command('delete', 'moveto', this.selection.length>0 ? true : false);
-        }
-      else
-        {
-        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);
-      }
+    if (list.key_pressed == list.ENTER_KEY)
+      this.command('show');
+    else if (list.key_pressed == list.DELETE_KEY)
+      this.command('delete');
     };
 
 
-// selects or unselects the proper row depending on the modifier key pressed
-  this.select_row = function(id,mod_key,with_mouse)  { 
-  	if (!mod_key) {
-      this.shift_start = id;
-  	  this.highlight_row(id, false);
-    } else {
-      switch (mod_key) {
-        case SHIFT_KEY: { 
-          this.shift_select(id,false); 
-          break; }
-        case CONTROL_KEY: { 
-          this.shift_start = id;
-          if (!with_mouse)
-            this.highlight_row(id, true); 
-          break; 
-          }
-        case CONTROL_SHIFT_KEY: { 
-          this.shift_select(id,true);
-          break;
-          }
-        default: {
-          this.highlight_row(id, false); 
-          break;
-          }
-      }
-	}
-	if (this.last_selected != 0 && this.list_rows[this.last_selected])
-	  this.set_classname(this.list_rows[this.last_selected].obj, 'focused', false);
-
-    this.last_selected = id;
-    this.set_classname(this.list_rows[id].obj, 'focused', true);        
-  };
-
-  this.shift_select = function(id, control) {
-    var from_rowIndex = this.list_rows[this.shift_start].obj.rowIndex;
-    var to_rowIndex = this.list_rows[id].obj.rowIndex;
-        
-    var i = ((from_rowIndex < to_rowIndex)? from_rowIndex : to_rowIndex);
-    var j = ((from_rowIndex > to_rowIndex)? from_rowIndex : to_rowIndex);
-    
-	// iterate through the entire message list
-    for (var n in this.list_rows) {
-      if ((this.list_rows[n].obj.rowIndex >= i) && (this.list_rows[n].obj.rowIndex <= j)) {
-        if (!this.in_selection(n))
-          this.highlight_row(n, true);
-      } else {
-        if  (this.in_selection(n) && !control)
-          this.highlight_row(n, true);
-      }
-    }
+  this.msglist_get_preview = function()
+  {
+    var uid = this.get_single_uid();
+    if (uid && this.env.contentframe && !this.drag_active)
+      this.show_message(uid, false, true);
+    else if (this.env.contentframe)
+      this.show_contentframe(false);
   };
   
+  
+  this.check_droptarget = function(id)
+  {
+    if (this.task == 'mail')
+      return (id != this.env.mailbox);
+    else if (this.task == 'addressbook')
+      return (id != this.env.source && this.env.address_sources[id] && !this.env.address_sources[id].readonly);
+  };
 
-  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.set_classname(this.list_rows[this.selection[n]].obj, 'unfocused', 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;    
-    };
 
+  /*********************************************************/
+  /*********     (message) list functionality      *********/
+  /*********************************************************/
 
-  // 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.last_selected = n;
-        this.highlight_row(n, true);
-        }
-      }
-
-    return 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_contentframe(true);
+      else
+        {
+        this.set_busy(true, 'loading');
+        target.location.href = this.env.comm_path+url;
+        }
       }
     };
 
 
+  this.show_contentframe = function(show)
+    {
+    var frm;
+    if (this.env.contentframe && (frm = rcube_find_object(this.env.contentframe)))
+      {
+      if (!show && window.frames[this.env.contentframe] && frames[this.env.contentframe].location.href.indexOf(this.env.blankpage)<0)
+        frames[this.env.contentframe].location.href = this.env.blankpage;
+      if (!bw.safari)
+        frm.style.display = show ? 'block' : 'none';
+      }
+      
+    if (!show && this.busy)
+      this.set_busy(false);
+    };
+
 
   // list a specific page
   this.list_page = function(page)
     {
     if (page=='next')
       page = this.env.current_page+1;
+    if (page=='last')
+      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)
       {
@@ -1542,7 +1217,7 @@ function rcube_webmail()
       if (this.task=='mail')
         this.list_mailbox(this.env.mailbox, page);
       else if (this.task=='addressbook')
-        this.list_contacts(page);
+        this.list_contacts(this.env.source, page);
       }
     };
 
@@ -1560,21 +1235,26 @@ function rcube_webmail()
     // add sort to url if set
     if (sort)
       add_url += '&_sort=' + sort;
+
+    // also send search request to get the right messages
+    if (this.env.search_request)
+      add_url += '&_search='+this.env.search_request;
       
     // set page=1 if changeing to another mailbox
     if (!page && mbox != this.env.mailbox)
       {
       page = 1;
-      add_url += '&_refresh=1';
       this.env.current_page = page;
-      this.clear_selection();
+      if (this.message_list)
+        this.message_list.clear_selection();
+      this.show_contentframe(false);
       }
     
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      add_url += '&_search='+this.env.search_request;
-      
-    this.select_mailbox(mbox);
+    if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
+      add_url += '&_refresh=1';
+    
+    this.select_folder(mbox, this.env.mailbox);
+    this.env.mailbox = mbox;
 
     // load message list remotely
     if (this.gui_objects.messagelist)
@@ -1593,7 +1273,7 @@ function rcube_webmail()
     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;
       }
     };
 
@@ -1602,47 +1282,15 @@ function rcube_webmail()
   this.list_mailbox_remote = function(mbox, page, add_url)
     {
     // clear message list first
-    this.clear_message_list();
+    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, true);
     };
 
 
-  this.clear_message_list = function()
-    {
-    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;
-    
-    };
-
-
-  this.clear_message_list_header = function()
-    {
-    var table;
-    if (table = this.gui_objects.messagelist)
-      {
-      if (table.colgroup)
-        table.removeChild(table.colgroup);
-      if (table.tHead)
-        table.removeChild(table.tHead);
-
-      var colgroup = document.createElement('COLGROUP');
-      var thead = document.createElement('THEAD');
-      table.insertBefore(colgroup, table.tBodies[0]);
-      table.insertBefore(thead, table.tBodies[0]);
-      }
-    };
-
-
   this.expunge_mailbox = function(mbox)
     {
     var lock = false;
@@ -1657,8 +1305,8 @@ function rcube_webmail()
        }
 
     // send request to server
-    var url = '_mbox='+escape(mbox);
-    this.http_request('expunge', url+add_url, lock);
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('expunge', url+add_url, lock);
     };
 
 
@@ -1679,55 +1327,24 @@ function rcube_webmail()
        }
 
     // send request to server
-    var url = '_mbox='+escape(mbox);
-    this.http_request('purge', url+add_url, lock);
+    var url = '_mbox='+urlencode(mbox);
+    this.http_post('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;
-    
-    var a_uids = new Array();
-
-    if (this.env.uid)
-      a_uids[a_uids.length] = this.env.uid;
-    else
+    // exit if current or no mailbox specified or if selection is empty
+    if (!mbox || !this.env.uid || mbox==this.env.mailbox)
       {
-      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';
-        }
-      next_row = this.get_next_row();
-      prev_row = this.get_prev_row();
-      new_row = (next_row) ? next_row : prev_row;
-      if (new_row) this.select_row(new_row.uid,false,false);
+      if (!this.message_list || !this.message_list.get_selection().length)
+        return;
       }
-      
+
     var lock = false;
+    var add_url = '&_target_mbox='+urlencode(mbox)+'&_from='+(this.env.action ? this.env.action : '');
 
     // show wait message
     if (this.env.action=='show')
@@ -1735,96 +1352,122 @@ function rcube_webmail()
       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 : ''), lock);
+    else
+      this.show_contentframe(false);
+
+    this._with_selected_messages('moveto', lock, add_url);
     };
 
-  this.permanently_remove_messages = function() {
-    // exit if no mailbox specified or if selection is empty
-    if (!(this.selection.length || this.env.uid))
-      return;
+  // delete selected messages from the current mailbox
+  this.delete_messages = function()
+    {
+    var selection = this.message_list ? this.message_list.get_selection() : new Array();
     
-    var a_uids = new Array();
+    // exit if no mailbox specified or if selection is empty
+    if (!this.env.uid && !selection.length)
+        return;
 
-    if (this.env.uid)
-      a_uids[a_uids.length] = this.env.uid;
-    else
+    // 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())
       {
-      var id;
-      for (var n=0; n<this.selection.length; n++)
+      // if shift was pressed delete it immediately
+      if (this.message_list && this.message_list.shiftkey)
         {
-        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 (confirm(this.get_label('deletemessagesconfirm')))
+          this.permanently_remove_messages();
         }
+      else
+        this.move_messages(this.env.trash_mailbox);
       }
-      next_row = this.get_next_row();
-      prev_row = this.get_prev_row();
-      new_row = (next_row) ? next_row : prev_row;
-      if (new_row) this.select_row(new_row.uid,false,false);
-
-    // send request to server
-    this.http_request('delete', '_uid='+a_uids.join(',')+'&_mbox='+escape(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;
-    // 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())
-      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"){
+    else if (!this.env.trash_mailbox && this.env.flag_for_deletion)
+      {
+      this.mark_message('delete');
+      if(this.env.action=="show")
         this.command('nextmessage','',this);
-      } else if (this.selection.length == 1) {
-        next_row = this.get_next_row();
-        prev_row = this.get_prev_row();
-        new_row = (next_row) ? next_row : prev_row;
-        if (new_row) this.select_row(new_row.uid,false,false);
+      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.env.flag_for_deletion) {
+    else if (!this.env.trash_mailbox) 
       this.permanently_remove_messages();
-    }
-    return;
   };
 
 
+  // delete the selected messages permanently
+  this.permanently_remove_messages = function()
+    {
+    // exit if no mailbox specified or if selection is empty
+    if (!this.env.uid && (!this.message_list || !this.message_list.get_selection().length))
+      return;
+      
+    this.show_contentframe(false);
+    this._with_selected_messages('delete', false, '&_from='+(this.env.action ? this.env.action : ''));
+    };
+
+  // Send a specifc request with UIDs of all selected messages
+  // @private
+  this._with_selected_messages = function(action, lock, add_url)
+    {
+    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();
+      }
+      
+    // also send search request to get the right messages 
+    if (this.env.search_request) 
+      add_url += '&_search='+this.env.search_request;
+
+    // send request to server
+    this.http_post(action, '_uid='+a_uids.join(',')+'&_mbox='+urlencode(this.env.mailbox)+add_url, lock);
+    };
+
+
   // set a specific flag to one or more messages
   this.mark_message = function(flag, uid)
     {
     var a_uids = new Array();
+    var selection = this.message_list ? this.message_list.get_selection() : new Array();
     
     if (uid)
       a_uids[0] = uid;
     else if (this.env.uid)
       a_uids[0] = this.env.uid;
-    else
+    else if (this.message_list)
       {
-      var id;
-      for (var n=0; n<this.selection.length; n++)
+      for (var id, n=0; n<selection.length; n++)
         {
-        id = this.selection[n];
-        a_uids[a_uids.length] = id;
+        id = selection[n];
+        if ((flag=='read' && this.message_list.rows[id].unread) || (flag=='unread' && !this.message_list.rows[id].unread)
+            || (flag=='delete' && !this.message_list.rows[id].deleted) || (flag=='undelete' && this.message_list.rows[id].deleted))
+          a_uids[a_uids.length] = id;
         }
       }
-      switch (flag) {
+    
+    // nothing to do
+    if (!a_uids.length)
+      return;
+      
+    switch (flag)
+      {
         case 'read':
         case 'unread':
-          this.toggle_read_status(flag,a_uids);
+          this.toggle_read_status(flag, a_uids);
           break;
         case 'delete':
         case 'undelete':
@@ -1834,66 +1477,73 @@ function rcube_webmail()
     };
 
   // set class to read/unread
-  this.toggle_read_status = function(flag, a_uids) {
+  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;
         }
       }
-      this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag='+flag);
-  }
+      
+    this.http_post('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_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;
 
-    if (a_uids.length==1){
-      if(this.message_rows[a_uids[0]].classname.indexOf('deleted') < 0 ){
-      	this.flag_as_deleted(a_uids)
-      } else {
-      	this.flag_as_undeleted(a_uids)
-      }
+    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++) {
+    for (var i=0; i<a_uids.length; i++)
+    {
       uid = a_uids[i];
-      if (this.message_rows[uid]) {
-        if (this.message_rows[uid].classname.indexOf('deleted')<0) {
+      if (rows[uid]) {
+        if (rows[uid].classname.indexOf('deleted')<0)
+        {
           all_deleted = false;
           break;
         }
@@ -1906,72 +1556,90 @@ function rcube_webmail()
       this.flag_as_deleted(a_uids);
     
     return true;
-  }
+  };
+
 
-  this.flag_as_undeleted = function(a_uids){
+  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++) {
+    for (var i=0; i<a_uids.length; i++)
+    {
       uid = a_uids[i];
-      if (this.message_rows[uid]) {
-        this.message_rows[uid].deleted = false;
+      if (rows[uid]) {
+        rows[uid].deleted = false;
         
-        if (this.message_rows[uid].classname.indexOf('deleted') > 0) {
-          this.message_rows[uid].classname = this.message_rows[uid].classname.replace(/\s*deleted/, '');
-          this.set_classname(this.message_rows[uid].obj, '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 (this.message_rows[uid].unread && this.env.unreadicon)
+        if (rows[uid].unread && this.env.unreadicon)
           icn_src = this.env.unreadicon;
-        else if (this.message_rows[uid].replied && this.env.repliedicon)
+        else 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;
       }
     }
-    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
+
+    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=undelete');
     return true;
-  }
+  };
+
   
-  this.flag_as_deleted = function(a_uids) {
+  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;
 
-    for (var i=0; i<a_uids.length; i++) {
+    var rows = this.message_list.rows;
+    for (var i=0; i<a_uids.length; i++)
+    {
       uid = a_uids[i];
-      if (this.message_rows[uid]) {
-        this.message_rows[uid].deleted = true;
+      if (rows[uid]) {
+        rows[uid].deleted = true;
         
-        if (this.message_rows[uid].classname.indexOf('deleted')<0) {
-          this.message_rows[uid].classname += ' deleted';
-          this.set_classname(this.message_rows[uid].obj, 'deleted', true);
+        if (rows[uid].classname.indexOf('deleted')<0) {
+          rows[uid].classname += ' deleted';
+          this.set_classname(rows[uid].obj, 'deleted', true);
         }
-        if (this.message_rows[uid].icon && this.env.deletedicon)
-          this.message_rows[uid].icon.src = this.env.deletedicon;
+        if (rows[uid].icon && this.env.deletedicon)
+          rows[uid].icon.src = this.env.deletedicon;
       }
     }
-    this.http_request('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
+
+    this.http_post('mark', '_uid='+a_uids.join(',')+'&_flag=delete');
     return true;  
-  }
+  };
 
 
-  this.get_mailbox_li = function(mbox)
+  /*********************************************************/
+  /*********           login form methods          *********/
+  /*********************************************************/
+
+  // handler for keyboard events on the _user field
+  this.login_user_keypress = function(e)
+  {
+    var key = rcube_event.get_keycode(e);
+    var elm;
+
+    // enter
+    if ((key==13) && (elm = rcube_find_object('_pass')))
     {
-    if (this.gui_objects.mailboxlist)
-      {
-      mbox = String((mbox ? mbox : this.env.mailbox)).toLowerCase().replace(this.mbox_expression, '');
-      return document.getElementById('rcmbx'+mbox);
-      }
-    
-    return null;
-    };
-    
+      elm.focus();
+      return false;
+    }
+  };
+
 
   /*********************************************************/
   /*********        message compose methods        *********/
@@ -2012,7 +1680,7 @@ function rcube_webmail()
       }
 
     // check for empty body
-    if (input_message.value=='')
+    if ((input_message.value=='')&&(tinyMCE.getContent()==''))
       {
       if (!confirm(this.get_label('nobodywarning')))
         {
@@ -2025,14 +1693,28 @@ function rcube_webmail()
     };
 
 
+  this.set_spellcheck_state = function(s)
+    {
+    this.spellcheck_ready = (s=='check_spelling' || s=='ready');
+    this.enable_command('spellcheck', this.spellcheck_ready);
+    };
+
+
+  this.set_draft_id = function(id)
+    {
+    var f;
+    if (f = rcube_find_object('_draft_saveid'))
+      f.value = id;
+    };
+
   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.save_timer = self.setTimeout(function(){ ref.command("savedraft"); }, this.env.draft_autosave * 1000);
     };
 
 
-  this.compose_field_hash = function()
+  this.compose_field_hash = function(save)
     {
     // check input fields
     var input_to = rcube_find_object('_to');
@@ -2052,7 +1734,10 @@ function rcube_webmail()
       str += input_subject.value+':';
     if (input_message && input_message.value)
       str += input_message.value;
-
+    
+    if (save)
+      this.cmp_hash = str;
+    
     return str;
     };
     
@@ -2065,35 +1750,71 @@ function rcube_webmail()
     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
-
-    // remove the 'old' signature
-    if (this.env.identity && this.env.signatures && this.env.signatures[this.env.identity])
+  
+    if (!is_html)
       {
-      sig = this.env.signatures[this.env.identity];
-      if (sig.indexOf('--')!=0)
-        sig = '--\n'+sig;
+      // 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);
-      }
+        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])
+      // 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
       {
-      sig = this.env.signatures[id];
-      if (sig.indexOf('--')!=0)
-        sig = '--\n'+sig;
-      message += '\n'+sig;
+      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;
     };
@@ -2185,7 +1906,7 @@ function rcube_webmail()
     {
     if (!this.gui_objects.attachmentlist)
       return false;
-
+      
     var li = document.createElement('LI');
     li.id = name;
     li.innerHTML = content;
@@ -2207,7 +1928,7 @@ function rcube_webmail()
   this.remove_attachment = function(name)
     {
     if (name)
-      this.http_request('remove-attachment', '_file='+escape(name));
+      this.http_post('remove-attachment', '_file='+urlencode(name));
 
     return true;
     };
@@ -2216,19 +1937,27 @@ function rcube_webmail()
   this.add_contact = function(value)
     {
     if (value)
-      this.http_request('addcontact', '_address='+value);
+      this.http_post('addcontact', '_address='+value);
     
     return true;
     };
 
-  // send remote request to search mail
-  this.qsearch = function(value, mbox)
+  // send remote request to search mail or contacts
+  this.qsearch = function(value)
     {
-    if (value && mbox)
+    if (value != '')
       {
-      this.clear_message_list();
+      if (this.message_list)
+        this.message_list.clear();
+      else if (this.contact_list) {
+        this.contact_list.clear(true);
+        this.show_contentframe(false);
+      }
+
+      // reset vars
+      this.env.current_page = 1;
       this.set_busy(true, 'searching');
-      this.http_request('search', '_search='+value+'&_mbox='+mbox, true);
+      this.http_request('search', '_q='+urlencode(value)+(this.env.mailbox ? '&_mbox='+this.env.mailbox : '')+(this.env.source ? '&_source='+urlencode(this.env.source) : ''), true);
       }
     return true;
     };
@@ -2265,11 +1994,9 @@ function rcube_webmail()
     if (this.ksearch_timer)
       clearTimeout(this.ksearch_timer);
 
-    if (!e)
-      e = window.event;
-      
     var highlight;
-    var key = e.keyCode ? e.keyCode : e.which;
+    var key = rcube_event.get_keycode(e);
+    var mod = rcube_event.get_modifier(e);
 
     switch (key)
       {
@@ -2288,7 +2015,6 @@ function rcube_webmail()
         if (highlight && (next = dir ? highlight.previousSibling : highlight.nextSibling))
           {
           highlight.removeAttribute('id');
-          //highlight.removeAttribute('class');
           this.set_classname(highlight, 'selected', false);
           }
 
@@ -2299,42 +2025,21 @@ function rcube_webmail()
           this.ksearch_selected = next._rcm_id;
           }
 
-        if (e.preventDefault)
-          e.preventDefault();
-        return false;
+        return rcube_event.cancel(e);
 
       case 9:  // tab
-        if(e.shiftKey)
+        if(mod == SHIFT_KEY)
           break;
 
       case 13:  // enter     
         if (this.ksearch_selected===null || !this.ksearch_input || !this.ksearch_value)
           break;
 
-        // get cursor pos
-        var inp_value = this.ksearch_input.value.toLowerCase();
-        var cpos = this.get_caret_pos(this.ksearch_input);
-        var p = inp_value.lastIndexOf(this.ksearch_value, cpos);
-        
-        // replace search string with full address
-        var pre = this.ksearch_input.value.substring(0, p);
-        var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
-        var insert = this.env.contacts[this.ksearch_selected]+', ';
-        this.ksearch_input.value = pre + insert + end;
-        
-        //this.ksearch_input.value = this.ksearch_input.value.substring(0, p)+insert;
-        
-        // set caret to insert pos
-        cpos = p+insert.length;
-        if (this.ksearch_input.setSelectionRange)
-          this.ksearch_input.setSelectionRange(cpos, cpos);
-        
-        // hide ksearch pane
+        // insert selected address and hide ksearch pane
+        this.insert_recipient(this.ksearch_selected);
         this.ksearch_hide();
-      
-        if (e.preventDefault)
-          e.preventDefault();
-        return false;
+
+        return rcube_event.cancel(e);
 
       case 27:  // escape
         this.ksearch_hide();
@@ -2343,13 +2048,37 @@ function rcube_webmail()
       }
 
     // start timer
-    this.ksearch_timer = setTimeout(this.ref+'.ksearch_get_results()', 200);      
+    this.ksearch_timer = setTimeout(function(){ ref.ksearch_get_results(); }, 200);
     this.ksearch_input = obj;
     
     return true;
     };
 
 
+  this.insert_recipient = function(id)
+  {
+    if (!this.env.contacts[id] || !this.ksearch_input)
+      return;
+    
+    // get cursor pos
+    var inp_value = this.ksearch_input.value.toLowerCase();
+    var cpos = this.get_caret_pos(this.ksearch_input);
+    var p = inp_value.lastIndexOf(this.ksearch_value, cpos);
+    
+    // replace search string with full address
+    var pre = this.ksearch_input.value.substring(0, p);
+    var end = this.ksearch_input.value.substring(p+this.ksearch_value.length, this.ksearch_input.value.length);
+    var insert  = this.env.contacts[id]+', ';
+    this.ksearch_input.value = pre + insert + end;
+    
+    // set caret to insert pos
+    cpos = p+insert.length;
+    if (this.ksearch_input.setSelectionRange)
+      this.ksearch_input.setSelectionRange(cpos, cpos);
+    
+  };
+
+
   // address search processor
   this.ksearch_get_results = function()
     {
@@ -2415,6 +2144,8 @@ function rcube_webmail()
         {
         li = document.createElement('LI');
         li.innerHTML = a_results[i].replace(/</, '&lt;').replace(/>/, '&gt;');
+        li.onmousedown = function(e){ ref.insert_recipient(this._rcm_id); ref.ksearch_pane.show(0); return rcube_event.cancel(e); };
+        li.style.cursor = 'pointer';
         li._rcm_id = a_result_ids[i];
         ul.appendChild(li);
         }
@@ -2440,9 +2171,6 @@ function rcube_webmail()
         this.ksearch_selected = a_result_ids[0];
         }
 
-      // resize the containing layer to fit the list
-      //this.ksearch_pane.resize(ul.offsetWidth, ul.offsetHeight);
-    
       // move the results pane right under the input box and make it visible
       var pos = rcube_get_object_pos(this.ksearch_input);
       this.ksearch_pane.move(pos.x, pos.y+this.ksearch_input.offsetHeight);
@@ -2481,18 +2209,56 @@ function rcube_webmail()
   /*********************************************************/
 
 
-  this.list_contacts = function(page)
+  this.contactlist_keypress = function(list)
+    {
+      if (list.key_pressed == list.DELETE_KEY)
+        this.command('delete');
+    };
+
+
+  this.contactlist_select = function(list)
+    {
+      if (this.preview_timer)
+        clearTimeout(this.preview_timer);
+
+      var id, frame, ref = this;
+      if (id = list.get_single_selection())
+        this.preview_timer = setTimeout(function(){ ref.load_contact(id, 'show'); }, this.dblclick_time + 10);
+      else if (this.env.contentframe)
+        this.show_contentframe(false);
+
+      this.enable_command('edit', id?true:false);
+      this.enable_command('compose', list.selection.length > 0);
+      this.enable_command('delete', list.selection.length && this.env.address_sources && !this.env.address_sources[this.env.source].readonly);
+
+      return false;
+    };
+
+
+  this.list_contacts = function(src, page)
     {
     var add_url = '';
     var target = window;
     
-    if (page && this.current_page==page)
+    if (!src)
+      src = this.env.source;
+    
+    if (page && this.current_page==page && src == this.env.source)
       return false;
+      
+    if (src != this.env.source)
+      {
+      page = 1;
+      this.env.current_page = page;
+      }
+
+    this.select_folder(src, this.env.source);
+    this.env.source = src;
 
     // load contacts remotely
     if (this.gui_objects.contactslist)
       {
-      this.list_contacts_remote(page);
+      this.list_contacts_remote(src, page);
       return;
       }
 
@@ -2502,25 +2268,31 @@ function rcube_webmail()
       add_url = '&_framed=1';
       }
 
+    // also send search request to get the correct listing
+    if (this.env.search_request)
+      add_url += '&_search='+this.env.search_request;
+
     this.set_busy(true, 'loading');
-    location.href = this.env.comm_path+(page ? '&_page='+page : '')+add_url;
+    target.location.href = this.env.comm_path+(src ? '&_source='+urlencode(src) : '')+(page ? '&_page='+page : '')+add_url;
     };
 
 
   // send remote request to load contacts list
-  this.list_contacts_remote = function(page)
+  this.list_contacts_remote = function(src, 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(true);
+    this.show_contentframe(false);
+    this.enable_command('delete', 'compose', false);
 
     // send request to server
-    var url = page ? '&_page='+page : '';
+    var url = (src ? '&_source='+urlencode(src) : '') + (page ? '&_page='+page : '');
+    this.env.source = src;
+    
+    // also send search request to get the right messages 
+    if (this.env.search_request) 
+      url += '&_search='+this.env.search_request;
+
     this.set_busy(true, 'loading');
     this.http_request('list', url, true);
     };
@@ -2535,28 +2307,35 @@ function rcube_webmail()
       {
       add_url = '&_framed=1';
       target = window.frames[this.env.contentframe];
-      document.getElementById(this.env.contentframe).style.visibility = 'inherit';
+      this.show_contentframe(true);
       }
     else if (framed)
       return false;
       
-    //if (this.env.framed && add_url=='')
-    
-    //  add_url = '&_framed=1';
-    
-    if (action && (cid || action=='add'))
+    if (action && (cid || action=='add') && !this.drag_active)
       {
       this.set_busy(true);
-      target.location.href = this.env.comm_path+'&_action='+action+'&_cid='+cid+add_url;
+      target.location.href = this.env.comm_path+'&_action='+action+'&_source='+urlencode(this.env.source)+'&_cid='+urlencode(cid) + add_url;
       }
     return true;
     };
 
+  // copy a contact to the specified target (group or directory)
+  this.copy_contact = function(cid, to)
+  {
+    if (!cid)
+      cid = this.contact_list.get_selection().join(',');
+
+    if (to != this.env.source && cid && this.env.address_sources[to] && !this.env.address_sources[to].readonly)
+      this.http_post('copy', '_cid='+urlencode(cid)+'&_source='+urlencode(this.env.source)+'&_to='+urlencode(to));
+  };
+
 
   this.delete_contacts = function()
     {
     // exit if no mailbox specified or if selection is empty
-    if (!(this.selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
+    var selection = this.contact_list.get_selection();
+    if (!(selection.length || this.env.cid) || !confirm(this.get_label('deletecontactconfirm')))
       return;
       
     var a_cids = new Array();
@@ -2566,26 +2345,20 @@ function rcube_webmail()
     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)
-        {
-        var elm = document.getElementById(this.env.contentframe);
-        elm.style.visibility = 'hidden';
-        }
+      if (selection.length == 1)
+        this.show_contentframe(false);
       }
 
     // send request to server
-    this.http_request('delete', '_cid='+a_cids.join(',')+'&_from='+(this.env.action ? this.env.action : ''));
+    this.http_post('delete', '_cid='+urlencode(a_cids.join(','))+'&_from='+(this.env.action ? this.env.action : ''));
     return true;
     };
 
@@ -2593,69 +2366,30 @@ function rcube_webmail()
   // 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];
-    }
-    return true;
-    };
-  
-  
-  // load ldap search form
-  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 row;
+    if (this.contact_list.rows[cid] && (row = this.contact_list.rows[cid].obj))
       {
-      var frame = window.frames[this.env.contentframe];
+      for (var c=0; c<cols_arr.length; c++)
+        if (row.cells[c])
+          row.cells[c].innerHTML = cols_arr[c];
 
-      // 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 true;
       }
+
     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)
@@ -2681,30 +2415,18 @@ function rcube_webmail()
     };
 
 
-
   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];
-
-/*
-    // 'remove' row from list (just hide it)
-    if (this.identity_rows && this.identity_rows[id].obj)
-      {
-      this.clear_selection();
-      this.identity_rows[id].obj.style.display = 'none';
-      }
-*/
+      id = this.env.iid ? this.env.iid : selection[0];
 
     // 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;
     };
 
@@ -2712,15 +2434,15 @@ function rcube_webmail()
   // tell server to create and subscribe a new mailbox
   this.create_folder = function(name)
     {
-	if (this.edit_folder)
-	  this.reset_folder_rename();
+  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), true);
+      this.http_post('create-folder', '_name='+urlencode(name), true);
     else if (form.elements['_folder_name'])
       form.elements['_folder_name'].focus();
     };
@@ -2743,7 +2465,7 @@ function rcube_webmail()
       }
 
     if (oldname && newname)
-      this.http_request('rename-folder', '_folder_oldname='+escape(oldname)+'&_folder_newname='+escape(newname));
+      this.http_post('rename-folder', '_folder_oldname='+urlencode(oldname)+'&_folder_newname='+urlencode(newname));
     };
 
 
@@ -2755,17 +2477,17 @@ function rcube_webmail()
     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 (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];
+      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); };
       
@@ -2783,8 +2505,8 @@ function rcube_webmail()
   this.reset_folder_rename = function()
     {
     var cell = this.name_input ? this.name_input.parentNode : null;
-    if (cell && this.edit_folder)
-      cell.innerHTML = this.env.subscriptionrows[this.edit_folder];
+    if (cell && this.edit_folder && this.env.subscriptionrows[this.edit_folder])
+      cell.innerHTML = this.env.subscriptionrows[this.edit_folder][1];
       
     this.edit_folder = null;
     };
@@ -2793,14 +2515,14 @@ function rcube_webmail()
   // 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;
+    var key = rcube_event.get_keycode(e);
 
     // 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='+escape(this.env.subscriptionrows[this.edit_folder])+'&_folder_newname='+escape(newname));        
+        this.http_post('rename-folder', '_folder_oldname='+urlencode(this.env.subscriptionrows[this.edit_folder][0])+'&_folder_newname='+urlencode(newname));
       }
     // escape
     else if (key==27)
@@ -2811,16 +2533,16 @@ function rcube_webmail()
   // delete a specific mailbox with all its messages
   this.delete_folder = function(folder)
     {
-	if (this.edit_folder)
-	  this.reset_folder_rename();
+  if (this.edit_folder)
+    this.reset_folder_rename();
     
     if (folder)
-      this.http_request('delete-folder', '_mboxes='+escape(folder));
+      this.http_post('delete-folder', '_mboxes='+urlencode(folder));
     };
 
 
   // add a new folder to the subscription list by cloning a folder row
-  this.add_folder_row = function(name, replace)
+  this.add_folder_row = function(name, display_name, replace)
     {
     name = name.replace('\\',"");
     if (!this.gui_objects.subscriptionlist)
@@ -2837,7 +2559,7 @@ function rcube_webmail()
     if (!id || !(refrow = document.getElementById(refid)))
       {
       // Refresh page if we don't have a table row to clone
-      location.href = this.env.comm_path+'&_action=folders';
+      this.goto_url('folders');
       }
     else
       {
@@ -2851,10 +2573,10 @@ function rcube_webmail()
       }
 
     // add to folder/row-ID map
-    this.env.subscriptionrows[row.id] = name;
+    this.env.subscriptionrows[row.id] = [name, display_name];
 
     // set folder name
-    row.cells[0].innerHTML = name;
+    row.cells[0].innerHTML = display_name;
     if (row.cells[1] && row.cells[1].firstChild.tagName=='INPUT')
       {
       row.cells[1].firstChild.value = name;
@@ -2875,17 +2597,18 @@ function rcube_webmail()
         form.elements['_folder_name'].value = ''; 
       }
 
+    this.sort_subscription_list();
     };
 
 
   // replace an existing table row with a new folder line
-  this.replace_folder_row = function(newfolder, oldfolder)
+  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, row);
+    this.add_folder_row(newfolder, display_name, row);
     this.env.subscriptionrows[id] = null;
     
     // rename folder in rename-folder dropdown
@@ -2896,7 +2619,7 @@ function rcube_webmail()
         {
         if (elm.options[i].value == oldfolder)
           {
-          elm.options[i].text = newfolder;
+          elm.options[i].text = display_name;
           elm.options[i].value = newfolder;
           break;
           }
@@ -2941,7 +2664,7 @@ function rcube_webmail()
     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_post('subscribe', '_mboxes='+urlencode(folder));
     };
 
 
@@ -2951,7 +2674,7 @@ function rcube_webmail()
     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_post('unsubscribe', '_mboxes='+urlencode(folder));
     };
     
 
@@ -2985,7 +2708,7 @@ function rcube_webmail()
           list_to[index] = new Option(a_folders[n]);
           }
           
-        this.http_request(action, '_mboxes='+escape(a_folders.join(',')));
+        this.http_post(action, '_mboxes='+urlencode(a_folders.join(',')));
         }
       }
       
@@ -2995,7 +2718,7 @@ function rcube_webmail()
   this.get_folder_row_id = function(folder)
     {
     for (var id in this.env.subscriptionrows)
-      if (this.env.subscriptionrows[id]==folder)
+      if (this.env.subscriptionrows[id] && this.env.subscriptionrows[id][0] == folder)
         break;
         
     return id;
@@ -3023,6 +2746,32 @@ function rcube_webmail()
     return new_row;
     };
 
+  // sort subscription folder list
+  this.sort_subscription_list = function()
+    {
+    var index = new Array();
+    var tbody = this.gui_objects.subscriptionlist.tBodies[0];
+    var swapped = false;
+    for (var i = 0; i<(tbody.childNodes.length-1); i++)
+      if (this.env.subscriptionrows[tbody.childNodes[i].id]!=null)
+        index.push(i);
+    for (i = 0; i<(index.length-1); i++)
+      {
+      if (this.env.subscriptionrows[tbody.childNodes[index[i]].id][0]>
+          this.env.subscriptionrows[tbody.childNodes[index[i+1]].id][0])
+        {
+        var swap = tbody.replaceChild(tbody.childNodes[index[i]], tbody.childNodes[index[i+1]]);
+        if (typeof(tbody.childNodes[index[i]]) != 'undefined')
+          tbody.insertBefore(swap, tbody.childNodes[index[i]])
+        else
+          tbody.appendChild(swap);
+        swapped = true;
+        }
+      }
+    if (swapped)
+      this.sort_subscription_list();
+    };
+
 
   /*********************************************************/
   /*********           GUI functionality           *********/
@@ -3033,7 +2782,9 @@ function rcube_webmail()
   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));
     }
 
 
@@ -3164,6 +2915,10 @@ function rcube_webmail()
   // display a system message
   this.display_message = function(msg, type, hold)
     {
+    // pass command to parent window
+    if (this.env.framed && parent.rcmail )
+      return parent.rcmail.display_message(msg, type, hold);
+
     this.set_busy(false);
     if (!this.loaded)  // save message in order to display after page loaded
       {
@@ -3189,7 +2944,7 @@ function rcube_webmail()
       this.gui_objects.message.onmousedown = function(){ this._rcube.hide_message(); return true; };
     
     if (!hold)
-      this.message_timer = setTimeout(this.ref+'.hide_message()', this.message_time);
+      this.message_timer = setTimeout(function(){ ref.hide_message(); }, this.message_time);
     };
 
 
@@ -3205,38 +2960,37 @@ function rcube_webmail()
 
 
   // mark a mailbox as selected and set environment variable
-  this.select_mailbox = function(mbox)
+  this.select_folder = function(name, old)
+  {
+    if (this.gui_objects.folderlist)
     {
-    if (this.gui_objects.mailboxlist )
-      {
-      var item, reg, text_obj;      
-      var current_li = this.get_mailbox_li();
-      var mbox_li = this.get_mailbox_li(mbox);
+      var current_li, target_li;
       
-      if (current_li)
-        {
+      if ((current_li = this.get_folder_li(old)))
+      {
         this.set_classname(current_li, 'selected', false);
         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)
+
+      if ((target_li = this.get_folder_li(name)))
       {
-      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.set_classname(target_li, 'unfocused', false);
+        this.set_classname(target_li, 'selected', true);
       }
-    
-    this.env.mailbox = mbox;
-    };
+    }
+  };
+
+  // helper method to find a folder list item
+  this.get_folder_li = function(name)
+  {
+    if (this.gui_objects.folderlist)
+    {
+      name = String(name).replace(this.identifier_expr, '');
+      return document.getElementById('rcmli'+name);
+    }
+
+    return null;
+  };
 
 
   // for reordering column array, Konqueror workaround
@@ -3271,9 +3025,9 @@ function rcube_webmail()
   // create a table row in the message list
   this.add_message_row = function(uid, cols, flags, attachment, attop)
     {
-    if (!this.gui_objects.messagelist || !this.gui_objects.messagelist.tBodies[0])
+    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;
@@ -3285,8 +3039,8 @@ function rcube_webmail()
     var row = document.createElement('TR');
     row.id = 'rcmrow'+uid;
     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.deleted && this.env.deletedicon ? this.env.deletedicon:
@@ -3312,13 +3066,8 @@ function rcube_webmail()
     col.className = 'icon';
     col.innerHTML = attachment && this.env.attachmenticon ? '<img src="'+this.env.attachmenticon+'" alt="" border="0" />' : '';
     row.appendChild(col);
-    
-    if (attop && tbody.rows.length)
-      tbody.insertBefore(row, tbody.firstChild);
-    else
-      tbody.appendChild(row);
-      
-    this.init_message_row(row);
+
+    this.message_list.insert_row(row, attop);
     };
 
 
@@ -3333,12 +3082,16 @@ function rcube_webmail()
     };
 
   // replace content of quota display
-   this.set_quota = function(text)
-     {
-     if (this.gui_objects.quotadisplay)
-       this.gui_objects.quotadisplay.innerHTML = text;
+  this.set_quota = function()
+    {
+    if (this.gui_objects.quotadisplay &&
+        this.gui_objects.quotadisplay.attributes.getNamedItem('display') &&
+        this.gui_objects.quotadisplay.attributes.getNamedItem('id'))
+      this.http_request('quotadisplay', '_display='+
+      this.gui_objects.quotadisplay.attributes.getNamedItem('display').nodeValue+
+      '&_id='+this.gui_objects.quotadisplay.attributes.getNamedItem('id').nodeValue, false);
      };
-			     
+
 
   // update the mailboxlist
   this.set_unread_count = function(mbox, count, set_title)
@@ -3350,8 +3103,8 @@ function rcube_webmail()
       set_title = true;
 
     var reg, text_obj;
-    var item = this.get_mailbox_li(mbox);
-    mbox = String(mbox).toLowerCase().replace(this.mbox_expression, '');
+    var item = this.get_folder_li(mbox);
+    mbox = String(mbox).toLowerCase().replace(this.identifier_expr, '');
 
     if (item && item.className && item.className.indexOf('mailbox '+mbox)>=0)
       {
@@ -3387,7 +3140,7 @@ function rcube_webmail()
 
 
   // 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;
@@ -3400,7 +3153,7 @@ function rcube_webmail()
     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
@@ -3412,73 +3165,21 @@ function rcube_webmail()
       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);
+      }
+    else
+      {
+        tinyMCE.execCommand('mceRemoveControl', 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;
     };
 
 
@@ -3487,6 +3188,24 @@ function rcube_webmail()
   /*********        remote request methods        *********/
   /********************************************************/
 
+  this.redirect = function(url)
+    {
+    this.set_busy(true);
+    if (this.env.framed && window.parent)
+      parent.location.href = url;
+    else  
+      location.href = url;
+    };
+
+  this.goto_url = function(action, query, lock)
+    {
+    if (lock)
+    this.set_busy(true);
+
+    var querystring = query ? '&'+query : '';
+    this.redirect(this.env.comm_path+'&_action='+action+querystring);
+    };
+
 
   this.http_sockets = new Array();
   
@@ -3511,7 +3230,7 @@ function rcube_webmail()
   this.http_request = function(action, querystring, lock)
     {
     var request_obj = this.get_request_obj();
-    querystring += '&_remote=1';
+    querystring += (querystring ? '&' : '') + '_remote=1';
     
     // add timestamp to request url to avoid cacheing problems in Safari
     if (bw.safari)
@@ -3520,20 +3239,45 @@ function rcube_webmail()
     // send request
     if (request_obj)
       {
-      // prompt('request', this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
-      console('HTTP request: '+this.env.comm_path+'&_action='+escape(action)+'&'+querystring);
+      console.log('HTTP request: '+this.env.comm_path+'&_action='+action+'&'+querystring);
 
       if (lock)
         this.set_busy(true);
 
+      var rcm = this;
       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='+escape(action)+'&'+querystring);
+      request_obj.onerror = function(o){ ref.http_error(o); };
+      request_obj.oncomplete = function(o){ ref.http_response(o); };
+      request_obj.GET(this.env.comm_path+'&_action='+action+'&'+querystring);
       }
     };
 
+    // send a http POST request to the server
+    this.http_post = function(action, postdata, lock)
+      {
+      var request_obj;
+      if (postdata && typeof(postdata) == 'object')
+        postdata._remote = 1;
+      else
+        postdata += (postdata ? '&' : '') + '_remote=1';
+
+      // send request
+      if (request_obj = this.get_request_obj())
+        {
+        console.log('HTTP POST: '+this.env.comm_path+'&_action='+action);
+
+        if (lock)
+          this.set_busy(true);
+
+        var rcm = this;
+        request_obj.__lock = lock ? true : false;
+        request_obj.__action = action;
+        request_obj.onerror = function(o){ rcm.http_error(o); };
+        request_obj.oncomplete = function(o){ rcm.http_response(o); };
+        request_obj.POST(this.env.comm_path+'&_action='+action, postdata);
+        }
+      };
 
   // handle HTTP response
   this.http_response = function(request_obj)
@@ -3547,7 +3291,7 @@ function rcube_webmail()
 
     this.set_busy(false);
 
-  console(request_obj.get_text());
+    console.log(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'))
@@ -3560,15 +3304,17 @@ function rcube_webmail()
       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.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;      
+        break;
       }
 
     request_obj.reset();
@@ -3619,91 +3365,16 @@ function rcube_webmail()
   // 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);
     };
 
 
-/* deprecated methods
-
-  // 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;
-    }
-
-  // check if Shift-key is pressed on event
-  this.check_ctrlkey = function(e)
-    {
-    if(!e && window.event)
-      e = window.event;
-
-    if(bw.linux && bw.ns4 && e.modifiers)
-      return true;
-   else if (bw.mac)
-       return this.check_shiftkey(e);
-    else if((bw.ns4 && e.modifiers & Event.CTRL_MASK) || (e && e.ctrlKey))
-      return true;
-    else
-      return false;
-    }
-*/
-
-  // returns modifier key (constants defined at top of file)
-  this.get_modifier = function(e)
-    {
-    var opcode = 0;
-    e = e || window.event;
-
-    if (bw.mac && e)
-      {
-      opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
-      return opcode;    
-      }
-    if (e)
-      {
-      opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
-      return opcode;
-      }
-    if (e.cancelBubble)
-      {
-      e.cancelBubble = true;
-      e.returnValue = false;
-      }
-    else if (e.preventDefault)
-      e.preventDefault();
-  }
-
-
-  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')
@@ -3768,7 +3439,10 @@ function rcube_webmail()
 
 
 
-// class for HTTP requests
+/**
+ * Class for sending HTTP requests
+ * @constructor
+ */
 function rcube_http_request()
   {
   this.url = '';
@@ -3799,14 +3473,17 @@ function rcube_http_request()
     if (window.XMLHttpRequest)
       this.xmlhttp = new XMLHttpRequest();
     else if (window.ActiveXObject)
-      this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP");
+      {
+      try { this.xmlhttp = new ActiveXObject("Microsoft.XMLHTTP"); }
+      catch(e) { this.xmlhttp = null; }
+      }
     else
       {
       
       }
     }
 
-  // sedn GET request
+  // send GET request
   this.GET = function(url)
     {
     this.build();
@@ -3827,9 +3504,36 @@ function rcube_http_request()
     };
 
 
-  this.POST = function(url, a_param)
+  this.POST = function(url, body, contentType)
+    {
+    // default value for contentType if not provided
+    if (typeof(contentType) == 'undefined')
+      contentType = 'application/x-www-form-urlencoded';
+
+    this.build();
+    
+    if (!this.xmlhttp)
+    {
+       this.onerror(this);
+       return false;
+    }
+    
+    var req_body = body;
+    if (typeof(body) == 'object')
     {
-    // not implemented yet
+      req_body = '';
+      for (var p in body)
+        req_body += (req_body ? '&' : '') + p+'='+urlencode(body[p]);
+    }
+
+    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(req_body);
     };
 
 
@@ -3886,17 +3590,10 @@ function rcube_http_request()
   }  // end class rcube_http_request
 
 
-
-function console(str)
+// helper function to call the init method with a delay
+function call_init(o)
   {
-  if (document.debugform && document.debugform.console)
-    document.debugform.console.value += str+'\n--------------------------------------\n';
+  if (window[o] && window[o].init)
+    setTimeout(o+'.init()', 200);
   }
 
-
-// set onload handler
-window.onload = function(e)
-  {
-  if (window.rcube_webmail_client)
-    rcube_webmail_client.init();
-  };