diff --git a/.eslintrc.js b/.eslintrc.js
new file mode 100644
index 000000000..6223617fa
--- /dev/null
+++ b/.eslintrc.js
@@ -0,0 +1,262 @@
+module.exports = {
+    env: {
+        browser: true,
+        es6: true,
+    },
+    extends: [
+        'airbnb-base',
+        'plugin:unicorn/recommended',
+    ],
+    parserOptions: {
+        ecmaVersion: '2020',
+        sourceType: 'module',
+    },
+    ignorePatterns: [
+        '!.*',
+        '/vendor',
+        '/public_html',
+        '/plugins/jqueryui/js',
+    ],
+    rules: {
+        'class-methods-use-this': 'off',
+        'comma-dangle': ['error', {
+            arrays: 'always-multiline',
+            exports: 'always-multiline',
+            functions: 'never',
+            imports: 'always-multiline',
+            objects: 'always-multiline',
+        }],
+        'consistent-return': 'off',
+        curly: ['error', 'all'],
+        'default-case': 'off',
+        'func-names': 'off',
+        'import/no-unresolved': 'off',
+        'import/prefer-default-export': 'off',
+        indent: ['error', 4, {
+            SwitchCase: 1,
+        }],
+        'linebreak-style': ['error', 'unix'],
+        'max-len': 'off',
+        'no-console': 'off',
+        'no-continue': 'off',
+        'no-lonely-if': 'off',
+        'no-multi-spaces': ['error', {
+            exceptions: {
+                Property: true,
+                VariableDeclarator: true,
+            },
+        }],
+        'no-nested-ternary': 'off',
+        'no-param-reassign': 'off',
+        'no-plusplus': 'off',
+        'no-restricted-syntax': 'off',
+        'no-underscore-dangle': 'off',
+        'no-unused-vars': 'off',
+        'object-shorthand': ['error', 'never'],
+        'padding-line-between-statements': ['error', {
+            blankLine: 'always',
+            next: ['continue', 'break', 'export', 'return', 'throw'],
+            prev: '*',
+        }],
+        'prefer-destructuring': 'off',
+        'prefer-template': 'off',
+        'spaced-comment': ['error', 'always', {
+            block: {
+                balanced: true,
+                exceptions: ['*'],
+                markers: ['!'],
+            },
+            line: {
+                exceptions: ['-', '+'],
+                markers: ['/'],
+            },
+        }],
+        strict: 'off',
+        'unicorn/catch-error-name': 'off',
+        'unicorn/no-array-callback-reference': 'off',
+        'unicorn/no-lonely-if': 'off',
+        'unicorn/no-negated-condition': 'off',
+        'unicorn/no-null': 'off',
+        'unicorn/no-this-assignment': 'off',
+        'unicorn/numeric-separators-style': 'off',
+        'unicorn/prefer-array-find': 'off',
+        'unicorn/prefer-array-some': 'off', // https://github.com/sindresorhus/eslint-plugin-unicorn/issues/2007
+        'unicorn/prefer-module': 'off',
+        'unicorn/prevent-abbreviations': 'off',
+        'wrap-iife': ['error', 'inside'],
+
+        // TODO rules to be removed/fixed later as fixes are not compatible with IE11
+        'guard-for-in': 'off', // refactor to "for of"
+        'no-restricted-globals': 'off',
+        'no-restricted-properties': 'off',
+        'no-var': 'off',
+        'one-var': 'off',
+        'prefer-const': 'off',
+        'prefer-exponentiation-operator': 'off',
+        'prefer-rest-params': 'off',
+        'prefer-spread': 'off',
+        'semi-style': 'off',
+        'unicorn/no-array-for-each': 'off',
+        'unicorn/no-for-loop': 'off', // autofixes to "for of"
+        'unicorn/prefer-code-point': 'off',
+        'unicorn/prefer-includes': 'off',
+        'unicorn/prefer-node-protocol': 'off', // needs Node 14+
+        'unicorn/prefer-number-properties': 'off',
+        'unicorn/prefer-optional-catch-binding': 'off',
+        'unicorn/prefer-prototype-methods': 'off',
+        'unicorn/prefer-reflect-apply': 'off',
+        'unicorn/prefer-spread': 'off',
+        'unicorn/prefer-top-level-await': 'off', // needs Node 14+
+        'vars-on-top': 'off',
+
+        // TODO
+        'space-infix-ops': 'off',
+        'quotes': 'off',
+        'no-tabs': 'off',
+        'space-before-function-paren': 'off',
+        'no-undef': 'off',
+        'no-shadow': 'off',
+        'key-spacing': 'off',
+        'block-spacing': 'off',
+        'camelcase': 'off',
+        'object-curly-spacing': 'off',
+        'unicorn/prevent-abbreviations': 'off', // eslint-disable-line no-dupe-keys
+        'no-var': 'off', // eslint-disable-line no-dupe-keys
+        'one-var-declaration-per-line': 'off',
+        'curly': 'off', // eslint-disable-line no-dupe-keys
+        'space-in-parens': 'off',
+        'space-before-blocks': 'off',
+        'nonblock-statement-body-position': 'off',
+        'brace-style': 'off',
+        'eqeqeq': 'off',
+        'array-bracket-spacing': 'off',
+        'one-var': 'off', // eslint-disable-line no-dupe-keys
+        'keyword-spacing': 'off',
+        'yoda': 'off',
+        'no-unused-expressions': 'off',
+        'padding-line-between-statements': 'off', // eslint-disable-line no-dupe-keys
+        'no-use-before-define': 'off',
+        'prefer-arrow-callback': 'off',
+        'no-sequences': 'off',
+        'vars-on-top': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/no-null': 'off', // eslint-disable-line no-dupe-keys
+        'block-scoped-var': 'off',
+        'object-curly-newline': 'off',
+        'no-return-assign': 'off',
+        'unicorn/explicit-length-check': 'off',
+        'unicorn/switch-case-braces': 'off',
+        'no-mixed-operators': 'off',
+        'no-cond-assign': 'off',
+        'padded-blocks': 'off',
+        'switch-colon-spacing': 'off',
+        'comma-dangle': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-module': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-number-properties': 'off', // eslint-disable-line no-dupe-keys
+        'strict': 'off', // eslint-disable-line no-dupe-keys
+        'no-redeclare': 'off',
+        'no-extra-semi': 'off',
+        'function-paren-newline': 'off',
+        'unicorn/no-this-assignment': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/no-nested-ternary': 'off',
+        'unicorn/no-negated-condition': 'off', // eslint-disable-line no-dupe-keys
+        'computed-property-spacing': 'off',
+        'no-restricted-globals': 'off', // eslint-disable-line no-dupe-keys
+        'quote-props': 'off',
+        'no-multiple-empty-lines': 'off',
+        'wrap-iife': 'off', // eslint-disable-line no-dupe-keys
+        'no-multi-assign': 'off',
+        'no-multi-spaces': 'off', // eslint-disable-line no-dupe-keys
+        'newline-per-chained-call': 'off',
+        'unicorn/prefer-query-selector': 'off',
+        'unicorn/better-regex': 'off',
+        'unicorn/prefer-string-replace-all': 'off',
+        'no-void': 'off',
+        'prefer-rest-params': 'off', // eslint-disable-line no-dupe-keys
+        'no-bitwise': 'off',
+        'spaced-comment': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-string-slice': 'off',
+        'unicorn/catch-error-name': 'off', // eslint-disable-line no-dupe-keys
+        'no-useless-escape': 'off',
+        'guard-for-in': 'off', // eslint-disable-line no-dupe-keys
+        'object-property-newline': 'off',
+        'unicorn/consistent-function-scoping': 'off',
+        'unicorn/prefer-regexp-test': 'off',
+        'unicorn/prefer-optional-catch-binding': 'off', // eslint-disable-line no-dupe-keys
+        'dot-notation': 'off',
+        'unicorn/prefer-includes': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-spread': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-reflect-apply': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/no-array-callback-reference': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-dom-node-append': 'off',
+        'unicorn/numeric-separators-style': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-add-event-listener': 'off',
+        'unicorn/no-lonely-if': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-date-now': 'off',
+        'unicorn/prefer-code-point': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-logical-operator-over-ternary': 'off',
+        'no-unneeded-ternary': 'off',
+        'no-empty': 'off',
+        'new-cap': 'off',
+        'function-call-argument-newline': 'off',
+        'unicorn/filename-case': 'off',
+        'no-else-return': 'off',
+        'unicorn/prefer-ternary': 'off',
+        'new-parens': 'off',
+        'no-fallthrough': 'off',
+        'operator-linebreak': 'off',
+        'space-unary-ops': 'off',
+        'radix': 'off',
+        'unicorn/no-array-method-this-argument': 'off',
+        'no-floating-decimal': 'off',
+        'array-callback-return': 'off',
+        'prefer-spread': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-string-starts-ends-with': 'off',
+        'unicorn/require-array-join-separator': 'off',
+        'unicorn/prefer-at': 'off',
+        'unicorn/no-typeof-undefined': 'off',
+        'unicorn/prefer-dom-node-remove': 'off',
+        'no-throw-literal': 'off',
+        'no-loop-func': 'off',
+        'prefer-exponentiation-operator': 'off', // eslint-disable-line no-dupe-keys
+        'no-restricted-properties': 'off', // eslint-disable-line no-dupe-keys
+        'operator-assignment': 'off',
+        'no-alert': 'off',
+        'unicorn/escape-case': 'off',
+        'unicorn/prefer-dom-node-dataset': 'off',
+        'unicorn/empty-brace-spaces': 'off',
+        'unicorn/no-for-loop': 'off', // eslint-disable-line no-dupe-keys
+        'lines-around-directive': 'off',
+        'unicorn/no-hex-escape': 'off',
+        'no-script-url': 'off',
+        'no-extend-native': 'off',
+        'no-shadow-restricted-names': 'off',
+        'unicorn/prefer-math-trunc': 'off',
+        'no-labels': 'off',
+        'unicorn/prefer-modern-math-apis': 'off',
+        'no-eval': 'off',
+        'unicorn/new-for-builtins': 'off',
+        'unicorn/no-array-for-each': 'off', // eslint-disable-line no-dupe-keys
+        'unicorn/prefer-modern-dom-apis': 'off',
+        'no-extra-boolean-cast': 'off',
+        'no-control-regex': 'off',
+        'no-label-var': 'off',
+        'global-require': 'off',
+        'prefer-regex-literals': 'off',
+        'no-array-constructor': 'off',
+        'eol-last': 'off',
+        'unicorn/no-new-array': 'off',
+        'no-debugger': 'off',
+        'no-whitespace-before-property': 'off',
+        'no-constant-condition': 'off',
+        'no-implied-eval': 'off',
+        'unicorn/no-document-cookie': 'off',
+        'unicorn/prefer-default-parameters': 'off',
+        'unicorn/prefer-negative-index': 'off',
+        'no-regex-spaces': 'off',
+        'unicorn/no-useless-undefined': 'off',
+    },
+    reportUnusedDisableDirectives: true,
+    globals: {
+        jQuery: true,
+    },
+};
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3e0dae0ef..4ef78554b 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,12 +33,17 @@ jobs:
       - name: Install dependencies
         run: composer install --prefer-dist --no-interaction --no-progress
 
-      - name: Check Coding Style
+      - name: Check Coding Style - PHP
         run: vendor/bin/php-cs-fixer fix --dry-run --using-cache=no --diff --verbose
 
       - name: Check composer.json format
         run: composer validate --strict --no-check-lock && composer normalize --dry-run --no-check-lock
 
+      - name: Check Coding Style - JS
+        run: |
+          npm add -D eslint eslint-plugin-import eslint-config-airbnb-base eslint-plugin-unicorn
+          npx eslint --ext .js .
+
   phpstan:
     runs-on: ubuntu-latest
     if: "!contains(github.event.head_commit.message, '[skip ci]') && !contains(github.event.head_commit.message, '[ci skip]')"
diff --git a/.gitignore b/.gitignore
index ec830e407..7b36d6da6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,11 @@ program/js/jstz.min.js
 program/js/publickey.js
 program/js/tinymce/
 
+# eslint dependencies
+/node_modules
+/package.json
+/package-lock.json
+
 # skin customization files
 skins/elastic/styles/_styles.less
 skins/elastic/styles/_variables.less
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 54dc0a2d0..24808749c 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -5,7 +5,6 @@ $finder = PhpCsFixer\Finder::create()
     ->exclude(['vendor'])
     ->ignoreDotFiles(false)
     ->name('*.php.dist')
-    ->name('*.dist.php')
     ->name('*.sh');
 
 return (new PhpCsFixer\Config())
diff --git a/installer/client.js b/installer/client.js
index e08ce22fa..f74125fc1 100644
--- a/installer/client.js
+++ b/installer/client.js
@@ -15,34 +15,34 @@
 
 function toggleblock(id, link)
 {
-  var block = document.getElementById(id);
+    var block = document.getElementById(id);
 
-  return false;
+    return false;
 }
 
 
 function addhostfield()
 {
-  var container = document.getElementById('defaulthostlist');
-  var row = document.createElement('div');
-  var input = document.createElement('input');
-  var link = document.createElement('a');
+    var container = document.getElementById('defaulthostlist');
+    var row = document.createElement('div');
+    var input = document.createElement('input');
+    var link = document.createElement('a');
 
-  input.name = '_imap_host[]';
-  input.size = '30';
-  link.href = '#';
-  link.onclick = function() { removehostfield(this.parentNode); return false };
-  link.className = 'removelink';
-  link.innerHTML = 'remove';
+    input.name = '_imap_host[]';
+    input.size = '30';
+    link.href = '#';
+    link.onclick = function() { removehostfield(this.parentNode); return false; };
+    link.className = 'removelink';
+    link.innerHTML = 'remove';
 
-  row.appendChild(input);
-  row.appendChild(link);
-  container.appendChild(row);
+    row.appendChild(input);
+    row.appendChild(link);
+    container.appendChild(row);
 }
 
 
 function removehostfield(row)
 {
-  var container = document.getElementById('defaulthostlist');
-  container.removeChild(row);
+    var container = document.getElementById('defaulthostlist');
+    container.removeChild(row);
 }
diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
index 531248d63..2129fe1a8 100644
--- a/plugins/acl/acl.js
+++ b/plugins/acl/acl.js
@@ -51,7 +51,7 @@ if (window.rcmail) {
 rcube_webmail.prototype.acl_create = function()
 {
     this.acl_init_form();
-}
+};
 
 // Display ACL edit form
 rcube_webmail.prototype.acl_edit = function()
@@ -60,7 +60,7 @@ rcube_webmail.prototype.acl_edit = function()
     var id = this.acl_list.get_single_selection();
     if (id)
         this.acl_init_form(id);
-}
+};
 
 // ACL entry delete
 rcube_webmail.prototype.acl_delete = function()
@@ -76,7 +76,7 @@ rcube_webmail.prototype.acl_delete = function()
             }, ref.set_busy(true, 'acl.deleting'));
         });
     }
-}
+};
 
 // Save ACL data
 rcube_webmail.prototype.acl_save = function()
@@ -107,21 +107,21 @@ rcube_webmail.prototype.acl_save = function()
         _user: user,
         _acl: rights,
         _mbox: this.env.mailbox
-    }
+    };
 
     if (this.acl_id) {
         data._old = this.acl_id;
     }
 
     this.http_post('settings/plugin.acl', data, this.set_busy(true, 'acl.saving'));
-}
+};
 
 // Cancel/Hide form
 rcube_webmail.prototype.acl_cancel = function()
 {
     this.ksearch_blur();
     this.acl_popup.dialog('close');
-}
+};
 
 // Update data after save (and hide form)
 rcube_webmail.prototype.acl_update = function(o)
@@ -139,7 +139,7 @@ rcube_webmail.prototype.acl_update = function(o)
     this.ksearch_blur();
     // hide form
     this.acl_popup.dialog('close');
-}
+};
 
 // Switch table display mode
 rcube_webmail.prototype.acl_mode_switch = function(elem)
@@ -149,8 +149,8 @@ rcube_webmail.prototype.acl_mode_switch = function(elem)
     this.http_request('settings/plugin.acl', '_act=list'
         + '&_mode='+(this.env.acl_advanced ? 'advanced' : 'simple')
         + '&_mbox='+urlencode(this.env.mailbox),
-        this.set_busy(true, 'loading'));
-}
+    this.set_busy(true, 'loading'));
+};
 
 // ACL table initialization
 rcube_webmail.prototype.acl_list_init = function()
@@ -166,7 +166,7 @@ rcube_webmail.prototype.acl_list_init = function()
         .addEventListener('dblclick', function(o) { rcmail.acl_list_dblclick(o); })
         .addEventListener('keypress', function(o) { rcmail.acl_list_keypress(o); })
         .init();
-}
+};
 
 // ACL table row selection handler
 rcube_webmail.prototype.acl_list_select = function(list)
@@ -174,13 +174,13 @@ rcube_webmail.prototype.acl_list_select = function(list)
     rcmail.enable_command('acl-delete', list.get_selection().length > 0);
     rcmail.enable_command('acl-edit', list.get_selection().length == 1);
     list.focus();
-}
+};
 
 // ACL table double-click handler
 rcube_webmail.prototype.acl_list_dblclick = function(list)
 {
     this.acl_edit();
-}
+};
 
 // ACL table keypress handler
 rcube_webmail.prototype.acl_list_keypress = function(list)
@@ -190,14 +190,14 @@ rcube_webmail.prototype.acl_list_keypress = function(list)
     else if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
         if (!this.acl_form || !this.acl_form.is(':visible'))
             this.command('acl-delete');
-}
+};
 
 // Reloads ACL table
 rcube_webmail.prototype.acl_list_update = function(html)
 {
     $(this.gui_objects.acltable).html(html);
     this.acl_list_init();
-}
+};
 
 // Returns names of users in selected rows
 rcube_webmail.prototype.acl_get_usernames = function()
@@ -216,7 +216,7 @@ rcube_webmail.prototype.acl_get_usernames = function()
     }
 
     return users;
-}
+};
 
 // Removes ACL table row
 rcube_webmail.prototype.acl_remove_row = function(id)
@@ -232,7 +232,7 @@ rcube_webmail.prototype.acl_remove_row = function(id)
 
     this.enable_command('acl-delete', list.get_selection().length > 0);
     this.enable_command('acl-edit', list.get_selection().length == 1);
-}
+};
 
 // Adds ACL table row
 rcube_webmail.prototype.acl_add_row = function(o, sel)
@@ -295,7 +295,7 @@ rcube_webmail.prototype.acl_add_row = function(o, sel)
 
     if (sel)
         list.select_row(o.id);
-}
+};
 
 // Initializes and shows ACL create/edit form
 rcube_webmail.prototype.acl_init_form = function(id)
@@ -377,7 +377,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
         name_input.focus();
     else
         $('input:checked', type_list).focus();
-}
+};
 
 // Returns class name according to ACL comparison result
 rcube_webmail.prototype.acl_class = function(acl1, acl2)
@@ -397,4 +397,4 @@ rcube_webmail.prototype.acl_class = function(acl1, acl2)
         return 'partial';
 
     return 'disabled';
-}
+};
diff --git a/plugins/archive/archive.js b/plugins/archive/archive.js
index 0975dff07..13217ee95 100644
--- a/plugins/archive/archive.js
+++ b/plugins/archive/archive.js
@@ -17,65 +17,65 @@
 
 function rcmail_archive(prop)
 {
-  if (rcmail_is_archive())
-    return;
+    if (rcmail_is_archive())
+        return;
 
-  var post_data = rcmail.selection_post_data();
+    var post_data = rcmail.selection_post_data();
 
-  // exit if selection is empty
-  if (!post_data._uid)
-    return;
+    // exit if selection is empty
+    if (!post_data._uid)
+        return;
 
-  // Disable message command buttons until a message is selected
-  rcmail.enable_command(rcmail.env.message_commands, false);
-  rcmail.enable_command('plugin.archive', false);
+    // Disable message command buttons until a message is selected
+    rcmail.enable_command(rcmail.env.message_commands, false);
+    rcmail.enable_command('plugin.archive', false);
 
-  // let the server sort the messages to the according subfolders
-  rcmail.with_selected_messages('move', post_data, null, 'plugin.move2archive');
+    // let the server sort the messages to the according subfolders
+    rcmail.with_selected_messages('move', post_data, null, 'plugin.move2archive');
 
-  // Reset preview (must be after with_selected_messages() call)
-  rcmail.show_contentframe(false);
+    // Reset preview (must be after with_selected_messages() call)
+    rcmail.show_contentframe(false);
 }
 
 function rcmail_is_archive()
 {
-  // check if current folder is an archive folder or one of its children
-  return rcmail.env.mailbox == rcmail.env.archive_folder
+    // check if current folder is an archive folder or one of its children
+    return rcmail.env.mailbox == rcmail.env.archive_folder
     || rcmail.env.mailbox.startsWith(rcmail.env.archive_folder + rcmail.env.delimiter);
 }
 
 // callback for app-onload event
 if (window.rcmail) {
-  rcmail.addEventListener('init', function(evt) {
+    rcmail.addEventListener('init', function(evt) {
     // register command (directly enable in message view mode)
-    rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && !rcmail_is_archive());
+        rcmail.register_command('plugin.archive', rcmail_archive, rcmail.env.uid && !rcmail_is_archive());
 
-    // add event-listener to message list
-    if (rcmail.message_list)
-      rcmail.message_list.addEventListener('select', function(list) {
-        rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && !rcmail_is_archive());
-      });
+        // add event-listener to message list
+        if (rcmail.message_list)
+            rcmail.message_list.addEventListener('select', function(list) {
+                rcmail.enable_command('plugin.archive', list.get_selection().length > 0 && !rcmail_is_archive());
+            });
 
-    // set css style for archive folder
-    var li;
-    if (rcmail.env.archive_folder) {
-      // in Settings > Folders
-      if (rcmail.subscription_list)
-        li = rcmail.subscription_list.get_item(rcmail.env.archive_folder);
-      // in folders list
-      else
-        li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true);
+        // set css style for archive folder
+        var li;
+        if (rcmail.env.archive_folder) {
+            // in Settings > Folders
+            if (rcmail.subscription_list)
+                li = rcmail.subscription_list.get_item(rcmail.env.archive_folder);
+            // in folders list
+            else
+                li = rcmail.get_folder_li(rcmail.env.archive_folder, '', true);
 
-      if (li)
-        $(li).addClass('archive');
+            if (li)
+                $(li).addClass('archive');
 
-      // in folder selector popup
-      rcmail.addEventListener('menu-open', function(p) {
-        if (p.name == 'folder-selector') {
-          var search = rcmail.env.archive_folder;
-          $('a', p.obj).filter(function() { return $(this).data('id') == search; }).parent().addClass('archive');
+            // in folder selector popup
+            rcmail.addEventListener('menu-open', function(p) {
+                if (p.name == 'folder-selector') {
+                    var search = rcmail.env.archive_folder;
+                    $('a', p.obj).filter(function() { return $(this).data('id') == search; }).parent().addClass('archive');
+                }
+            });
         }
-      });
-    }
-  });
+    });
 }
diff --git a/plugins/attachment_reminder/attachment_reminder.js b/plugins/attachment_reminder/attachment_reminder.js
index 633922a51..828d38488 100644
--- a/plugins/attachment_reminder/attachment_reminder.js
+++ b/plugins/attachment_reminder/attachment_reminder.js
@@ -17,71 +17,71 @@
 
 function rcmail_get_compose_message()
 {
-  var msg = rcmail.editor.get_content({ nosig: true });
+    var msg = rcmail.editor.get_content({ nosig: true });
 
-  if (rcmail.editor.is_html()) {
+    if (rcmail.editor.is_html()) {
     // Remove quoted content, all HTML tags, and some entities
-    msg = msg.replace(/<blockquote[^>]*>(.|[\r\n])*<\/blockquote>/gmi, '')
-             .replace(/<[^>]+>/gm, ' ')
-             .replace(/&nbsp;/g, ' ');
-  }
-  else {
+        msg = msg.replace(/<blockquote[^>]*>(.|[\r\n])*<\/blockquote>/gmi, '')
+            .replace(/<[^>]+>/gm, ' ')
+            .replace(/&nbsp;/g, ' ');
+    }
+    else {
     // Remove quoted content
-    msg = msg.replace(/^>.*$/gmi, '');
-  }
+        msg = msg.replace(/^>.*$/gmi, '');
+    }
 
-  return msg;
+    return msg;
 };
 
 function rcmail_check_message(msg)
 {
-  var i, rx, keywords = rcmail.get_label('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]);
+    var i, rx, keywords = rcmail.get_label('keywords', 'attachment_reminder').split(",").concat([".doc", ".pdf"]);
 
-  keywords = $.map(keywords, function(n) { return RegExp.escape(n); });
-  rx = new RegExp('(' + keywords.join('|') + ')', 'i');
+    keywords = $.map(keywords, function(n) { return RegExp.escape(n); });
+    rx = new RegExp('(' + keywords.join('|') + ')', 'i');
 
-  return msg.search(rx) != -1;
+    return msg.search(rx) != -1;
 };
 
 function rcmail_have_attachments()
 {
-  return rcmail.env.attachments && $('li', rcmail.gui_objects.attachmentlist).length;
+    return rcmail.env.attachments && $('li', rcmail.gui_objects.attachmentlist).length;
 };
 
 function rcmail_attachment_reminder_dialog()
 {
-  var buttons = {};
+    var buttons = {};
 
-  buttons[rcmail.get_label('addattachment')] = function() {
-    $(this).remove();
-    $('#messagetoolbar a.attach, .toolbar a.attach').first().click();
-  };
-  buttons[rcmail.get_label('send')] = function(e) {
-    $(this).remove();
-    rcmail.env.attachment_reminder = true;
-    rcmail.command('send', '', e);
-  };
+    buttons[rcmail.get_label('addattachment')] = function() {
+        $(this).remove();
+        $('#messagetoolbar a.attach, .toolbar a.attach').first().click();
+    };
+    buttons[rcmail.get_label('send')] = function(e) {
+        $(this).remove();
+        rcmail.env.attachment_reminder = true;
+        rcmail.command('send', '', e);
+    };
 
-  rcmail.env.attachment_reminder = false;
-  rcmail.show_popup_dialog(
-    rcmail.get_label('attachment_reminder.forgotattachment'),
-    rcmail.get_label('attachment_reminder.missingattachment'),
-    buttons,
-    {button_classes: ['mainaction attach', 'send']}
-  );
+    rcmail.env.attachment_reminder = false;
+    rcmail.show_popup_dialog(
+        rcmail.get_label('attachment_reminder.forgotattachment'),
+        rcmail.get_label('attachment_reminder.missingattachment'),
+        buttons,
+        {button_classes: ['mainaction attach', 'send']}
+    );
 };
 
 
 if (window.rcmail) {
-  rcmail.addEventListener('beforesend', function(evt) {
-    var msg = rcmail_get_compose_message(),
-      subject = $('#compose-subject').val();
+    rcmail.addEventListener('beforesend', function(evt) {
+        var msg = rcmail_get_compose_message(),
+            subject = $('#compose-subject').val();
 
-    if (!rcmail.env.attachment_reminder && !rcmail_have_attachments()
+        if (!rcmail.env.attachment_reminder && !rcmail_have_attachments()
       && (rcmail_check_message(msg) || rcmail_check_message(subject))
-    ) {
-      rcmail_attachment_reminder_dialog();
-      return false;
-    }
-  });
+        ) {
+            rcmail_attachment_reminder_dialog();
+            return false;
+        }
+    });
 }
diff --git a/plugins/enigma/enigma.js b/plugins/enigma/enigma.js
index 647b22ba5..9b90ec70e 100644
--- a/plugins/enigma/enigma.js
+++ b/plugins/enigma/enigma.js
@@ -198,10 +198,10 @@ rcube_webmail.prototype.enigma_key_create_save = function()
         openpgp.generateKey(options).then(function(keypair) {
             // success
             var post = {
-              _a: 'import',
-              _keys: keypair.privateKey,
-              _generated: 1,
-              _passwd: password
+                _a: 'import',
+                _keys: keypair.privateKey,
+                _generated: 1,
+                _passwd: password
             };
 
             // send request to server
@@ -306,7 +306,7 @@ rcube_webmail.prototype.enigma_export_submit = function(data)
     var id = 'keyexport-' + new Date().getTime(),
         form = $('<form>').attr({target: id, method: 'post', style: 'display:none',
             action: '?_action=plugin.enigmakeys&_task=settings&_a=export'}),
-        iframe = $('<iframe>').attr({name: id, style: 'display:none'})
+        iframe = $('<iframe>').attr({name: id, style: 'display:none'});
 
     form.append($('<input>').attr({name: '_token', value: this.env.request_token}));
     $.each(data, function(i, v) {
@@ -392,9 +392,9 @@ rcube_webmail.prototype.enigma_search = function(props)
 
     if (props || this.env.search_request) {
         var params = {'_a': 'search', '_q': props},
-          lock = this.set_busy(true, 'searching');
-//        if (this.gui_objects.search_filter)
-//          addurl += '&_filter=' + this.gui_objects.search_filter.value;
+            lock = this.set_busy(true, 'searching');
+        //        if (this.gui_objects.search_filter)
+        //          addurl += '&_filter=' + this.gui_objects.search_filter.value;
         this.env.current_page = 1;
         this.enigma_loadframe();
         this.enigma_clear_list();
@@ -428,7 +428,7 @@ rcube_webmail.prototype.enigma_list = function(page, reset_frame)
         return parent.rcmail.enigma_list(page, reset_frame);
 
     var params = {'_a': 'list'},
-      lock = this.set_busy(true, 'loading');
+        lock = this.set_busy(true, 'loading');
 
     this.env.current_page = page ? page : 1;
 
@@ -611,7 +611,7 @@ rcube_webmail.prototype.enigma_password_submit = function(data)
     else if (this.env.action == 'plugin.enigmakeys' && (form = this.gui_objects.importform)) {
         if (!$('input[name="_keyid"]', form).length) {
             $(form).append($('<input>').attr({type: 'hidden', name: '_keyid', value: data.key}))
-                .append($('<input>').attr({type: 'hidden', name: '_passwd', value: data.password}))
+                .append($('<input>').attr({type: 'hidden', name: '_passwd', value: data.password}));
         }
 
         return this.enigma_import();
@@ -628,7 +628,7 @@ rcube_webmail.prototype.enigma_password_submit = function(data)
     // Additional form fields for request parameters
     $.each(data, function(i, v) {
         if (i.indexOf('input') == 0)
-            form.append($('<input>').attr({type: 'hidden', name: i.substring(5), value: v}))
+            form.append($('<input>').attr({type: 'hidden', name: i.substring(5), value: v}));
     });
 
     if (data.iframe) {
diff --git a/plugins/hide_blockquote/hide_blockquote.js b/plugins/hide_blockquote/hide_blockquote.js
index 8bd43f8a0..91b272156 100644
--- a/plugins/hide_blockquote/hide_blockquote.js
+++ b/plugins/hide_blockquote/hide_blockquote.js
@@ -16,54 +16,54 @@
  */
 
 if (window.rcmail)
-  rcmail.addEventListener('init', function() { hide_blockquote(); });
+    rcmail.addEventListener('init', function() { hide_blockquote(); });
 
 function hide_blockquote()
 {
-  var limit = rcmail.env.blockquote_limit;
+    var limit = rcmail.env.blockquote_limit;
 
-  if (limit <= 0)
-    return;
-
-  $('div.message-part div.pre > blockquote', $('#messagebody')).each(function() {
-    var res, text, div, link, q = $(this);
-
-    // Add new-line character before each blockquote
-    // This fixes counting lines of text, it also prevents
-    // from merging lines from different quoting level
-    $('blockquote').before(document.createTextNode("\n"));
-
-    text = q.text().trim();
-    res = text.split(/\n/);
-
-    if (res.length <= limit) {
-      // there can be also a block with very long wrapped line
-      // assume line height = 15px
-      if (q.height() <= limit * 15)
+    if (limit <= 0)
         return;
-    }
 
-    div = $('<blockquote class="blockquote-header">')
-      .css({'white-space': 'nowrap', overflow: 'hidden', position: 'relative'})
-      .text(res[0]);
+    $('div.message-part div.pre > blockquote', $('#messagebody')).each(function() {
+        var res, text, div, link, q = $(this);
 
-    link = $('<span class="blockquote-link"></span>')
-      .css({position: 'absolute', 'z-Index': 2})
-      .text(rcmail.get_label('hide_blockquote.show'))
-      .data('parent', div)
-      .click(function() {
-        var t = $(this), parent = t.data('parent'), visible = parent.is(':visible');
+        // Add new-line character before each blockquote
+        // This fixes counting lines of text, it also prevents
+        // from merging lines from different quoting level
+        $('blockquote').before(document.createTextNode("\n"));
 
-        t.text(rcmail.get_label(visible ? 'hide' : 'show', 'hide_blockquote'))
-          .detach().appendTo(visible ? q : parent).toggleClass('collapsed');
+        text = q.text().trim();
+        res = text.split(/\n/);
 
-        parent[visible ? 'hide' : 'show']();
-        q[visible ? 'show' : 'hide']();
-      });
+        if (res.length <= limit) {
+            // there can be also a block with very long wrapped line
+            // assume line height = 15px
+            if (q.height() <= limit * 15)
+                return;
+        }
 
-    link.appendTo(div);
+        div = $('<blockquote class="blockquote-header">')
+            .css({'white-space': 'nowrap', overflow: 'hidden', position: 'relative'})
+            .text(res[0]);
 
-    // Modify blockquote
-    q.hide().css({position: 'relative'}).before(div);
-  });
+        link = $('<span class="blockquote-link"></span>')
+            .css({position: 'absolute', 'z-Index': 2})
+            .text(rcmail.get_label('hide_blockquote.show'))
+            .data('parent', div)
+            .click(function() {
+                var t = $(this), parent = t.data('parent'), visible = parent.is(':visible');
+
+                t.text(rcmail.get_label(visible ? 'hide' : 'show', 'hide_blockquote'))
+                    .detach().appendTo(visible ? q : parent).toggleClass('collapsed');
+
+                parent[visible ? 'hide' : 'show']();
+                q[visible ? 'show' : 'hide']();
+            });
+
+        link.appendTo(div);
+
+        // Modify blockquote
+        q.hide().css({position: 'relative'}).before(div);
+    });
 }
diff --git a/plugins/managesieve/managesieve.js b/plugins/managesieve/managesieve.js
index 3bc138d84..7aff6b9c9 100644
--- a/plugins/managesieve/managesieve.js
+++ b/plugins/managesieve/managesieve.js
@@ -16,95 +16,95 @@
  */
 
 if (window.rcmail) {
-  rcmail.addEventListener('init', function(evt) {
+    rcmail.addEventListener('init', function(evt) {
     // add managesieve-create command to message_commands array,
     // so it's state will be updated on message selection/unselection
-    if (rcmail.env.task == 'mail') {
-      if (rcmail.env.action != 'show')
-        rcmail.env.message_commands.push('managesieve-create');
-      else
-        rcmail.enable_command('managesieve-create', true);
-    }
-
-    if (rcmail.env.task == 'mail' || rcmail.env.action.startsWith('plugin.managesieve')) {
-      // Create layer for form tips
-      if (!rcmail.env.framed) {
-        rcmail.env.ms_tip_layer = $('<div id="managesieve-tip" class="popupmenu"></div>');
-        rcmail.env.ms_tip_layer.appendTo(document.body);
-      }
-    }
-
-    // register commands
-    rcmail.register_command('plugin.managesieve-save', function() { rcmail.managesieve_save() });
-    rcmail.register_command('plugin.managesieve-act', function() { rcmail.managesieve_act() });
-    rcmail.register_command('plugin.managesieve-add', function() { rcmail.managesieve_add() });
-    rcmail.register_command('plugin.managesieve-del', function() { rcmail.managesieve_del() });
-    rcmail.register_command('plugin.managesieve-move', function() { rcmail.managesieve_move() });
-    rcmail.register_command('plugin.managesieve-setadd', function() { rcmail.managesieve_setadd() });
-    rcmail.register_command('plugin.managesieve-setdel', function() { rcmail.managesieve_setdel() });
-    rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact() });
-    rcmail.register_command('plugin.managesieve-setget', function() { rcmail.managesieve_setget() });
-    rcmail.register_command('plugin.managesieve-seteditraw', function() { rcmail.managesieve_seteditraw() });
-
-    if (rcmail.env.action.startsWith('plugin.managesieve')) {
-      if (rcmail.gui_objects.sieveform) {
-        rcmail.enable_command('plugin.managesieve-save', true);
-        sieve_form_init();
-      }
-      else if (rcmail.gui_objects.sievesetrawform) {
-        rcmail.enable_command('plugin.managesieve-save', true);
-        sieve_raw_editor_init();
-      }
-      else {
-        rcmail.enable_command('plugin.managesieve-add', !rcmail.env.sieveconnerror && $.inArray('new_filter', rcmail.env.managesieve_disabled_actions) == -1);
-        rcmail.enable_command('plugin.managesieve-setadd', !rcmail.env.sieveconnerror && $.inArray('new_set', rcmail.env.managesieve_disabled_actions) == -1);
-      }
-
-      var setcnt, set = rcmail.env.currentset;
-
-      if (rcmail.gui_objects.filterslist) {
-        rcmail.filters_list = new rcube_list_widget(rcmail.gui_objects.filterslist,
-          {multiselect:false, draggable:true, keyboard:true});
-
-        rcmail.filters_list
-          .addEventListener('select', function(o) { rcmail.managesieve_select(o); })
-          .addEventListener('keypress', function(o) { rcmail.list_keypress(o, {del: 'plugin.managesieve-del'}); })
-          .addEventListener('dragstart', function(o) { rcmail.managesieve_dragstart(o); })
-          .addEventListener('dragend', function(o) { rcmail.managesieve_dragend(o); })
-          .addEventListener('initrow', function(row) {
-            row.obj.onmouseover = function() { rcmail.managesieve_focus_filter(row); };
-            row.obj.onmouseout = function() { rcmail.managesieve_unfocus_filter(row); };
-          })
-          .init();
-      }
-
-      if (rcmail.gui_objects.filtersetslist) {
-        rcmail.filtersets_list = new rcube_list_widget(rcmail.gui_objects.filtersetslist,
-          {multiselect:false, draggable:false, keyboard:true});
-
-        rcmail.filtersets_list.init().focus();
-
-        if (set != null) {
-          $('#filterset-name').text(set);
-          set = rcmail.managesieve_setid(set);
-          rcmail.filtersets_list.select(set);
+        if (rcmail.env.task == 'mail') {
+            if (rcmail.env.action != 'show')
+                rcmail.env.message_commands.push('managesieve-create');
+            else
+                rcmail.enable_command('managesieve-create', true);
         }
 
-        // attach select event after initial record was selected
-        rcmail.filtersets_list.addEventListener('select', function(e) { rcmail.managesieve_setselect(e); });
+        if (rcmail.env.task == 'mail' || rcmail.env.action.startsWith('plugin.managesieve')) {
+            // Create layer for form tips
+            if (!rcmail.env.framed) {
+                rcmail.env.ms_tip_layer = $('<div id="managesieve-tip" class="popupmenu"></div>');
+                rcmail.env.ms_tip_layer.appendTo(document.body);
+            }
+        }
 
-        setcnt = rcmail.filtersets_list.rowcount;
-        rcmail.enable_command('plugin.managesieve-set', true);
-        rcmail.enable_command('plugin.managesieve-setact', setcnt > 0 && $.inArray('enable_disable_set', rcmail.env.managesieve_disabled_actions) == -1);
-        rcmail.enable_command('plugin.managesieve-setget', setcnt > 0 && $.inArray('download_set', rcmail.env.managesieve_disabled_actions) == -1);
-        rcmail.enable_command('plugin.managesieve-setdel', setcnt > 1 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
-        rcmail.enable_command('plugin.managesieve-seteditraw', setcnt > 0 && rcmail.env.raw_sieve_editor);
+        // register commands
+        rcmail.register_command('plugin.managesieve-save', function() { rcmail.managesieve_save(); });
+        rcmail.register_command('plugin.managesieve-act', function() { rcmail.managesieve_act(); });
+        rcmail.register_command('plugin.managesieve-add', function() { rcmail.managesieve_add(); });
+        rcmail.register_command('plugin.managesieve-del', function() { rcmail.managesieve_del(); });
+        rcmail.register_command('plugin.managesieve-move', function() { rcmail.managesieve_move(); });
+        rcmail.register_command('plugin.managesieve-setadd', function() { rcmail.managesieve_setadd(); });
+        rcmail.register_command('plugin.managesieve-setdel', function() { rcmail.managesieve_setdel(); });
+        rcmail.register_command('plugin.managesieve-setact', function() { rcmail.managesieve_setact(); });
+        rcmail.register_command('plugin.managesieve-setget', function() { rcmail.managesieve_setget(); });
+        rcmail.register_command('plugin.managesieve-seteditraw', function() { rcmail.managesieve_seteditraw(); });
 
-        // Fix dragging filters over sets list
-        $('tr', rcmail.gui_objects.filtersetslist).each(function (i, e) { rcmail.managesieve_fixdragend(e); });
-      }
-    }
-  });
+        if (rcmail.env.action.startsWith('plugin.managesieve')) {
+            if (rcmail.gui_objects.sieveform) {
+                rcmail.enable_command('plugin.managesieve-save', true);
+                sieve_form_init();
+            }
+            else if (rcmail.gui_objects.sievesetrawform) {
+                rcmail.enable_command('plugin.managesieve-save', true);
+                sieve_raw_editor_init();
+            }
+            else {
+                rcmail.enable_command('plugin.managesieve-add', !rcmail.env.sieveconnerror && $.inArray('new_filter', rcmail.env.managesieve_disabled_actions) == -1);
+                rcmail.enable_command('plugin.managesieve-setadd', !rcmail.env.sieveconnerror && $.inArray('new_set', rcmail.env.managesieve_disabled_actions) == -1);
+            }
+
+            var setcnt, set = rcmail.env.currentset;
+
+            if (rcmail.gui_objects.filterslist) {
+                rcmail.filters_list = new rcube_list_widget(rcmail.gui_objects.filterslist,
+                    {multiselect:false, draggable:true, keyboard:true});
+
+                rcmail.filters_list
+                    .addEventListener('select', function(o) { rcmail.managesieve_select(o); })
+                    .addEventListener('keypress', function(o) { rcmail.list_keypress(o, {del: 'plugin.managesieve-del'}); })
+                    .addEventListener('dragstart', function(o) { rcmail.managesieve_dragstart(o); })
+                    .addEventListener('dragend', function(o) { rcmail.managesieve_dragend(o); })
+                    .addEventListener('initrow', function(row) {
+                        row.obj.onmouseover = function() { rcmail.managesieve_focus_filter(row); };
+                        row.obj.onmouseout = function() { rcmail.managesieve_unfocus_filter(row); };
+                    })
+                    .init();
+            }
+
+            if (rcmail.gui_objects.filtersetslist) {
+                rcmail.filtersets_list = new rcube_list_widget(rcmail.gui_objects.filtersetslist,
+                    {multiselect:false, draggable:false, keyboard:true});
+
+                rcmail.filtersets_list.init().focus();
+
+                if (set != null) {
+                    $('#filterset-name').text(set);
+                    set = rcmail.managesieve_setid(set);
+                    rcmail.filtersets_list.select(set);
+                }
+
+                // attach select event after initial record was selected
+                rcmail.filtersets_list.addEventListener('select', function(e) { rcmail.managesieve_setselect(e); });
+
+                setcnt = rcmail.filtersets_list.rowcount;
+                rcmail.enable_command('plugin.managesieve-set', true);
+                rcmail.enable_command('plugin.managesieve-setact', setcnt > 0 && $.inArray('enable_disable_set', rcmail.env.managesieve_disabled_actions) == -1);
+                rcmail.enable_command('plugin.managesieve-setget', setcnt > 0 && $.inArray('download_set', rcmail.env.managesieve_disabled_actions) == -1);
+                rcmail.enable_command('plugin.managesieve-setdel', setcnt > 1 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
+                rcmail.enable_command('plugin.managesieve-seteditraw', setcnt > 0 && rcmail.env.raw_sieve_editor);
+
+                // Fix dragging filters over sets list
+                $('tr', rcmail.gui_objects.filtersetslist).each(function (i, e) { rcmail.managesieve_fixdragend(e); });
+            }
+        }
+    });
 };
 
 /*********************************************************/
@@ -113,373 +113,373 @@ if (window.rcmail) {
 
 rcube_webmail.prototype.managesieve_add = function()
 {
-  this.load_managesieveframe('_nav=hide', true);
+    this.load_managesieveframe('_nav=hide', true);
 };
 
 rcube_webmail.prototype.managesieve_del = function()
 {
-  var id = this.filters_list.get_single_selection();
-  this.confirm_dialog(this.get_label('managesieve.filterdeleteconfirm'), 'delete', function(e, ref) {
-      var post = '_act=delete&_fid=' + ref.filters_list.rows[id].uid,
-        lock = ref.set_busy(true, 'loading');
+    var id = this.filters_list.get_single_selection();
+    this.confirm_dialog(this.get_label('managesieve.filterdeleteconfirm'), 'delete', function(e, ref) {
+        var post = '_act=delete&_fid=' + ref.filters_list.rows[id].uid,
+            lock = ref.set_busy(true, 'loading');
 
-      ref.http_post('plugin.managesieve-action', post, lock);
+        ref.http_post('plugin.managesieve-action', post, lock);
     });
 };
 
 rcube_webmail.prototype.managesieve_act = function()
 {
-  var id = this.filters_list.get_single_selection(),
-    lock = this.set_busy(true, 'loading');
+    var id = this.filters_list.get_single_selection(),
+        lock = this.set_busy(true, 'loading');
 
-  this.http_post('plugin.managesieve-action',
-    '_act=act&_fid='+this.filters_list.rows[id].uid, lock);
+    this.http_post('plugin.managesieve-action',
+        '_act=act&_fid='+this.filters_list.rows[id].uid, lock);
 };
 
 // Filter selection
 rcube_webmail.prototype.managesieve_select = function(list)
 {
-  var id = list.get_single_selection();
+    var id = list.get_single_selection();
 
-  if (id != null) {
-    id = list.rows[id].uid;
-    this.load_managesieveframe('_fid=' + id);
-  }
+    if (id != null) {
+        id = list.rows[id].uid;
+        this.load_managesieveframe('_fid=' + id);
+    }
 
-  var has_id = typeof(id) != 'undefined' && id != null;
+    var has_id = typeof(id) != 'undefined' && id != null;
 
-  this.enable_command('plugin.managesieve-act', has_id);
-  this.enable_command('plugin.managesieve-del', has_id && $.inArray('delete_filter', rcmail.env.managesieve_disabled_actions) == -1);
+    this.enable_command('plugin.managesieve-act', has_id);
+    this.enable_command('plugin.managesieve-del', has_id && $.inArray('delete_filter', rcmail.env.managesieve_disabled_actions) == -1);
 };
 
 // Set selection
 rcube_webmail.prototype.managesieve_setselect = function(list)
 {
-  this.enable_command('plugin.managesieve-setdel', list.rowcount > 1 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
-  this.enable_command('plugin.managesieve-setact', list.rowcount > 0 && $.inArray('enable_disable_set', rcmail.env.managesieve_disabled_actions) == -1);
-  this.enable_command('plugin.managesieve-setget', list.rowcount > 0 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
-  this.enable_command('plugin.managesieve-seteditraw', list.rowcount > 0 && this.env.raw_sieve_editor);
+    this.enable_command('plugin.managesieve-setdel', list.rowcount > 1 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
+    this.enable_command('plugin.managesieve-setact', list.rowcount > 0 && $.inArray('enable_disable_set', rcmail.env.managesieve_disabled_actions) == -1);
+    this.enable_command('plugin.managesieve-setget', list.rowcount > 0 && $.inArray('delete_set', rcmail.env.managesieve_disabled_actions) == -1);
+    this.enable_command('plugin.managesieve-seteditraw', list.rowcount > 0 && this.env.raw_sieve_editor);
 
- if (rcmail.env.contextmenu_opening)
-   return;
+    if (rcmail.env.contextmenu_opening)
+        return;
 
-  this.show_contentframe(false);
-  this.filters_list.clear(true);
+    this.show_contentframe(false);
+    this.filters_list.clear(true);
 
-  var id = list.get_single_selection();
-  if (id != null) {
-    this.managesieve_list(this.env.filtersets[id]);
-    $('#filterset-name').text(this.env.filtersets[id]);
-  }
+    var id = list.get_single_selection();
+    if (id != null) {
+        this.managesieve_list(this.env.filtersets[id]);
+        $('#filterset-name').text(this.env.filtersets[id]);
+    }
 };
 
 rcube_webmail.prototype.managesieve_rowid = function(id)
 {
-  var i, rows = this.filters_list.rows;
+    var i, rows = this.filters_list.rows;
 
-  for (i in rows)
-    if (rows[i] != null && rows[i].uid == id)
-      return i;
+    for (i in rows)
+        if (rows[i] != null && rows[i].uid == id)
+            return i;
 };
 
 // Returns set's identifier
 rcube_webmail.prototype.managesieve_setid = function(name)
 {
-  for (var i in this.env.filtersets)
-    if (this.env.filtersets[i] == name)
-      return i;
+    for (var i in this.env.filtersets)
+        if (this.env.filtersets[i] == name)
+            return i;
 };
 
 // Filters listing request
 rcube_webmail.prototype.managesieve_list = function(script)
 {
-  var lock = this.set_busy(true, 'loading');
+    var lock = this.set_busy(true, 'loading');
 
-  this.http_post('plugin.managesieve-action', '_act=list&_set='+urlencode(script), lock);
+    this.http_post('plugin.managesieve-action', '_act=list&_set='+urlencode(script), lock);
 };
 
 // Script download request
 rcube_webmail.prototype.managesieve_setget = function()
 {
-  var id = this.filtersets_list.get_single_selection(),
-    script = this.env.filtersets[id];
+    var id = this.filtersets_list.get_single_selection(),
+        script = this.env.filtersets[id];
 
-  this.goto_url('plugin.managesieve-action', {_act: 'setget', _set: script}, false, true);
+    this.goto_url('plugin.managesieve-action', {_act: 'setget', _set: script}, false, true);
 };
 
 // Set activate/deactivate request
 rcube_webmail.prototype.managesieve_setact = function()
 {
-  var id = this.filtersets_list.get_single_selection(),
-   lock = this.set_busy(true, 'loading'),
-    script = this.env.filtersets[id],
-    action = $('#rcmrow'+id).hasClass('disabled') ? 'setact' : 'deact';
+    var id = this.filtersets_list.get_single_selection(),
+        lock = this.set_busy(true, 'loading'),
+        script = this.env.filtersets[id],
+        action = $('#rcmrow'+id).hasClass('disabled') ? 'setact' : 'deact';
 
-  this.http_post('plugin.managesieve-action', '_act='+action+'&_set='+urlencode(script), lock);
+    this.http_post('plugin.managesieve-action', '_act='+action+'&_set='+urlencode(script), lock);
 };
 
 // Set delete request
 rcube_webmail.prototype.managesieve_setdel = function()
 {
-  var id = this.filtersets_list.get_single_selection();
-  this.confirm_dialog(this.get_label('managesieve.setdeleteconfirm'), 'delete', function(e, ref) {
-      var script = ref.env.filtersets[id],
-        lock = ref.set_busy(true, 'loading');
+    var id = this.filtersets_list.get_single_selection();
+    this.confirm_dialog(this.get_label('managesieve.setdeleteconfirm'), 'delete', function(e, ref) {
+        var script = ref.env.filtersets[id],
+            lock = ref.set_busy(true, 'loading');
 
-      ref.http_post('plugin.managesieve-action', '_act=setdel&_set=' + urlencode(script), lock);
+        ref.http_post('plugin.managesieve-action', '_act=setdel&_set=' + urlencode(script), lock);
     });
 };
 
 // Set edit raw request
 rcube_webmail.prototype.managesieve_seteditraw = function()
 {
-  var id = this.filtersets_list.get_single_selection(),
-    script = this.env.filtersets[id];
+    var id = this.filtersets_list.get_single_selection(),
+        script = this.env.filtersets[id];
 
-  this.load_managesieveframe('_nav=hide&_seteditraw=1&_set=' + urlencode(script), true);
+    this.load_managesieveframe('_nav=hide&_seteditraw=1&_set=' + urlencode(script), true);
 };
 
 // Set add request
 rcube_webmail.prototype.managesieve_setadd = function()
 {
-  this.load_managesieveframe('_nav=hide&_newset=1', true);
+    this.load_managesieveframe('_nav=hide&_newset=1', true);
 };
 
 rcube_webmail.prototype.managesieve_updatelist = function(action, o)
 {
-  this.set_busy(true);
+    this.set_busy(true);
 
-  switch (action) {
+    switch (action) {
     // Delete filter row
-    case 'del':
-      var id = o.id, list = this.filters_list;
+        case 'del':
+            var id = o.id, list = this.filters_list;
 
-      list.remove_row(this.managesieve_rowid(o.id));
-      this.show_contentframe(false);
-      this.reset_filters_list();
+            list.remove_row(this.managesieve_rowid(o.id));
+            this.show_contentframe(false);
+            this.reset_filters_list();
 
-      // filter identifiers changed, fix the list
-      $('tr', this.filters_list.list).each(function() {
-        // remove hidden (deleted) rows
-        if (this.style.display == 'none') {
-          $(this).detach();
-          return;
-        }
+            // filter identifiers changed, fix the list
+            $('tr', this.filters_list.list).each(function() {
+                // remove hidden (deleted) rows
+                if (this.style.display == 'none') {
+                    $(this).detach();
+                    return;
+                }
 
-        var rowid = this.id.substr(6);
+                var rowid = this.id.substr(6);
 
-        // remove all attached events
-        $(this).off();
+                // remove all attached events
+                $(this).off();
 
-        // update row id
-        if (rowid > id) {
-          this.uid = String(rowid - 1);
-          $(this).attr('id', 'rcmrow' + this.uid);
-        }
-      });
-      list.init();
+                // update row id
+                if (rowid > id) {
+                    this.uid = String(rowid - 1);
+                    $(this).attr('id', 'rcmrow' + this.uid);
+                }
+            });
+            list.init();
 
-      break;
+            break;
 
-    // Update filter row
-    case 'update':
-      var i, row = $('#rcmrow'+this.managesieve_rowid(o.id));
+            // Update filter row
+        case 'update':
+            var i, row = $('#rcmrow'+this.managesieve_rowid(o.id));
 
-      if (o.name)
-        $('td', row).text(o.name);
-      if (o.disabled)
-        row.addClass('disabled');
-      else
-        row.removeClass('disabled');
+            if (o.name)
+                $('td', row).text(o.name);
+            if (o.disabled)
+                row.addClass('disabled');
+            else
+                row.removeClass('disabled');
 
-      $('#fenabled', $('iframe').contents()).prop('checked', !o.disabled);
+            $('#fenabled', $('iframe').contents()).prop('checked', !o.disabled);
 
-      break;
+            break;
 
-    // Add filter row to the list
-    case 'add':
-      var list = this.filters_list,
-        row = $('<tr><td class="name"></td></tr>');
+            // Add filter row to the list
+        case 'add':
+            var list = this.filters_list,
+                row = $('<tr><td class="name"></td></tr>');
 
-      $('td', row).text(o.name);
-      row.attr('id', 'rcmrow'+o.id);
-      if (o.disabled)
-        row.addClass('disabled');
+            $('td', row).text(o.name);
+            row.attr('id', 'rcmrow'+o.id);
+            if (o.disabled)
+                row.addClass('disabled');
 
-      list.insert_row(row.get(0));
-      list.highlight_row(o.id);
+            list.insert_row(row.get(0));
+            list.highlight_row(o.id);
 
-      this.enable_command('plugin.managesieve-del', $.inArray('delete_rule', rcmail.env.managesieve_disabled_actions) == -1);
-      this.enable_command('plugin.managesieve-act', true);
+            this.enable_command('plugin.managesieve-del', $.inArray('delete_rule', rcmail.env.managesieve_disabled_actions) == -1);
+            this.enable_command('plugin.managesieve-act', true);
 
-      break;
+            break;
 
-    // Filling rules list
-    case 'list':
-      var i, tr, td, el, list = this.filters_list;
+            // Filling rules list
+        case 'list':
+            var i, tr, td, el, list = this.filters_list;
 
-      if (o.clear)
-        list.clear();
+            if (o.clear)
+                list.clear();
 
-      for (i in o.list) {
-        el = o.list[i];
-        tr = document.createElement('TR');
-        td = document.createElement('TD');
+            for (i in o.list) {
+                el = o.list[i];
+                tr = document.createElement('TR');
+                td = document.createElement('TD');
 
-        $(td).text(el.name);
-        td.className = 'name';
-        tr.id = 'rcmrow' + el.id;
-        if (el['class'])
-            tr.className = el['class'];
-        tr.appendChild(td);
+                $(td).text(el.name);
+                td.className = 'name';
+                tr.id = 'rcmrow' + el.id;
+                if (el['class'])
+                    tr.className = el['class'];
+                tr.appendChild(td);
 
-        list.insert_row(tr);
-      }
+                list.insert_row(tr);
+            }
 
-      if (o.set)
-        list.highlight_row(o.set);
-      else
-        this.enable_command('plugin.managesieve-del', 'plugin.managesieve-act', false);
+            if (o.set)
+                list.highlight_row(o.set);
+            else
+                this.enable_command('plugin.managesieve-del', 'plugin.managesieve-act', false);
 
-      break;
+            break;
 
-    // Activate/Deactivate the set
-    case 'setact':
-      var id = this.managesieve_setid(o.name), row = $('#rcmrow' + id);
-      if (o.active) {
-        if (o.all)
-          $('tr', this.gui_objects.filtersetslist).addClass('disabled');
-        row.removeClass('disabled');
-      }
-      else
-        row.addClass('disabled');
+            // Activate/Deactivate the set
+        case 'setact':
+            var id = this.managesieve_setid(o.name), row = $('#rcmrow' + id);
+            if (o.active) {
+                if (o.all)
+                    $('tr', this.gui_objects.filtersetslist).addClass('disabled');
+                row.removeClass('disabled');
+            }
+            else
+                row.addClass('disabled');
 
-      break;
+            break;
 
-    // Delete set row
-    case 'setdel':
-      var id = this.managesieve_setid(o.name);
+            // Delete set row
+        case 'setdel':
+            var id = this.managesieve_setid(o.name);
 
-      this.filters_list.clear();
-      this.show_contentframe(false);
-      this.enable_command('plugin.managesieve-setdel', 'plugin.managesieve-setact',
-        'plugin.managesieve-setget', 'plugin.managesieve-seteditraw', false);
+            this.filters_list.clear();
+            this.show_contentframe(false);
+            this.enable_command('plugin.managesieve-setdel', 'plugin.managesieve-setact',
+                'plugin.managesieve-setget', 'plugin.managesieve-seteditraw', false);
 
-      this.filtersets_list.remove_row(id, true);
-      delete this.env.filtersets[id];
-      break;
+            this.filtersets_list.remove_row(id, true);
+            delete this.env.filtersets[id];
+            break;
 
-    // Create set row
-    case 'setadd':
-      var id = 'S' + new Date().getTime(),
-        list = this.filtersets_list,
-        row = $('<tr class="disabled"><td class="name"></td></tr>');
+            // Create set row
+        case 'setadd':
+            var id = 'S' + new Date().getTime(),
+                list = this.filtersets_list,
+                row = $('<tr class="disabled"><td class="name"></td></tr>');
 
-      $('td', row).text(o.name);
-      row.attr('id', 'rcmrow'+id);
+            $('td', row).text(o.name);
+            row.attr('id', 'rcmrow'+id);
 
-      this.env.filtersets[id] = o.name;
-      list.insert_row(row.get(0));
+            this.env.filtersets[id] = o.name;
+            list.insert_row(row.get(0));
 
-      // move row into its position on the list
-      if (o.index != list.rowcount-1) {
-        row.detach();
-        var elem = $('tr:visible', list.list).get(o.index);
-        row.insertBefore(elem);
-      }
+            // move row into its position on the list
+            if (o.index != list.rowcount-1) {
+                row.detach();
+                var elem = $('tr:visible', list.list).get(o.index);
+                row.insertBefore(elem);
+            }
 
-      list.select(id);
+            list.select(id);
 
-      // Fix dragging filters over sets list
-      this.managesieve_fixdragend(row);
+            // Fix dragging filters over sets list
+            this.managesieve_fixdragend(row);
 
-      break;
+            break;
 
-    case 'refresh':
-      this.reset_filters_list(true);
-      break;
-  }
+        case 'refresh':
+            this.reset_filters_list(true);
+            break;
+    }
 
-  this.set_busy(false);
+    this.set_busy(false);
 };
 
 // Resets filters list state
 rcube_webmail.prototype.reset_filters_list = function(reload)
 {
-  this.filters_list.clear_selection();
-  this.enable_command('plugin.managesieve-act', 'plugin.managesieve-del', false);
+    this.filters_list.clear_selection();
+    this.enable_command('plugin.managesieve-act', 'plugin.managesieve-del', false);
 
-  if (reload) {
-    var id = this.filtersets_list.get_single_selection();
+    if (reload) {
+        var id = this.filtersets_list.get_single_selection();
 
-    this.filters_list.clear(true);
-    this.managesieve_list(this.env.filtersets[id]);
-  }
+        this.filters_list.clear(true);
+        this.managesieve_list(this.env.filtersets[id]);
+    }
 };
 
 // load filter frame
 rcube_webmail.prototype.load_managesieveframe = function(add_url, reset)
 {
-  if (reset)
-    this.reset_filters_list();
+    if (reset)
+        this.reset_filters_list();
 
-  var target = this.get_frame_window(this.env.contentframe),
-    url = this.url('plugin.managesieve-action', '_framed=1' + (add_url ? ('&' + add_url) : ''));
+    var target = this.get_frame_window(this.env.contentframe),
+        url = this.url('plugin.managesieve-action', '_framed=1' + (add_url ? ('&' + add_url) : ''));
 
-  if (target) {
-    this.location_href(url, target, true);
-  }
+    if (target) {
+        this.location_href(url, target, true);
+    }
 };
 
 // load filter frame
 rcube_webmail.prototype.managesieve_dragstart = function(list)
 {
-  var id = this.filters_list.get_single_selection();
+    var id = this.filters_list.get_single_selection();
 
-  this.drag_active = true;
-  this.drag_filter = id;
+    this.drag_active = true;
+    this.drag_filter = id;
 };
 
 rcube_webmail.prototype.managesieve_dragend = function(e)
 {
-  if (this.drag_active) {
-    if (this.drag_filter_target) {
-      var lock = this.set_busy(true, 'loading');
+    if (this.drag_active) {
+        if (this.drag_filter_target) {
+            var lock = this.set_busy(true, 'loading');
 
-      this.show_contentframe(false);
-      this.http_post('plugin.managesieve-action', '_act=move&_fid='+this.drag_filter
+            this.show_contentframe(false);
+            this.http_post('plugin.managesieve-action', '_act=move&_fid='+this.drag_filter
         +'&_to='+this.drag_filter_target, lock);
+        }
+        this.drag_active = false;
     }
-    this.drag_active = false;
-  }
 };
 
 // Fixes filters dragging over sets list
 // @TODO: to be removed after implementing copying filters
 rcube_webmail.prototype.managesieve_fixdragend = function(elem)
 {
-  var p = this;
-  $(elem).on('mouseup' + ((bw.iphone || bw.ipad) ? ' touchend' : ''), function(e) {
-    if (p.drag_active)
-      p.filters_list.drag_mouse_up(e);
-  });
+    var p = this;
+    $(elem).on('mouseup' + ((bw.iphone || bw.ipad) ? ' touchend' : ''), function(e) {
+        if (p.drag_active)
+            p.filters_list.drag_mouse_up(e);
+    });
 };
 
 rcube_webmail.prototype.managesieve_focus_filter = function(row)
 {
-  var id = row.id.replace(/^rcmrow/, '');
-  if (this.drag_active && id != this.drag_filter) {
-    this.drag_filter_target = id;
-    $(row.obj).addClass(id < this.drag_filter ? 'filtermoveup' : 'filtermovedown');
-  }
+    var id = row.id.replace(/^rcmrow/, '');
+    if (this.drag_active && id != this.drag_filter) {
+        this.drag_filter_target = id;
+        $(row.obj).addClass(id < this.drag_filter ? 'filtermoveup' : 'filtermovedown');
+    }
 };
 
 rcube_webmail.prototype.managesieve_unfocus_filter = function(row)
 {
-  if (this.drag_active) {
-    $(row.obj).removeClass('filtermoveup filtermovedown');
-    this.drag_filter_target = null;
-  }
+    if (this.drag_active) {
+        $(row.obj).removeClass('filtermoveup filtermovedown');
+        this.drag_filter_target = null;
+    }
 };
 
 /*********************************************************/
@@ -489,588 +489,588 @@ rcube_webmail.prototype.managesieve_unfocus_filter = function(row)
 // Form submission
 rcube_webmail.prototype.managesieve_save = function()
 {
-  if (this.env.action == 'plugin.managesieve-vacation') {
-    var data = $(this.gui_objects.sieveform).serialize();
-    this.http_post('plugin.managesieve-vacation', data, this.display_message(this.get_label('managesieve.vacation.saving'), 'loading'));
-    return;
-  }
-
-  if (this.env.action == 'plugin.managesieve-forward') {
-    var data = $(this.gui_objects.sieveform).serialize();
-    this.http_post('plugin.managesieve-forward', data, this.display_message(this.get_label('managesieve.forward.saving'), 'loading'));
-    return;
-  }
-
-  if (this.gui_objects.sieveform) {
-    if (parent.rcmail && parent.rcmail.filters_list && this.gui_objects.sieveform.name != 'filtersetform') {
-      var id = parent.rcmail.filters_list.get_single_selection();
-      if (id != null)
-        this.gui_objects.sieveform.elements['_fid'].value = parent.rcmail.filters_list.rows[id].uid;
+    if (this.env.action == 'plugin.managesieve-vacation') {
+        var data = $(this.gui_objects.sieveform).serialize();
+        this.http_post('plugin.managesieve-vacation', data, this.display_message(this.get_label('managesieve.vacation.saving'), 'loading'));
+        return;
+    }
+
+    if (this.env.action == 'plugin.managesieve-forward') {
+        var data = $(this.gui_objects.sieveform).serialize();
+        this.http_post('plugin.managesieve-forward', data, this.display_message(this.get_label('managesieve.forward.saving'), 'loading'));
+        return;
+    }
+
+    if (this.gui_objects.sieveform) {
+        if (parent.rcmail && parent.rcmail.filters_list && this.gui_objects.sieveform.name != 'filtersetform') {
+            var id = parent.rcmail.filters_list.get_single_selection();
+            if (id != null)
+                this.gui_objects.sieveform.elements['_fid'].value = parent.rcmail.filters_list.rows[id].uid;
+        }
+        this.gui_objects.sieveform.submit();
+    }
+    else if (this.gui_objects.sievesetrawform) {
+        this.gui_objects.sievesetrawform.submit();
     }
-    this.gui_objects.sieveform.submit();
-  }
-  else if (this.gui_objects.sievesetrawform) {
-    this.gui_objects.sievesetrawform.submit();
-  }
 };
 
 // Operations on filters form
 rcube_webmail.prototype.managesieve_ruleadd = function(id)
 {
-  this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid='+id);
+    this.http_post('plugin.managesieve-action', '_act=ruleadd&_rid='+id);
 };
 
 rcube_webmail.prototype.managesieve_rulefill = function(content, id, after)
 {
-  if (content != '') {
+    if (content != '') {
     // create new element
-    var div = $('#rules')[0],
-      row = $('<div>').attr({'class': 'rulerow', id: 'rulerow'+id})
-        .html(content);
+        var div = $('#rules')[0],
+            row = $('<div>').attr({'class': 'rulerow', id: 'rulerow'+id})
+                .html(content);
 
-    this.managesieve_insertrow(div, row, after);
+        this.managesieve_insertrow(div, row, after);
 
-    // initialize smart list inputs
-    $('textarea[data-type="list"]', row).each(function() {
-      smart_field_init(this);
-    });
+        // initialize smart list inputs
+        $('textarea[data-type="list"]', row).each(function() {
+            smart_field_init(this);
+        });
 
-    this.managesieve_formbuttons(div);
-  }
+        this.managesieve_formbuttons(div);
+    }
 };
 
 rcube_webmail.prototype.managesieve_ruledel = function(id)
 {
-  if ($('#ruledel'+id).hasClass('disabled'))
-    return;
+    if ($('#ruledel'+id).hasClass('disabled'))
+        return;
 
-  this.confirm_dialog(this.get_label('managesieve.ruledeleteconfirm'), 'delete', function(e, ref) {
-      var row = document.getElementById('rulerow'+id);
-      row.parentNode.removeChild(row);
-      ref.managesieve_formbuttons(document.getElementById('rules'));
+    this.confirm_dialog(this.get_label('managesieve.ruledeleteconfirm'), 'delete', function(e, ref) {
+        var row = document.getElementById('rulerow'+id);
+        row.parentNode.removeChild(row);
+        ref.managesieve_formbuttons(document.getElementById('rules'));
     });
 };
 
 rcube_webmail.prototype.managesieve_actionadd = function(id)
 {
-  this.http_post('plugin.managesieve-action', '_act=actionadd&_aid='+id);
+    this.http_post('plugin.managesieve-action', '_act=actionadd&_aid='+id);
 };
 
 rcube_webmail.prototype.managesieve_actionfill = function(content, id, after)
 {
-  if (content != '') {
-    var div = $('#actions')[0],
-      row = $('<div>').attr({'class': 'actionrow', id: 'actionrow'+id})
-        .html(content);
+    if (content != '') {
+        var div = $('#actions')[0],
+            row = $('<div>').attr({'class': 'actionrow', id: 'actionrow'+id})
+                .html(content);
 
-    this.managesieve_insertrow(div, row, after);
+        this.managesieve_insertrow(div, row, after);
 
-    // initialize smart list inputs
-    $('textarea[data-type="list"]', row).each(function() {
-      smart_field_init(this);
-    });
+        // initialize smart list inputs
+        $('textarea[data-type="list"]', row).each(function() {
+            smart_field_init(this);
+        });
 
-    this.managesieve_formbuttons(div);
-  }
+        this.managesieve_formbuttons(div);
+    }
 };
 
 rcube_webmail.prototype.managesieve_actiondel = function(id)
 {
-  if ($('#actiondel'+id).hasClass('disabled'))
-    return;
+    if ($('#actiondel'+id).hasClass('disabled'))
+        return;
 
-  this.confirm_dialog(this.get_label('managesieve.actiondeleteconfirm'), 'delete', function(e, ref) {
-      var row = document.getElementById('actionrow'+id);
-      row.parentNode.removeChild(row);
-      ref.managesieve_formbuttons(document.getElementById('actions'));
+    this.confirm_dialog(this.get_label('managesieve.actiondeleteconfirm'), 'delete', function(e, ref) {
+        var row = document.getElementById('actionrow'+id);
+        row.parentNode.removeChild(row);
+        ref.managesieve_formbuttons(document.getElementById('actions'));
     });
 };
 
 // insert rule/action row in specified place on the list
 rcube_webmail.prototype.managesieve_insertrow = function(div, row, after)
 {
-  var node = $('#' + ($(div).attr('id') == 'rules' ? 'rulerow' : 'actionrow')  + after)[0];
+    var node = $('#' + ($(div).attr('id') == 'rules' ? 'rulerow' : 'actionrow')  + after)[0];
 
-  if (node)
-    $(row).insertAfter(node);
-  else
-    $(div).append(row);
+    if (node)
+        $(row).insertAfter(node);
+    else
+        $(div).append(row);
 
-  this.triggerEvent('managesieve.insertrow', {obj: row});
+    this.triggerEvent('managesieve.insertrow', {obj: row});
 };
 
 // update Delete buttons status
 rcube_webmail.prototype.managesieve_formbuttons = function(div)
 {
-  var buttons = $('a.delete', div);
+    var buttons = $('a.delete', div);
 
-  buttons.removeClass('disabled');
-  if (buttons.length == 1)
-    buttons.addClass('disabled');
+    buttons.removeClass('disabled');
+    if (buttons.length == 1)
+        buttons.addClass('disabled');
 };
 
 // update vacation addresses field with user identities
 rcube_webmail.prototype.managesieve_vacation_addresses = function(id)
 {
-  var lock = this.set_busy(true, 'loading');
-  this.http_post('plugin.managesieve-action', {_act: 'addresses', _aid: id}, lock);
+    var lock = this.set_busy(true, 'loading');
+    this.http_post('plugin.managesieve-action', {_act: 'addresses', _aid: id}, lock);
 };
 
 // update vacation addresses field with user identities
 rcube_webmail.prototype.managesieve_vacation_addresses_update = function(id, addresses)
 {
-  var field = $('#vacation_addresses,#action_addresses' + (id || ''));
-  smart_field_reset(field.get(0), addresses);
+    var field = $('#vacation_addresses,#action_addresses' + (id || ''));
+    smart_field_reset(field.get(0), addresses);
 };
 
 function rule_header_select(id)
 {
-  var is_header,
-    obj = document.getElementById('header' + id),
-    size = document.getElementById('rule_size' + id),
-    spamtest = document.getElementById('rule_spamtest' + id),
-    msg = document.getElementById('rule_message' + id),
-    op = document.getElementById('rule_op' + id),
-    header = document.getElementById('custom_header' + id + '_list'),
-    custstr = document.getElementById('custom_var' + id + '_list'),
-    mod = document.getElementById('rule_mod' + id),
-    trans = document.getElementById('rule_trans' + id),
-    comp = document.getElementById('rule_comp' + id),
-    mime = document.getElementById('rule_mime' + id),
-    mime_part = document.getElementById('rule_mime_part' + id),
-    datepart = document.getElementById('rule_date_part' + id),
-    dateheader = document.getElementById('rule_date_header_div' + id),
-    rule = $('#rule_op' + id),
-    h = obj.value,
-    set = [op, header, custstr, mod, trans, comp, size, mime, mime_part];
+    var is_header,
+        obj = document.getElementById('header' + id),
+        size = document.getElementById('rule_size' + id),
+        spamtest = document.getElementById('rule_spamtest' + id),
+        msg = document.getElementById('rule_message' + id),
+        op = document.getElementById('rule_op' + id),
+        header = document.getElementById('custom_header' + id + '_list'),
+        custstr = document.getElementById('custom_var' + id + '_list'),
+        mod = document.getElementById('rule_mod' + id),
+        trans = document.getElementById('rule_trans' + id),
+        comp = document.getElementById('rule_comp' + id),
+        mime = document.getElementById('rule_mime' + id),
+        mime_part = document.getElementById('rule_mime_part' + id),
+        datepart = document.getElementById('rule_date_part' + id),
+        dateheader = document.getElementById('rule_date_header_div' + id),
+        rule = $('#rule_op' + id),
+        h = obj.value,
+        set = [op, header, custstr, mod, trans, comp, size, mime, mime_part];
 
-  if (h == 'size') {
-    if (msg) set.push(msg);
-    $.each(set, function() { if (this != window) this.style.display = 'none'; });
+    if (h == 'size') {
+        if (msg) set.push(msg);
+        $.each(set, function() { if (this != window) this.style.display = 'none'; });
+        if (spamtest)
+            spamtest.style.display = 'none';
+        size.style.display = '';
+    }
+    else if (h == 'spamtest') {
+        if (msg) set.push(msg);
+        $.each(set, function() { if (this != window) this.style.display = 'none'; });
+        if (spamtest)
+            spamtest.style.display = '';
+        size.style.display = 'none';
+    }
+    else if (h == 'message' && msg) {
+        $.each(set, function() { if (this != window)  this.style.display = 'none'; });
+        msg.style.display = '';
+    }
+    else {
+        is_header = h != 'body' && h != 'currentdate' && h != 'date' && h != 'string';
+        header.style.display = h != '...' ? 'none' : '';
+        custstr.style.display = h != 'string' ? 'none' : '';
+        size.style.display = 'none';
+        op.style.display = '';
+        comp.style.display = '';
+        mod.style.display = is_header ? '' : 'none';
+        trans.style.display = h == 'body' ? '' : 'none';
+        if (spamtest)
+            spamtest.style.display = 'none';
+        if (mime)
+            mime.style.display =  is_header ? '' : 'none';
+        if (mime_part)
+            mime_part.style.display = is_header ? '' : 'none';
+        if (msg)
+            msg.style.display = h == 'message' ? '' : 'none';
+    }
+
+    if (datepart)
+        datepart.style.display = h == 'currentdate' || h == 'date' ? 'inline' : 'none';
+    if (dateheader)
+        dateheader.style.display = h == 'date' ? '' : 'none';
+
+    $('[value="exists"],[value="notexists"]', rule).prop('disabled', h == 'string');
+    if (!rule.val())
+        rule.val('contains');
+
+    rule_op_select(op, id, h);
+    rule_mod_select(id, h, !is_header);
+    rule_mime_select(id);
     if (spamtest)
-      spamtest.style.display = 'none';
-    size.style.display = '';
-  }
-  else if (h == 'spamtest') {
-    if (msg) set.push(msg);
-    $.each(set, function() { if (this != window) this.style.display = 'none'; });
-    if (spamtest)
-      spamtest.style.display = '';
-    size.style.display = 'none';
-  }
-  else if (h == 'message' && msg) {
-    $.each(set, function() { if (this != window)  this.style.display = 'none'; });
-    msg.style.display = '';
-  }
-  else {
-    is_header = h != 'body' && h != 'currentdate' && h != 'date' && h != 'string';
-    header.style.display = h != '...' ? 'none' : '';
-    custstr.style.display = h != 'string' ? 'none' : '';
-    size.style.display = 'none';
-    op.style.display = '';
-    comp.style.display = '';
-    mod.style.display = is_header ? '' : 'none';
-    trans.style.display = h == 'body' ? '' : 'none';
-    if (spamtest)
-      spamtest.style.display = 'none';
-    if (mime)
-      mime.style.display =  is_header ? '' : 'none';
-    if (mime_part)
-      mime_part.style.display = is_header ? '' : 'none';
-    if (msg)
-      msg.style.display = h == 'message' ? '' : 'none';
-  }
+        rule_spamtest_select(id);
 
-  if (datepart)
-    datepart.style.display = h == 'currentdate' || h == 'date' ? 'inline' : 'none';
-  if (dateheader)
-    dateheader.style.display = h == 'date' ? '' : 'none';
-
-  $('[value="exists"],[value="notexists"]', rule).prop('disabled', h == 'string');
-  if (!rule.val())
-    rule.val('contains');
-
-  rule_op_select(op, id, h);
-  rule_mod_select(id, h, !is_header);
-  rule_mime_select(id);
-  if (spamtest)
-    rule_spamtest_select(id);
-
-  obj.style.width = h == '...' ? '40px' : '';
+    obj.style.width = h == '...' ? '40px' : '';
 };
 
 function rule_op_select(obj, id, header)
 {
-  var target = document.getElementById('rule_target' + id + '_list');
+    var target = document.getElementById('rule_target' + id + '_list');
 
-  if (!header)
-    header = document.getElementById('header' + id).value;
+    if (!header)
+        header = document.getElementById('header' + id).value;
 
-  target.style.display = obj.value.match(/^(exists|notexists)$/) || header.match(/^(size|spamtest|message)$/) ? 'none' : '';
+    target.style.display = obj.value.match(/^(exists|notexists)$/) || header.match(/^(size|spamtest|message)$/) ? 'none' : '';
 };
 
 function rule_trans_select(id)
 {
-  var obj = document.getElementById('rule_trans_op' + id),
-    target = document.getElementById('rule_trans_type' + id);
+    var obj = document.getElementById('rule_trans_op' + id),
+        target = document.getElementById('rule_trans_type' + id);
 
-  target.style.display = obj.value != 'content' ? 'none' : 'inline';
+    target.style.display = obj.value != 'content' ? 'none' : 'inline';
 };
 
 function rule_mod_select(id, header, reset)
 {
-  var obj = document.getElementById('rule_mod_op' + id),
-    target = document.getElementById('rule_mod_type' + id),
-    duplicate = document.getElementById('rule_duplicate_div' + id),
-    index = document.getElementById('rule_index_div' + id);
+    var obj = document.getElementById('rule_mod_op' + id),
+        target = document.getElementById('rule_mod_type' + id),
+        duplicate = document.getElementById('rule_duplicate_div' + id),
+        index = document.getElementById('rule_index_div' + id);
 
-  if (reset)
-    obj.value = '';
+    if (reset)
+        obj.value = '';
 
-  if (!header)
-    header = document.getElementById('header' + id).value;
+    if (!header)
+        header = document.getElementById('header' + id).value;
 
-  target.style.display = obj.value != 'address' && obj.value != 'envelope' ? 'none' : '';
+    target.style.display = obj.value != 'address' && obj.value != 'envelope' ? 'none' : '';
 
-  if (index)
-    index.style.display = !header.match(/^(body|currentdate|size|spamtest|message|string)$/) && obj.value != 'envelope'  ? '' : 'none';
+    if (index)
+        index.style.display = !header.match(/^(body|currentdate|size|spamtest|message|string)$/) && obj.value != 'envelope'  ? '' : 'none';
 
-  if (duplicate)
-    duplicate.style.display = header == 'message' ? '' : 'none';
+    if (duplicate)
+        duplicate.style.display = header == 'message' ? '' : 'none';
 };
 
 function rule_spamtest_select(id)
 {
-  var obj = document.getElementById('rule_spamtest_op' + id),
-    target = document.getElementById('rule_spamtest_target' + id);
+    var obj = document.getElementById('rule_spamtest_op' + id),
+        target = document.getElementById('rule_spamtest_target' + id);
 
-  target.style.display = obj.value ? '' : 'none';
-  $(obj)[obj.value ? 'removeClass' : 'addClass']('rounded-right');
+    target.style.display = obj.value ? '' : 'none';
+    $(obj)[obj.value ? 'removeClass' : 'addClass']('rounded-right');
 };
 
 function rule_join_radio(value)
 {
-  $('#rules').css('display', value == 'any' ? 'none' : 'block');
+    $('#rules').css('display', value == 'any' ? 'none' : 'block');
 };
 
 function rule_adv_switch(id, elem)
 {
-  var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced'+id);
+    var elem = $(elem), enabled = elem.hasClass('hide'), adv = $('#rule_advanced'+id);
 
-  if (enabled) {
-    adv.get(0).style.display = 'none';
-    elem.removeClass('hide').addClass('show');
-  }
-  else {
-    adv.get(0).style.display = '';
-    elem.removeClass('show').addClass('hide');
-  }
+    if (enabled) {
+        adv.get(0).style.display = 'none';
+        elem.removeClass('hide').addClass('show');
+    }
+    else {
+        adv.get(0).style.display = '';
+        elem.removeClass('show').addClass('hide');
+    }
 };
 
 function rule_mime_select(id)
 {
-  var elem = $('#rule_mime_type' + id),
-    param_elem = $('#rule_mime_param' + id + '_list');
+    var elem = $('#rule_mime_type' + id),
+        param_elem = $('#rule_mime_param' + id + '_list');
 
-  if (param_elem.length)
-    param_elem[0].style.display = elem.val() == 'param' ? '' : 'none';
+    if (param_elem.length)
+        param_elem[0].style.display = elem.val() == 'param' ? '' : 'none';
 };
 
 function action_type_select(id)
 {
-  var obj = document.getElementById('action_type' + id),
-    v = obj.value, enabled = {},
-    elems = {
-      mailbox: document.getElementById('action_mailbox' + id),
-      target: document.getElementById('redirect_target' + id),
-      target_area: document.getElementById('action_target_area' + id),
-      flags: document.getElementById('action_flags' + id),
-      vacation: document.getElementById('action_vacation' + id),
-      forward: document.getElementById('action_forward' + id),
-      set: document.getElementById('action_set' + id),
-      notify: document.getElementById('action_notify' + id),
-      addheader: document.getElementById('action_addheader' + id),
-      deleteheader: document.getElementById('action_deleteheader' + id)
-    };
+    var obj = document.getElementById('action_type' + id),
+        v = obj.value, enabled = {},
+        elems = {
+            mailbox: document.getElementById('action_mailbox' + id),
+            target: document.getElementById('redirect_target' + id),
+            target_area: document.getElementById('action_target_area' + id),
+            flags: document.getElementById('action_flags' + id),
+            vacation: document.getElementById('action_vacation' + id),
+            forward: document.getElementById('action_forward' + id),
+            set: document.getElementById('action_set' + id),
+            notify: document.getElementById('action_notify' + id),
+            addheader: document.getElementById('action_addheader' + id),
+            deleteheader: document.getElementById('action_deleteheader' + id)
+        };
 
-  if (v == 'fileinto' || v == 'fileinto_copy') {
-    enabled.mailbox = 1;
-  }
-  else if (v == 'redirect' || v == 'redirect_copy') {
-    enabled.target = 1;
-  }
-  else if (v.match(/^reject|ereject$/)) {
-    enabled.target_area = 1;
-  }
-  else if (v.match(/^(add|set|remove)flag$/)) {
-    enabled.flags = 1;
-  }
-  else if (v.match(/^(vacation|forward|set|notify|addheader|deleteheader)$/)) {
-    enabled[v] = 1;
-  }
+    if (v == 'fileinto' || v == 'fileinto_copy') {
+        enabled.mailbox = 1;
+    }
+    else if (v == 'redirect' || v == 'redirect_copy') {
+        enabled.target = 1;
+    }
+    else if (v.match(/^reject|ereject$/)) {
+        enabled.target_area = 1;
+    }
+    else if (v.match(/^(add|set|remove)flag$/)) {
+        enabled.flags = 1;
+    }
+    else if (v.match(/^(vacation|forward|set|notify|addheader|deleteheader)$/)) {
+        enabled[v] = 1;
+    }
 
-  for (var x in elems) {
-    if (elems[x])
-      elems[x].style.display = !enabled[x] ? 'none' : '';
-  }
+    for (var x in elems) {
+        if (elems[x])
+            elems[x].style.display = !enabled[x] ? 'none' : '';
+    }
 };
 
 function vacation_action_select()
 {
-  var selected = $('#vacation_action').val();
+    var selected = $('#vacation_action').val();
 
-  $('#action_target_span')[selected == 'discard' || selected == 'keep' ? 'hide' : 'show']();
+    $('#action_target_span')[selected == 'discard' || selected == 'keep' ? 'hide' : 'show']();
 };
 
 // Initializes smart list input
 function smart_field_init(field)
 {
-  if (window.UI && UI.smart_field_init)
-    return UI.smart_field_init(field);
+    if (window.UI && UI.smart_field_init)
+        return UI.smart_field_init(field);
 
-  var id = field.id + '_list',
-    area = $('<span class="listarea"></span>'),
-    list = field.value ? field.value.split("\n") : [''];
+    var id = field.id + '_list',
+        area = $('<span class="listarea"></span>'),
+        list = field.value ? field.value.split("\n") : [''];
 
-  if ($('#'+id).length)
-    return;
+    if ($('#'+id).length)
+        return;
 
-  // add input rows
-  $.each(list, function(i, v) {
-    area.append(smart_field_row(v, i, field));
-  });
+    // add input rows
+    $.each(list, function(i, v) {
+        area.append(smart_field_row(v, i, field));
+    });
 
-  area.attr('id', id);
-  field = $(field);
+    area.attr('id', id);
+    field = $(field);
 
-  if (field.attr('disabled'))
-    area.hide();
-  // disable the original field anyway, we don't want it in POST
-  else
-    field.prop('disabled', true);
+    if (field.attr('disabled'))
+        area.hide();
+    // disable the original field anyway, we don't want it in POST
+    else
+        field.prop('disabled', true);
 
-  if (field.data('hidden'))
-    area.hide();
+    if (field.data('hidden'))
+        area.hide();
 
-  field.after(area);
+    field.after(area);
 
-  if (field.hasClass('error')) {
-    area.addClass('error');
-    rcmail.managesieve_tip_register([[id, field.data('tip-class'), field.data('tip-msg')]]);
-  }
+    if (field.hasClass('error')) {
+        area.addClass('error');
+        rcmail.managesieve_tip_register([[id, field.data('tip-class'), field.data('tip-msg')]]);
+    }
 };
 
 function smart_field_row(value, idx, field)
 {
-  // build row element content
-  var input, content = '<span class="listelement">'
+    // build row element content
+    var input, content = '<span class="listelement">'
       + '<span class="reset"></span><input type="text"></span>',
-    elem = $(content),
-    attrs = {
-      value: value,
-      name: field.name + '[]',
-      size: $(field).data('size'),
-      title: field.title,
-      placeholder: $(field).attr('placeholder')
-    };
+        elem = $(content),
+        attrs = {
+            value: value,
+            name: field.name + '[]',
+            size: $(field).data('size'),
+            title: field.title,
+            placeholder: $(field).attr('placeholder')
+        };
 
-  input = elem.find('input').attr(attrs).keydown(function(e) {
-    var input = $(this);
+    input = elem.find('input').attr(attrs).keydown(function(e) {
+        var input = $(this);
 
-    // element creation event (on Enter)
-    if (e.which == 13) {
-      var elem = smart_field_row('', (new Date()).getTime(), field);
+        // element creation event (on Enter)
+        if (e.which == 13) {
+            var elem = smart_field_row('', (new Date()).getTime(), field);
 
-      input.parent().after(elem);
-      $('input', elem).focus();
-    }
-    // backspace or delete: remove input, focus previous one
-    else if ((e.which == 8 || e.which == 46) && input.val() == '') {
+            input.parent().after(elem);
+            $('input', elem).focus();
+        }
+        // backspace or delete: remove input, focus previous one
+        else if ((e.which == 8 || e.which == 46) && input.val() == '') {
 
-      var parent = input.parent(), siblings = parent.parent().children();
+            var parent = input.parent(), siblings = parent.parent().children();
 
-      if (siblings.length > 1) {
-        if (parent.prev().length)
-          parent.prev().children('input').focus();
+            if (siblings.length > 1) {
+                if (parent.prev().length)
+                    parent.prev().children('input').focus();
+                else
+                    parent.next().children('input').focus();
+
+                parent.remove();
+                return false;
+            }
+        }
+    });
+
+    // element deletion event
+    $('span[class="reset"]', elem).click(function() {
+        var span = $(this.parentNode);
+
+        if (span.parent().children().length > 1)
+            span.remove();
         else
-          parent.next().children('input').focus();
+            $('input', span).val('').focus();
+    });
 
-        parent.remove();
-        return false;
-      }
-    }
-  });
-
-  // element deletion event
-  $('span[class="reset"]', elem).click(function() {
-    var span = $(this.parentNode);
-
-    if (span.parent().children().length > 1)
-      span.remove();
-    else
-      $('input', span).val('').focus();
-  });
-
-  return elem;
+    return elem;
 }
 
 // Reset and fill the smart list input with new data
 function smart_field_reset(field, data)
 {
-  if (window.UI && UI.smart_field_reset)
-    return UI.smart_field_reset(field, data);
+    if (window.UI && UI.smart_field_reset)
+        return UI.smart_field_reset(field, data);
 
-  var id = field.id + '_list',
-    list = data.length ? data : [''];
+    var id = field.id + '_list',
+        list = data.length ? data : [''];
     area = $('#' + id);
 
-  area.empty();
+    area.empty();
 
-  // add input rows
-  $.each(list, function(i, v) {
-    area.append(smart_field_row(v, i, field));
-  });
+    // add input rows
+    $.each(list, function(i, v) {
+        area.append(smart_field_row(v, i, field));
+    });
 }
 
 // Register onmouse(leave/enter) events for tips on specified form element
 rcube_webmail.prototype.managesieve_tip_register = function(tips)
 {
-  if (window.UI && UI.form_errors)
-    return UI.form_errors(tips);
+    if (window.UI && UI.form_errors)
+        return UI.form_errors(tips);
 
-  var n, framed = parent.rcmail,
-    tip = framed ? parent.rcmail.env.ms_tip_layer : rcmail.env.ms_tip_layer;
+    var n, framed = parent.rcmail,
+        tip = framed ? parent.rcmail.env.ms_tip_layer : rcmail.env.ms_tip_layer;
 
-  for (n in tips) {
-    $('#'+tips[n][0])
-      .data('tip-class', tips[n][1])
-      .data('tip-msg', tips[n][2])
-      .mouseleave(function(e) { tip.hide(); })
-      .mouseenter(function(e) {
-        var elem = $(this),
-          offset = elem.offset(),
-          left = offset.left,
-          top = offset.top - 12,
-          minwidth = elem.width(),
-          span = $('<span>').addClass(elem.data('tip-class')).text(elem.data('tip-msg'));
+    for (n in tips) {
+        $('#'+tips[n][0])
+            .data('tip-class', tips[n][1])
+            .data('tip-msg', tips[n][2])
+            .mouseleave(function(e) { tip.hide(); })
+            .mouseenter(function(e) {
+                var elem = $(this),
+                    offset = elem.offset(),
+                    left = offset.left,
+                    top = offset.top - 12,
+                    minwidth = elem.width(),
+                    span = $('<span>').addClass(elem.data('tip-class')).text(elem.data('tip-msg'));
 
-        if (framed) {
-          offset = $((rcmail.env.task == 'mail'  ? '#sievefilterform > iframe' : '#filter-box'), parent.document).offset();
-          top  += offset.top;
-          left += offset.left;
-        }
+                if (framed) {
+                    offset = $((rcmail.env.task == 'mail'  ? '#sievefilterform > iframe' : '#filter-box'), parent.document).offset();
+                    top  += offset.top;
+                    left += offset.left;
+                }
 
-        tip.html('').append(span);
-        top -= tip.height();
+                tip.html('').append(span);
+                top -= tip.height();
 
-        tip.css({left: left, top: top, minWidth: (minwidth-2) + 'px'}).show();
-      });
-  }
+                tip.css({left: left, top: top, minWidth: (minwidth-2) + 'px'}).show();
+            });
+    }
 };
 
 // format time string
 function sieve_formattime(hour, minutes)
 {
-  var i, c, h, time = '', format = rcmail.env.time_format || 'H:i';
+    var i, c, h, time = '', format = rcmail.env.time_format || 'H:i';
 
-  for (i=0; i<format.length; i++) {
-    c = format.charAt(i);
-    switch (c) {
-      case 'a': time += hour >= 12 ? 'pm' : 'am'; break;
-      case 'A': time += hour >= 12 ? 'PM' : 'AM'; break;
-      case 'g':
-      case 'h':
-        h = hour == 0 ? 12 : hour > 12 ? hour - 12 : hour;
-        time += (c == 'h' && hour < 10 ? '0' : '') + hour;
-        break;
-      case 'G': time += hour; break;
-      case 'H': time += (hour < 10 ? '0' : '') + hour; break;
-      case 'i': time += (minutes < 10 ? '0' : '') + minutes; break;
-      case 's': time += '00';
-      default: time += c;
+    for (i=0; i<format.length; i++) {
+        c = format.charAt(i);
+        switch (c) {
+            case 'a': time += hour >= 12 ? 'pm' : 'am'; break;
+            case 'A': time += hour >= 12 ? 'PM' : 'AM'; break;
+            case 'g':
+            case 'h':
+                h = hour == 0 ? 12 : hour > 12 ? hour - 12 : hour;
+                time += (c == 'h' && hour < 10 ? '0' : '') + hour;
+                break;
+            case 'G': time += hour; break;
+            case 'H': time += (hour < 10 ? '0' : '') + hour; break;
+            case 'i': time += (minutes < 10 ? '0' : '') + minutes; break;
+            case 's': time += '00';
+            default: time += c;
+        }
     }
-  }
 
-  return time;
+    return time;
 }
 
 function sieve_form_init()
 {
-  var form = rcmail.gui_objects.sieveform;
+    var form = rcmail.gui_objects.sieveform;
 
-  // resize dialog window
-  if (rcmail.env.action == 'plugin.managesieve' && rcmail.env.task == 'mail') {
-    parent.rcmail.managesieve_dialog_resize(form);
-  }
-
-  $('input[type="text"]', form).first().focus();
-
-  // initialize smart list inputs
-  $('textarea[data-type="list"]', form).each(function() {
-    smart_field_init(this);
-  });
-
-  // initialize rules form(s)
-  $('[name^="_header"]', form).each(function() {
-    if (/([0-9]+)$/.test(this.id)) {
-      rule_header_select(RegExp.$1);
+    // resize dialog window
+    if (rcmail.env.action == 'plugin.managesieve' && rcmail.env.task == 'mail') {
+        parent.rcmail.managesieve_dialog_resize(form);
     }
-  });
 
-  // enable date pickers on date fields
-  if ($.datepicker && rcmail.env.date_format) {
-    $.datepicker.setDefaults({
-      dateFormat: rcmail.env.date_format,
-      changeMonth: true,
-      showOtherMonths: true,
-      selectOtherMonths: true,
-      onSelect: function(dateText) { $(this).focus().val(dateText); }
+    $('input[type="text"]', form).first().focus();
+
+    // initialize smart list inputs
+    $('textarea[data-type="list"]', form).each(function() {
+        smart_field_init(this);
     });
-    $('input.datepicker').datepicker();
-  }
 
-  // configure drop-down menu on time input fields based on jquery UI autocomplete
-  $('#vacation_timefrom, #vacation_timeto')
-    .attr('autocomplete', "off")
-    .autocomplete({
-      delay: 100,
-      minLength: 1,
-      source: function(p, callback) {
-        var h, result = [];
-        for (h = 0; h < 24; h++)
-          result.push(sieve_formattime(h, 0));
-        result.push(sieve_formattime(23, 59));
+    // initialize rules form(s)
+    $('[name^="_header"]', form).each(function() {
+        if (/([0-9]+)$/.test(this.id)) {
+            rule_header_select(RegExp.$1);
+        }
+    });
 
-        return callback(result);
-      },
-      open: function(event, ui) {
-        // scroll to current time
-        var $this = $(this), val = $this.val(),
-          widget = $this.autocomplete('widget').css('width', '10em'),
-          menu = $this.data('ui-autocomplete').menu;
-
-        if (val && val.length)
-          widget.children().each(function() {
-            var li = $(this);
-            if (li.text().indexOf(val) == 0)
-              menu._scrollIntoView(li);
-          });
-      },
-      select: function(event, ui) {
-        $(this).val(ui.item.value);
-        return false;
-      }
-    })
-    .click(function() {  // show drop-down upon clicks
-      $(this).autocomplete('search', $(this).val() || ' ');
-    })
-
-  // display advanced controls when contain errors
-  $('input.error').each(function() {
-    if (String(this.id).match(/([0-9]+)$/)) {
-      $('#ruleadv' + RegExp.$1 + '.show').click();
+    // enable date pickers on date fields
+    if ($.datepicker && rcmail.env.date_format) {
+        $.datepicker.setDefaults({
+            dateFormat: rcmail.env.date_format,
+            changeMonth: true,
+            showOtherMonths: true,
+            selectOtherMonths: true,
+            onSelect: function(dateText) { $(this).focus().val(dateText); }
+        });
+        $('input.datepicker').datepicker();
     }
-  });
+
+    // configure drop-down menu on time input fields based on jquery UI autocomplete
+    $('#vacation_timefrom, #vacation_timeto')
+        .attr('autocomplete', "off")
+        .autocomplete({
+            delay: 100,
+            minLength: 1,
+            source: function(p, callback) {
+                var h, result = [];
+                for (h = 0; h < 24; h++)
+                    result.push(sieve_formattime(h, 0));
+                result.push(sieve_formattime(23, 59));
+
+                return callback(result);
+            },
+            open: function(event, ui) {
+                // scroll to current time
+                var $this = $(this), val = $this.val(),
+                    widget = $this.autocomplete('widget').css('width', '10em'),
+                    menu = $this.data('ui-autocomplete').menu;
+
+                if (val && val.length)
+                    widget.children().each(function() {
+                        var li = $(this);
+                        if (li.text().indexOf(val) == 0)
+                            menu._scrollIntoView(li);
+                    });
+            },
+            select: function(event, ui) {
+                $(this).val(ui.item.value);
+                return false;
+            }
+        })
+        .click(function() {  // show drop-down upon clicks
+            $(this).autocomplete('search', $(this).val() || ' ');
+        });
+
+    // display advanced controls when contain errors
+    $('input.error').each(function() {
+        if (String(this.id).match(/([0-9]+)$/)) {
+            $('#ruleadv' + RegExp.$1 + '.show').click();
+        }
+    });
 }
 
 /*********************************************************/
@@ -1081,43 +1081,43 @@ var cmeditor;
 
 function cmCreateErrorElem(msg)
 {
-  var marker = document.createElement("div");
-  marker.style.color = "#822";
-  marker.innerHTML = "●";
-  marker.title = msg;
+    var marker = document.createElement("div");
+    marker.style.color = "#822";
+    marker.innerHTML = "●";
+    marker.title = msg;
 
-  return marker;
+    return marker;
 }
 
 function cmScrollToError()
 {
-  var line = $('.CodeMirror-lines .line-error'),
-    scroll = $('.CodeMirror-scroll'),
-    h = line.parent();
+    var line = $('.CodeMirror-lines .line-error'),
+        scroll = $('.CodeMirror-scroll'),
+        h = line.parent();
 
-  scroll.scrollTop(line.offset().top - scroll.offset().top - Math.round(scroll.height()/2));
+    scroll.scrollTop(line.offset().top - scroll.offset().top - Math.round(scroll.height()/2));
 }
 
 function sieve_raw_editor_init()
 {
-  var textArea = document.getElementById('rawfiltersettxt');
-  if (textArea && !cmeditor) {
-    cmeditor = CodeMirror.fromTextArea(textArea, {
-      mode: 'sieve',
-      lineNumbers: true,
-      gutters: ["CodeMirror-linenumbers", "errorGutter"],
-      styleActiveLine: true
-    });
+    var textArea = document.getElementById('rawfiltersettxt');
+    if (textArea && !cmeditor) {
+        cmeditor = CodeMirror.fromTextArea(textArea, {
+            mode: 'sieve',
+            lineNumbers: true,
+            gutters: ["CodeMirror-linenumbers", "errorGutter"],
+            styleActiveLine: true
+        });
 
-    // fetching errors from environment and setting the line background
-    // and a gutter element with the error message accordingly
-    $.each(rcmail.env.sieve_errors || [], function(i, err) {
-      var lineNo = Number(err.line) - 1;
-      cmeditor.addLineClass(lineNo, 'background', 'line-error');
-      cmeditor.setGutterMarker(lineNo, 'errorGutter', cmCreateErrorElem(err.msg));
-      if (!i) cmScrollToError();
-    });
-  }
+        // fetching errors from environment and setting the line background
+        // and a gutter element with the error message accordingly
+        $.each(rcmail.env.sieve_errors || [], function(i, err) {
+            var lineNo = Number(err.line) - 1;
+            cmeditor.addLineClass(lineNo, 'background', 'line-error');
+            cmeditor.setGutterMarker(lineNo, 'errorGutter', cmCreateErrorElem(err.msg));
+            if (!i) cmScrollToError();
+        });
+    }
 }
 
 
@@ -1127,97 +1127,97 @@ function sieve_raw_editor_init()
 
 rcube_webmail.prototype.managesieve_create = function(force)
 {
-  if (!force && this.env.action != 'show') {
-    var uid = this.message_list.get_single_selection(),
-      lock = this.set_busy(true, 'loading');
+    if (!force && this.env.action != 'show') {
+        var uid = this.message_list.get_single_selection(),
+            lock = this.set_busy(true, 'loading');
 
-    this.http_post('plugin.managesieve-action', {_uid: uid}, lock);
-    return;
-  }
-
-  if (!this.env.sieve_headers || !this.env.sieve_headers.length)
-    return;
-
-  var i, buttons = {},
-    title = this.get_label('managesieve.newfilter'),
-    dialog = $('<div id="sievefilterform" class="propform"></div>'),
-    props = {minWidth: 600, minHeight: 250, height: 300};
-
-
-  // build dialog window content
-  dialog.append($('<fieldset>')
-    .append($('<legend>').text(this.get_label('managesieve.usedata')))
-    .append($('<ul class="proplist">'))
-  );
-
-  $.each(this.env.sieve_headers, function(i, v) {
-    var attr = {type: 'checkbox', name: 'headers[]', id: 'sievehdr' + i, value: i,  checked: v[2] !== false},
-      label = v[0] + ': ' + v[1];
-
-    $('ul', dialog).append($('<li>')
-      .append($('<input>').attr(attr))
-      .append($('<label>').attr('for', 'sievehdr' + i).text(label))
-    );
-  });
-
-  // [Next Step] button action
-  buttons[this.get_label('managesieve.nextstep')] = function () {
-    // check if there's at least one checkbox checked
-    var hdrs = $('input[name="headers[]"]:checked', dialog);
-    if (!hdrs.length) {
-      rcmail.alert_dialog(rcmail.get_label('managesieve.nodata'));
-      return;
+        this.http_post('plugin.managesieve-action', {_uid: uid}, lock);
+        return;
     }
 
-    // build frame URL
-    var url = rcmail.get_task_url('mail');
-    url = rcmail.add_url(url, '_action', 'plugin.managesieve');
-    url = rcmail.add_url(url, '_framed', 1);
+    if (!this.env.sieve_headers || !this.env.sieve_headers.length)
+        return;
 
-    hdrs.map(function() {
-      var val = rcmail.env.sieve_headers[this.value];
-      url = rcmail.add_url(url, 'r['+this.value+']', val[0]+':'+val[1]);
+    var i, buttons = {},
+        title = this.get_label('managesieve.newfilter'),
+        dialog = $('<div id="sievefilterform" class="propform"></div>'),
+        props = {minWidth: 600, minHeight: 250, height: 300};
+
+
+    // build dialog window content
+    dialog.append($('<fieldset>')
+        .append($('<legend>').text(this.get_label('managesieve.usedata')))
+        .append($('<ul class="proplist">'))
+    );
+
+    $.each(this.env.sieve_headers, function(i, v) {
+        var attr = {type: 'checkbox', name: 'headers[]', id: 'sievehdr' + i, value: i,  checked: v[2] !== false},
+            label = v[0] + ': ' + v[1];
+
+        $('ul', dialog).append($('<li>')
+            .append($('<input>').attr(attr))
+            .append($('<label>').attr('for', 'sievehdr' + i).text(label))
+        );
     });
 
-    // load form in the iframe
-    var buttons = {}, iframe = $('<iframe>').attr({src: url, frameborder: 0});
+    // [Next Step] button action
+    buttons[this.get_label('managesieve.nextstep')] = function () {
+    // check if there's at least one checkbox checked
+        var hdrs = $('input[name="headers[]"]:checked', dialog);
+        if (!hdrs.length) {
+            rcmail.alert_dialog(rcmail.get_label('managesieve.nodata'));
+            return;
+        }
 
-    // Change [Next Step] button with [Save] button
-    buttons[rcmail.get_label('save')] = function() {
-      var win = $('iframe', dialog).get(0).contentWindow;
-      win.rcmail.managesieve_save();
+        // build frame URL
+        var url = rcmail.get_task_url('mail');
+        url = rcmail.add_url(url, '_action', 'plugin.managesieve');
+        url = rcmail.add_url(url, '_framed', 1);
+
+        hdrs.map(function() {
+            var val = rcmail.env.sieve_headers[this.value];
+            url = rcmail.add_url(url, 'r['+this.value+']', val[0]+':'+val[1]);
+        });
+
+        // load form in the iframe
+        var buttons = {}, iframe = $('<iframe>').attr({src: url, frameborder: 0});
+
+        // Change [Next Step] button with [Save] button
+        buttons[rcmail.get_label('save')] = function() {
+            var win = $('iframe', dialog).get(0).contentWindow;
+            win.rcmail.managesieve_save();
+        };
+        buttons[rcmail.get_label('cancel')] = function() { $(this).dialog('destroy'); };
+
+        dialog.dialog('destroy');
+
+        rcmail.env.managesieve_dialog = dialog = rcmail.show_popup_dialog(
+            iframe, title, buttons, $.extend(props, {button_classes: ['mainaction save', 'cancel']})
+        );
     };
-    buttons[rcmail.get_label('cancel')] = function() { $(this).dialog('destroy'); };
 
-    dialog.dialog('destroy');
+    buttons[this.get_label('cancel')] = function() { $(this).dialog('destroy'); };
 
-    rcmail.env.managesieve_dialog = dialog = rcmail.show_popup_dialog(
-      iframe, title, buttons, $.extend(props, {button_classes: ['mainaction save', 'cancel']})
+    this.env.managesieve_dialog = dialog = this.show_popup_dialog(
+        dialog, title, buttons, $.extend(props, {button_classes: ['mainaction next', 'cancel']})
     );
-  };
-
-  buttons[this.get_label('cancel')] = function() { $(this).dialog('destroy'); };
-
-  this.env.managesieve_dialog = dialog = this.show_popup_dialog(
-    dialog, title, buttons, $.extend(props, {button_classes: ['mainaction next', 'cancel']})
-  );
-}
+};
 
 rcube_webmail.prototype.managesieve_dialog_close = function()
 {
-  this.env.managesieve_dialog.dialog('destroy');
-}
+    this.env.managesieve_dialog.dialog('destroy');
+};
 
 rcube_webmail.prototype.managesieve_dialog_resize = function(o)
 {
-  var dialog = this.env.managesieve_dialog,
-    win = $(window), form = $(o);
+    var dialog = this.env.managesieve_dialog,
+        win = $(window), form = $(o);
     width = $('fieldset', o).first().width(), // fieldset width is more appropriate here
     height = form.height(),
     w = win.width(), h = win.height();
 
-  if (height < 100)
-    return;
+    if (height < 100)
+        return;
 
-  dialog.dialog('option', { height: Math.min(h-20, height+120), width: Math.min(w-20, width+65) });
-}
+    dialog.dialog('option', { height: Math.min(h-20, height+120), width: Math.min(w-20, width+65) });
+};
diff --git a/plugins/markasjunk/markasjunk.js b/plugins/markasjunk/markasjunk.js
index 91ac19f39..1f823353f 100644
--- a/plugins/markasjunk/markasjunk.js
+++ b/plugins/markasjunk/markasjunk.js
@@ -23,7 +23,7 @@ rcube_webmail.prototype.markasjunk_mark = function(is_spam) {
 
     var lock = this.set_busy(true, 'loading');
     this.http_post('plugin.markasjunk.' + (is_spam ? 'junk' : 'not_junk'), this.selection_post_data({_uid: uids}), lock);
-}
+};
 
 rcube_webmail.prototype.markasjunk_move = function(mbox, uids) {
     var prev_uid = this.env.uid;
@@ -39,7 +39,7 @@ rcube_webmail.prototype.markasjunk_move = function(mbox, uids) {
         this.delete_messages();
 
     this.env.uid = prev_uid;
-}
+};
 
 rcube_webmail.prototype.markasjunk_toggle_button = function() {
     var spamobj = $('a.junk'),
@@ -86,11 +86,11 @@ rcube_webmail.prototype.markasjunk_toggle_button = function() {
             cur_hamobj.insertAfter(cur_spamobj);
         }
     });
-}
+};
 
 rcube_webmail.prototype.markasjunk_is_spam_mbox = function() {
     return !this.is_multifolder_listing() && this.env.mailbox == this.env.markasjunk_spam_mailbox;
-}
+};
 
 if (window.rcmail) {
     rcmail.addEventListener('init', function() {
diff --git a/plugins/password/password.js b/plugins/password/password.js
index 0a7c9c200..60d112e1a 100644
--- a/plugins/password/password.js
+++ b/plugins/password/password.js
@@ -29,33 +29,33 @@ window.rcmail && rcmail.addEventListener('init', function(evt) {
             input_newpasswd = rcube_find_object('_newpasswd'),
             input_confpasswd = rcube_find_object('_confpasswd');
 
-      if (input_curpasswd && input_curpasswd.value == '') {
-          rcmail.alert_dialog(rcmail.get_label('nocurpassword', 'password'), function() {
-              input_curpasswd.focus();
-              return true;
+        if (input_curpasswd && input_curpasswd.value == '') {
+            rcmail.alert_dialog(rcmail.get_label('nocurpassword', 'password'), function() {
+                input_curpasswd.focus();
+                return true;
             });
-      }
-      else if (input_newpasswd && input_newpasswd.value == '') {
-          rcmail.alert_dialog(rcmail.get_label('nopassword', 'password'), function() {
-              input_newpasswd.focus();
-              return true;
+        }
+        else if (input_newpasswd && input_newpasswd.value == '') {
+            rcmail.alert_dialog(rcmail.get_label('nopassword', 'password'), function() {
+                input_newpasswd.focus();
+                return true;
             });
-      }
-      else if (input_confpasswd && input_confpasswd.value == '') {
-          rcmail.alert_dialog(rcmail.get_label('nopassword', 'password'), function() {
-              input_confpasswd.focus();
-              return true;
+        }
+        else if (input_confpasswd && input_confpasswd.value == '') {
+            rcmail.alert_dialog(rcmail.get_label('nopassword', 'password'), function() {
+                input_confpasswd.focus();
+                return true;
             });
-      }
-      else if (input_newpasswd && input_confpasswd && input_newpasswd.value != input_confpasswd.value) {
-          rcmail.alert_dialog(rcmail.get_label('passwordinconsistency', 'password'), function() {
-              input_newpasswd.focus();
-              return true;
+        }
+        else if (input_newpasswd && input_confpasswd && input_newpasswd.value != input_confpasswd.value) {
+            rcmail.alert_dialog(rcmail.get_label('passwordinconsistency', 'password'), function() {
+                input_newpasswd.focus();
+                return true;
             });
-      }
-      else {
-          rcmail.gui_objects.passform.submit();
-      }
+        }
+        else {
+            rcmail.gui_objects.passform.submit();
+        }
     }, true);
 
     $('input:not(:hidden)').first().focus();
diff --git a/plugins/vcard_attachments/vcardattach.js b/plugins/vcard_attachments/vcardattach.js
index 4e155bb82..6ada9d061 100644
--- a/plugins/vcard_attachments/vcardattach.js
+++ b/plugins/vcard_attachments/vcardattach.js
@@ -17,125 +17,125 @@
 
 function plugin_vcard_import(mime_id)
 {
-  if (!mime_id) {
-    var content = [];
+    if (!mime_id) {
+        var content = [];
 
-    $.each(rcmail.env.vcards, function (id, contact) {
-      var chbox = $('<input>').attr({type: 'checkbox', value: id, checked: true, 'class': 'pretty-checkbox'}),
-        label = $('<label>').text(' ' + contact);
+        $.each(rcmail.env.vcards, function (id, contact) {
+            var chbox = $('<input>').attr({type: 'checkbox', value: id, checked: true, 'class': 'pretty-checkbox'}),
+                label = $('<label>').text(' ' + contact);
 
-      content.push($('<div>').append(label.prepend(chbox)));
-    });
-
-    var dialog,
-      action = function(e, a) {
-        var contacts = []
-
-        dialog.find('input:checked').each(function() {
-          contacts.push(this.value);
+            content.push($('<div>').append(label.prepend(chbox)));
         });
 
-        if (contacts.length) {
-          plugin_vcard_import(contacts.join());
-          return true; // close the dialog
-        }
-      },
-      props = {
-        button: 'import',
-        height: content.length > 4 ? 250 : 100
-      };
+        var dialog,
+            action = function(e, a) {
+                var contacts = [];
 
-    dialog = rcmail.simple_dialog(content, 'vcard_attachments.addvcardmsg', action, props);
+                dialog.find('input:checked').each(function() {
+                    contacts.push(this.value);
+                });
+
+                if (contacts.length) {
+                    plugin_vcard_import(contacts.join());
+                    return true; // close the dialog
+                }
+            },
+            props = {
+                button: 'import',
+                height: content.length > 4 ? 250 : 100
+            };
+
+        dialog = rcmail.simple_dialog(content, 'vcard_attachments.addvcardmsg', action, props);
+
+        return false;
+    }
+
+    rcmail.http_post(
+        'plugin.savevcard',
+        { _uid: rcmail.env.uid, _mbox: rcmail.env.mailbox, _part: mime_id },
+        rcmail.set_busy(true, 'loading')
+    );
 
     return false;
-  }
-
-  rcmail.http_post(
-    'plugin.savevcard',
-    { _uid: rcmail.env.uid, _mbox: rcmail.env.mailbox, _part: mime_id },
-    rcmail.set_busy(true, 'loading')
-  );
-
-  return false;
 }
 
 function plugin_vcard_insertrow(data)
 {
-  if (data.row.ctype.match(/^(text\/vcard|text\/x-vcard|text\/directory)$/i)) {
-    $(data.row.obj).find('.attachment > .attachment').addClass('vcard');
-  }
+    if (data.row.ctype.match(/^(text\/vcard|text\/x-vcard|text\/directory)$/i)) {
+        $(data.row.obj).find('.attachment > .attachment').addClass('vcard');
+    }
 }
 
 function plugin_vcard_attach()
 {
-  var id, n, contacts = [],
-    ts = new Date().getTime(),
-    args = {_uploadid: ts, _id: rcmail.env.compose_id || null},
-    selection = rcmail.contact_list.get_selection();
+    var id, n, contacts = [],
+        ts = new Date().getTime(),
+        args = {_uploadid: ts, _id: rcmail.env.compose_id || null},
+        selection = rcmail.contact_list.get_selection();
+
+    for (n=0; n < selection.length; n++) {
+        if (rcmail.env.task == 'addressbook') {
+            id = selection[n];
+            contacts.push(rcmail.env.source + '-' + id + '-0');
+        }
+        else {
+            id = selection[n];
+            if (id && id.charAt(0) != 'E' && rcmail.env.contactdata[id])
+                contacts.push(id);
+        }
+    }
+
+    if (!contacts.length)
+        return false;
+
+    args._uri = 'vcard://' + contacts.join(',');
 
-  for (n=0; n < selection.length; n++) {
     if (rcmail.env.task == 'addressbook') {
-      id = selection[n];
-      contacts.push(rcmail.env.source + '-' + id + '-0');
+        args._attach_vcard = 1;
+        rcmail.open_compose_step(args);
     }
     else {
-      id = selection[n];
-      if (id && id.charAt(0) != 'E' && rcmail.env.contactdata[id])
-        contacts.push(id);
-    }
-  }
-
-  if (!contacts.length)
-    return false;
-
-  args._uri = 'vcard://' + contacts.join(',');
-
-  if (rcmail.env.task == 'addressbook') {
-      args._attach_vcard = 1;
-      rcmail.open_compose_step(args);
-  }
-  else {
     // add to attachments list
-    if (!rcmail.add2attachment_list(ts, {name: '', html: rcmail.get_label('attaching'), classname: 'uploading', complete: false}))
-      rcmail.file_upload_id = rcmail.set_busy(true, 'attaching');
+        if (!rcmail.add2attachment_list(ts, {name: '', html: rcmail.get_label('attaching'), classname: 'uploading', complete: false}))
+            rcmail.file_upload_id = rcmail.set_busy(true, 'attaching');
 
-    rcmail.http_post('upload', args);
-  }
+        rcmail.http_post('upload', args);
+    }
 }
 
 window.rcmail && rcmail.addEventListener('init', function(evt) {
-  if (rcmail.gui_objects.messagelist)
-    rcmail.addEventListener('insertrow', function(data, evt) { plugin_vcard_insertrow(data); });
+    if (rcmail.gui_objects.messagelist)
+        rcmail.addEventListener('insertrow', function(data, evt) { plugin_vcard_insertrow(data); });
 
-  if ((rcmail.env.action == 'compose' || (rcmail.env.task == 'addressbook' && rcmail.env.action == '')) && rcmail.gui_objects.contactslist) {
-    if (rcmail.env.action == 'compose') {
-      rcmail.env.compose_commands.push('attach-vcard');
+    if ((rcmail.env.action == 'compose' || (rcmail.env.task == 'addressbook' && rcmail.env.action == '')) && rcmail.gui_objects.contactslist) {
+        if (rcmail.env.action == 'compose') {
+            rcmail.env.compose_commands.push('attach-vcard');
 
-      // Elastic: add "Attach vCard" button to the attachments widget
-      if (window.UI && UI.recipient_selector) {
-        var button, form = $('#compose-attachments > div');
-        button = $('<button class="btn btn-secondary attach vcard">')
-          .attr({type: 'button', tabindex: $('button,input', form).first().attr('tabindex') || 0})
-          .text(rcmail.gettext('vcard_attachments.attachvcard'))
-          .appendTo(form)
-          .click(function() {
-            UI.recipient_selector('', {
-              title: 'vcard_attachments.attachvcard',
-              button: 'vcard_attachments.attachvcard',
-              button_class: 'attach',
-              focus: button,
-              multiselect: false,
-              action: function() { rcmail.command('attach-vcard'); }
-            });
-          });
-      }
+            // Elastic: add "Attach vCard" button to the attachments widget
+            if (window.UI && UI.recipient_selector) {
+                var button, form = $('#compose-attachments > div');
+                button = $('<button class="btn btn-secondary attach vcard">')
+                    .attr({type: 'button', tabindex: $('button,input', form).first().attr('tabindex') || 0})
+                    .text(rcmail.gettext('vcard_attachments.attachvcard'))
+                    .appendTo(form)
+                    .click(function() {
+                        UI.recipient_selector('', {
+                            title: 'vcard_attachments.attachvcard',
+                            button: 'vcard_attachments.attachvcard',
+                            button_class: 'attach',
+                            focus: button,
+                            multiselect: false,
+                            action: function() { rcmail.command('attach-vcard'); }
+                        });
+                    });
+            }
+        }
+
+        rcmail.register_command('attach-vcard', function() { plugin_vcard_attach(); });
+        rcmail.contact_list.addEventListener('select', function(list) {
+            // TODO: support attaching more than one at once
+            var selection = list.get_selection();
+            rcmail.enable_command('attach-vcard', selection.length == 1 && selection[0].charAt(0) != 'E');
+        });
     }
-
-    rcmail.register_command('attach-vcard', function() { plugin_vcard_attach(); });
-    rcmail.contact_list.addEventListener('select', function(list) {
-      // TODO: support attaching more than one at once
-      var selection = list.get_selection();
-      rcmail.enable_command('attach-vcard', selection.length == 1 && selection[0].charAt(0) != 'E');
-    });
-  }
 });
diff --git a/plugins/zipdownload/zipdownload.js b/plugins/zipdownload/zipdownload.js
index 1e9be059a..3149633d5 100644
--- a/plugins/zipdownload/zipdownload.js
+++ b/plugins/zipdownload/zipdownload.js
@@ -65,19 +65,19 @@ function rcmail_zipdownload(mode)
             id = 'zipdownload-' + new Date().getTime(),
             iframe = $('<iframe>').attr({name: id, style: 'display:none'}),
             form = $('<form>').attr({
-                    target: id,
-                    style: 'display: none',
-                    method: 'post',
-                    action: rcmail.url('mail/plugin.zipdownload.messages')
-                });
+                target: id,
+                style: 'display: none',
+                method: 'post',
+                action: rcmail.url('mail/plugin.zipdownload.messages')
+            });
 
         post._mode = mode;
         post._token = rcmail.env.request_token;
 
         $.each(post, function(k, v) {
             if (typeof v == 'object' && v.length > 1) {
-              for (var j=0; j < v.length; j++)
-                  inputs.push($('<input>').attr({type: 'hidden', name: k+'[]', value: v[j]}));
+                for (var j=0; j < v.length; j++)
+                    inputs.push($('<input>').attr({type: 'hidden', name: k+'[]', value: v[j]}));
             }
             else {
                 inputs.push($('<input>').attr({type: 'hidden', name: k, value: v}));
diff --git a/program/js/app.js b/program/js/app.js
index 024b44f25..41f8c1424 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -35,9379 +35,9379 @@
 
 function rcube_webmail()
 {
-  this.labels = {};
-  this.buttons = {};
-  this.buttons_sel = {};
-  this.gui_objects = {};
-  this.gui_containers = {};
-  this.commands = {};
-  this.command_handlers = {};
-  this.onloads = [];
-  this.messages = {};
-  this.group2expand = {};
-  this.http_request_jobs = {};
-  this.menu_stack = [];
-  this.menu_buttons = {};
-  this.entity_selectors = [];
-  this.image_style = {};
-  this.uploads = {};
+    this.labels = {};
+    this.buttons = {};
+    this.buttons_sel = {};
+    this.gui_objects = {};
+    this.gui_containers = {};
+    this.commands = {};
+    this.command_handlers = {};
+    this.onloads = [];
+    this.messages = {};
+    this.group2expand = {};
+    this.http_request_jobs = {};
+    this.menu_stack = [];
+    this.menu_buttons = {};
+    this.entity_selectors = [];
+    this.image_style = {};
+    this.uploads = {};
 
-  // webmail client settings
-  this.dblclick_time = 500;
-  this.message_time = 5000;
-  this.preview_delay_select = 400;
-  this.preview_delay_click  = 60;
-  this.identifier_expr = /[^0-9a-z_-]/gi;
-  this.uploadTimeout = 0; // 0 = no timeout | ajax call timeout for loading attachment
+    // webmail client settings
+    this.dblclick_time = 500;
+    this.message_time = 5000;
+    this.preview_delay_select = 400;
+    this.preview_delay_click  = 60;
+    this.identifier_expr = /[^0-9a-z_-]/gi;
+    this.uploadTimeout = 0; // 0 = no timeout | ajax call timeout for loading attachment
 
 
-  // environment defaults
-  this.env = {
-    attachments: {},
-    request_timeout: 180,  // seconds
-    draft_autosave: 0,     // seconds
-    comm_path: './',
-    recipients_separator: ',', // @deprecated
-    recipients_delimiter: ', ', // @deprecated
-    popup_width: 1150,
-    popup_width_small: 900,
-    thread_padding: '15px'
-  };
+    // environment defaults
+    this.env = {
+        attachments: {},
+        request_timeout: 180,  // seconds
+        draft_autosave: 0,     // seconds
+        comm_path: './',
+        recipients_separator: ',', // @deprecated
+        recipients_delimiter: ', ', // @deprecated
+        popup_width: 1150,
+        popup_width_small: 900,
+        thread_padding: '15px'
+    };
 
-  // create protected reference to myself
-  this.ref = 'rcmail';
-  var ref = this;
+    // create protected reference to myself
+    this.ref = 'rcmail';
+    var ref = this;
 
-  // set jQuery ajax options
-  $.ajaxSetup({
-    cache: false,
-    timeout: this.env.request_timeout * 1000,
-    error: function(request, status, err){ ref.http_error(request, status, err); },
-    beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
-  });
+    // set jQuery ajax options
+    $.ajaxSetup({
+        cache: false,
+        timeout: this.env.request_timeout * 1000,
+        error: function(request, status, err){ ref.http_error(request, status, err); },
+        beforeSend: function(xmlhttp){ xmlhttp.setRequestHeader('X-Roundcube-Request', ref.env.request_token); }
+    });
 
-  // unload fix
-  $(window).on('beforeunload', function() { ref.unload = true; });
+    // unload fix
+    $(window).on('beforeunload', function() { ref.unload = true; });
 
-  // set environment variable(s)
-  this.set_env = function(p, value)
-  {
-    if (p != null && typeof p === 'object' && !value)
-      for (var n in p)
-        this.env[n] = p[n];
-    else
-      this.env[p] = value;
-  };
-
-  // add a localized label to the client environment
-  this.add_label = function(p, value)
-  {
-    if (typeof p == 'string')
-      this.labels[p] = value;
-    else if (typeof p == 'object')
-      $.extend(this.labels, p);
-  };
-
-  // add a button to the button list
-  this.register_button = function(command, id, type, act, sel, over)
-  {
-    var button_prop = {id:id, type:type};
-
-    if (act) button_prop.act = act;
-    if (sel) button_prop.sel = sel;
-    if (over) button_prop.over = over;
-
-    if (!this.buttons[command])
-      this.buttons[command] = [];
-
-    this.buttons[command].push(button_prop);
-
-    if (this.loaded) {
-      this.init_button(command, button_prop);
-      this.set_button(command, (this.commands[command] ? 'act' : 'pas'));
-    }
-  };
-
-  // register a button with popup menu, to set its state according to the state of all commands in the menu
-  this.register_menu_button = function(button, menu_id)
-  {
-    if (this.menu_buttons[menu_id]) {
-      this.menu_buttons[menu_id][0].push(button);
-    }
-    else {
-      var commands = [];
-      $('#' + menu_id).find('a').each(function() {
-        var command, link = $(this), onclick = link.attr('onclick');
-
-        if (onclick && String(onclick).match(/rcmail\.command\(\'([^']+)/))
-          command = RegExp.$1;
+    // set environment variable(s)
+    this.set_env = function(p, value)
+    {
+        if (p != null && typeof p === 'object' && !value)
+            for (var n in p)
+                this.env[n] = p[n];
         else
-          command = function() { return link.is('.active'); };
+            this.env[p] = value;
+    };
 
-        commands.push(command);
-      });
+    // add a localized label to the client environment
+    this.add_label = function(p, value)
+    {
+        if (typeof p == 'string')
+            this.labels[p] = value;
+        else if (typeof p == 'object')
+            $.extend(this.labels, p);
+    };
 
-      if (commands.length)
-        this.menu_buttons[menu_id] = [[button], commands];
-    }
+    // add a button to the button list
+    this.register_button = function(command, id, type, act, sel, over)
+    {
+        var button_prop = {id:id, type:type};
 
-    this.set_menu_buttons();
-  };
+        if (act) button_prop.act = act;
+        if (sel) button_prop.sel = sel;
+        if (over) button_prop.over = over;
 
-  // set state of a menu button according to state of all menu actions
-  this.set_menu_buttons = function()
-  {
+        if (!this.buttons[command])
+            this.buttons[command] = [];
+
+        this.buttons[command].push(button_prop);
+
+        if (this.loaded) {
+            this.init_button(command, button_prop);
+            this.set_button(command, (this.commands[command] ? 'act' : 'pas'));
+        }
+    };
+
+    // register a button with popup menu, to set its state according to the state of all commands in the menu
+    this.register_menu_button = function(button, menu_id)
+    {
+        if (this.menu_buttons[menu_id]) {
+            this.menu_buttons[menu_id][0].push(button);
+        }
+        else {
+            var commands = [];
+            $('#' + menu_id).find('a').each(function() {
+                var command, link = $(this), onclick = link.attr('onclick');
+
+                if (onclick && String(onclick).match(/rcmail\.command\(\'([^']+)/))
+                    command = RegExp.$1;
+                else
+                    command = function() { return link.is('.active'); };
+
+                commands.push(command);
+            });
+
+            if (commands.length)
+                this.menu_buttons[menu_id] = [[button], commands];
+        }
+
+        this.set_menu_buttons();
+    };
+
+    // set state of a menu button according to state of all menu actions
+    this.set_menu_buttons = function()
+    {
     // Use timeouts to not block and set menu button states only once
-    clearTimeout(this.menu_buttons_timeout);
-    this.menu_buttons_timeout = setTimeout(function() {
-      $.each(ref.menu_buttons, function() {
-        var disabled = true;
-        $.each(this[1], function() {
-          var is_func = typeof(this) == 'function';
-          if ((is_func && this()) || (!is_func && ref.commands[this])) {
-            return disabled = false;
-          }
-        });
+        clearTimeout(this.menu_buttons_timeout);
+        this.menu_buttons_timeout = setTimeout(function() {
+            $.each(ref.menu_buttons, function() {
+                var disabled = true;
+                $.each(this[1], function() {
+                    var is_func = typeof(this) == 'function';
+                    if ((is_func && this()) || (!is_func && ref.commands[this])) {
+                        return disabled = false;
+                    }
+                });
 
-        $(this[0]).add($(this[0]).parent('.dropbutton'))
-          .addClass(disabled ? 'disabled' : 'active')
-          .removeClass(disabled ? 'active' : 'disabled');
-      });
-    }, 50);
-  };
-
-  // register a specific gui object
-  this.gui_object = function(name, id)
-  {
-    this.gui_objects[name] = this.loaded ? rcube_find_object(id) : id;
-  };
-
-  // register a container object
-  this.gui_container = function(name, id)
-  {
-    this.gui_containers[name] = id;
-  };
-
-  // add a GUI element (html node) to a specified container
-  this.add_element = function(elm, container)
-  {
-    if (this.gui_containers[container] && this.gui_containers[container].jquery)
-      this.gui_containers[container].append(elm);
-  };
-
-  // register an external handler for a certain command
-  this.register_command = function(command, callback, enable)
-  {
-    this.command_handlers[command] = callback;
-
-    if (enable)
-      this.enable_command(command, true);
-  };
-
-  // execute the given script on load
-  this.add_onload = function(f)
-  {
-    this.onloads.push(f);
-  };
-
-  // initialize webmail client
-  this.init = function()
-  {
-    var n;
-    this.task = this.env.task;
-
-    if (!this.env.blankpage)
-      this.env.blankpage = 'javascript:false;';
-
-    // find all registered gui containers
-    for (n in this.gui_containers)
-      this.gui_containers[n] = $('#'+this.gui_containers[n]);
-
-    // find all registered gui objects
-    for (n in this.gui_objects)
-      this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);
-
-    // init registered buttons
-    this.init_buttons();
-
-    // tell parent window that this frame is loaded
-    if (this.is_framed()) {
-      parent.rcmail.unlock_frame();
-    }
-
-    // enable general commands
-    this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref',
-      'compose', 'undo', 'about', 'switch-task', 'menu-open', 'menu-close', 'menu-save', true);
-
-    // set active task button
-    this.set_button(this.task, 'sel');
-
-    if (this.env.permaurl)
-      this.enable_command('permaurl', 'extwin', true);
-
-    switch (this.task) {
-
-      case 'mail':
-        // enable mail commands
-        this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', 'import-messages', true);
-
-        if (this.gui_objects.messagelist) {
-          // setup message list cols
-          this.msglist_setup(this.env.layout);
-
-          this.env.widescreen_list_template = [
-            {className: 'threads', cells: ['threads']},
-            {className: 'subject', cells: ['fromto', 'date', 'size', 'status', 'subject']},
-            {className: 'flags', cells: ['flag', 'attachment']}
-          ];
-
-          this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
-            multiselect:true, multiexpand:true, draggable:true, keyboard:true,
-            column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
+                $(this[0]).add($(this[0]).parent('.dropbutton'))
+                    .addClass(disabled ? 'disabled' : 'active')
+                    .removeClass(disabled ? 'active' : 'disabled');
             });
-          this.message_list
-            .addEventListener('initrow', function(o) { ref.init_message_row(o); })
-            .addEventListener('dblclick', function(o) { ref.msglist_dbl_click(o); })
-            .addEventListener('keypress', function(o) { ref.msglist_keypress(o); })
-            .addEventListener('select', function(o) { ref.msglist_select(o); })
-            .addEventListener('dragstart', function(o) { ref.drag_start(o); })
-            .addEventListener('dragmove', function(e) { ref.drag_move(e); })
-            .addEventListener('dragend', function(e) { ref.drag_end(e); })
-            .addEventListener('expandcollapse', function(o) { ref.msglist_expand(o); })
-            .addEventListener('column_replace', function(o) { ref.msglist_set_coltypes(o); })
-            .init();
+        }, 50);
+    };
 
-          // TODO: this should go into the list-widget code
-          $(this.message_list.thead).on('click', 'a.sortcol', function(e){
-            return ref.command('sort', $(this).attr('rel'), this);
-          });
+    // register a specific gui object
+    this.gui_object = function(name, id)
+    {
+        this.gui_objects[name] = this.loaded ? rcube_find_object(id) : id;
+    };
 
-          this.enable_command('toggle_status', 'toggle_flag', 'sort', true);
-          this.enable_command('set-listmode', this.env.threads && !this.is_multifolder_listing());
+    // register a container object
+    this.gui_container = function(name, id)
+    {
+        this.gui_containers[name] = id;
+    };
 
-          // load messages
-          var searchfilter = $(this.gui_objects.search_filter).val();
-          if (searchfilter && searchfilter != 'ALL')
-            this.filter_mailbox(searchfilter);
-          else
-            this.command('list');
+    // add a GUI element (html node) to a specified container
+    this.add_element = function(elm, container)
+    {
+        if (this.gui_containers[container] && this.gui_containers[container].jquery)
+            this.gui_containers[container].append(elm);
+    };
 
-          $(this.gui_objects.qsearchbox).val(this.env.search_text).focusin(function() { ref.message_list.blur(); });
+    // register an external handler for a certain command
+    this.register_command = function(command, callback, enable)
+    {
+        this.command_handlers[command] = callback;
+
+        if (enable)
+            this.enable_command(command, true);
+    };
+
+    // execute the given script on load
+    this.add_onload = function(f)
+    {
+        this.onloads.push(f);
+    };
+
+    // initialize webmail client
+    this.init = function()
+    {
+        var n;
+        this.task = this.env.task;
+
+        if (!this.env.blankpage)
+            this.env.blankpage = 'javascript:false;';
+
+        // find all registered gui containers
+        for (n in this.gui_containers)
+            this.gui_containers[n] = $('#'+this.gui_containers[n]);
+
+        // find all registered gui objects
+        for (n in this.gui_objects)
+            this.gui_objects[n] = rcube_find_object(this.gui_objects[n]);
+
+        // init registered buttons
+        this.init_buttons();
+
+        // tell parent window that this frame is loaded
+        if (this.is_framed()) {
+            parent.rcmail.unlock_frame();
         }
 
-        this.set_button_titles();
+        // enable general commands
+        this.enable_command('close', 'logout', 'mail', 'addressbook', 'settings', 'save-pref',
+            'compose', 'undo', 'about', 'switch-task', 'menu-open', 'menu-close', 'menu-save', true);
 
-        this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
-          'move', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'bounce',
-          'print', 'load-attachment', 'download-attachment', 'show-headers', 'hide-headers', 'download',
-          'forward', 'forward-inline', 'forward-attachment', 'change-format'];
+        // set active task button
+        this.set_button(this.task, 'sel');
 
-        // Initialize Mailvelope early so e.g. fresh users have a keyring for
-        // this session directly after login.
-        // This does not hurt the following code execution because the
-        // Mailvelope-related code runs non-blocking (using Promises).
-        this.check_mailvelope(this.env.action);
+        if (this.env.permaurl)
+            this.enable_command('permaurl', 'extwin', true);
 
-        if (this.env.action == 'show' || this.env.action == 'preview') {
-          this.enable_command(this.env.message_commands, this.env.uid);
-          this.enable_command('reply-list', this.env.list_post);
+        switch (this.task) {
 
-          if (this.env.action == 'show') {
-            this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
-              this.display_message('', 'loading'));
-          }
+            case 'mail':
+                // enable mail commands
+                this.enable_command('list', 'checkmail', 'add-contact', 'search', 'reset-search', 'collapse-folder', 'import-messages', true);
 
-          if (this.env.mail_read_time > 0)
-            setTimeout(function() {
-              ref.http_post('mark', {_uid: ref.env.uid, _flag: 'read', _mbox: ref.env.mailbox, _quiet: 1});
-            }, this.env.mail_read_time * 1000);
+                if (this.gui_objects.messagelist) {
+                    // setup message list cols
+                    this.msglist_setup(this.env.layout);
 
-          if (this.env.blockedobjects) {
-            $(this.gui_objects.remoteobjectsmsg).show();
-            this.enable_command('load-remote', true);
-          }
+                    this.env.widescreen_list_template = [
+                        {className: 'threads', cells: ['threads']},
+                        {className: 'subject', cells: ['fromto', 'date', 'size', 'status', 'subject']},
+                        {className: 'flags', cells: ['flag', 'attachment']}
+                    ];
 
-          // make preview/message frame visible
-          if (this.env.action == 'preview' && this.is_framed()) {
-            this.enable_command('compose', 'add-contact', false);
-            parent.rcmail.show_contentframe(true);
-          }
+                    this.message_list = new rcube_list_widget(this.gui_objects.messagelist, {
+                        multiselect:true, multiexpand:true, draggable:true, keyboard:true,
+                        column_movable:this.env.col_movable, dblclick_time:this.dblclick_time
+                    });
+                    this.message_list
+                        .addEventListener('initrow', function(o) { ref.init_message_row(o); })
+                        .addEventListener('dblclick', function(o) { ref.msglist_dbl_click(o); })
+                        .addEventListener('keypress', function(o) { ref.msglist_keypress(o); })
+                        .addEventListener('select', function(o) { ref.msglist_select(o); })
+                        .addEventListener('dragstart', function(o) { ref.drag_start(o); })
+                        .addEventListener('dragmove', function(e) { ref.drag_move(e); })
+                        .addEventListener('dragend', function(e) { ref.drag_end(e); })
+                        .addEventListener('expandcollapse', function(o) { ref.msglist_expand(o); })
+                        .addEventListener('column_replace', function(o) { ref.msglist_set_coltypes(o); })
+                        .init();
 
-          if ($.inArray('flagged', this.env.message_flags) >= 0) {
-            $(document.body).addClass('status-flagged');
-          }
+                    // TODO: this should go into the list-widget code
+                    $(this.message_list.thead).on('click', 'a.sortcol', function(e){
+                        return ref.command('sort', $(this).attr('rel'), this);
+                    });
 
-          // initialize drag-n-drop on attachments, so they can e.g.
-          // be dropped into mail compose attachments in another window
-          if (this.gui_objects.attachments)
-            $('li > a', this.gui_objects.attachments).not('.drop').on('dragstart', function(e) {
-              var n, href = this.href, dt = e.originalEvent.dataTransfer;
-              if (dt) {
-                // inject username to the uri
-                href = href.replace(/^https?:\/\//, function(m) { return m + urlencode(ref.env.username) + '@'});
-                // cleanup the node to get filename without the size test
-                n = $(this).clone();
-                n.children().remove();
+                    this.enable_command('toggle_status', 'toggle_flag', 'sort', true);
+                    this.enable_command('set-listmode', this.env.threads && !this.is_multifolder_listing());
 
-                dt.setData('roundcube-uri', href);
-                dt.setData('roundcube-name', n.text().trim());
-              }
-            });
-        }
-        else if (this.env.action == 'compose') {
-          this.env.address_group_stack = [];
-          this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
-            'toggle-editor', 'list-addresses', 'pushgroup', 'search', 'reset-search', 'extwin',
-            'insert-response', 'menu-open', 'menu-close', 'load-attachment',
-            'download-attachment', 'open-attachment', 'rename-attachment'];
+                    // load messages
+                    var searchfilter = $(this.gui_objects.search_filter).val();
+                    if (searchfilter && searchfilter != 'ALL')
+                        this.filter_mailbox(searchfilter);
+                    else
+                        this.command('list');
 
-          if (this.env.drafts_mailbox)
-            this.env.compose_commands.push('savedraft')
+                    $(this.gui_objects.qsearchbox).val(this.env.search_text).focusin(function() { ref.message_list.blur(); });
+                }
 
-          this.enable_command(this.env.compose_commands, true);
+                this.set_button_titles();
 
-          // add more commands (not enabled)
-          $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);
+                this.env.message_commands = ['show', 'reply', 'reply-all', 'reply-list',
+                    'move', 'copy', 'delete', 'open', 'mark', 'edit', 'viewsource', 'bounce',
+                    'print', 'load-attachment', 'download-attachment', 'show-headers', 'hide-headers', 'download',
+                    'forward', 'forward-inline', 'forward-attachment', 'change-format'];
 
-          if (window.googie) {
-            this.env.editor_config.spellchecker = googie;
-            this.env.editor_config.spellcheck_observer = function(s) { ref.spellcheck_state(); };
+                // Initialize Mailvelope early so e.g. fresh users have a keyring for
+                // this session directly after login.
+                // This does not hurt the following code execution because the
+                // Mailvelope-related code runs non-blocking (using Promises).
+                this.check_mailvelope(this.env.action);
 
-            this.env.compose_commands.push('spellcheck')
-            this.enable_command('spellcheck', true);
-          }
+                if (this.env.action == 'show' || this.env.action == 'preview') {
+                    this.enable_command(this.env.message_commands, this.env.uid);
+                    this.enable_command('reply-list', this.env.list_post);
 
-          // initialize HTML editor
-          this.editor_init(null, this.env.composebody);
+                    if (this.env.action == 'show') {
+                        this.http_request('pagenav', {_uid: this.env.uid, _mbox: this.env.mailbox, _search: this.env.search_request},
+                            this.display_message('', 'loading'));
+                    }
 
-          // init message compose form
-          this.init_messageform();
-        }
-        else if (this.env.action == 'bounce') {
-          this.init_messageform_inputs();
-          this.env.compose_commands = [];
-        }
-        else if (this.env.action == 'get') {
-          this.enable_command('download', true);
-          this.enable_command('image-scale', 'image-rotate', !!/^image\//.test(this.env.mimetype));
+                    if (this.env.mail_read_time > 0)
+                        setTimeout(function() {
+                            ref.http_post('mark', {_uid: ref.env.uid, _flag: 'read', _mbox: ref.env.mailbox, _quiet: 1});
+                        }, this.env.mail_read_time * 1000);
 
-          // Mozilla's PDF.js viewer does not allow printing from host page (#5125)
-          // to minimize user confusion we disable the Print button on Firefox < 75
-          this.enable_command('print', this.env.mimetype != 'application/pdf' || !bw.mz || bw.vendver >= 75);
+                    if (this.env.blockedobjects) {
+                        $(this.gui_objects.remoteobjectsmsg).show();
+                        this.enable_command('load-remote', true);
+                    }
 
-          if (this.env.is_message) {
-            this.enable_command('reply', 'reply-all', 'edit', 'viewsource',
-              'forward', 'forward-inline', 'forward-attachment', 'bounce', true);
-            if (this.env.list_post)
-              this.enable_command('reply-list', true);
-          }
+                    // make preview/message frame visible
+                    if (this.env.action == 'preview' && this.is_framed()) {
+                        this.enable_command('compose', 'add-contact', false);
+                        parent.rcmail.show_contentframe(true);
+                    }
 
-          // center and scale the image in preview frame
-          // TODO: Find a better way. Onload is late, also we could use embed.css
-          if (this.env.mimetype.startsWith('image/'))
-            $(this.gui_objects.messagepartframe).on('load', function() {
-              var contents = $(this).contents();
+                    if ($.inArray('flagged', this.env.message_flags) >= 0) {
+                        $(document.body).addClass('status-flagged');
+                    }
 
-              // do not apply styles to an error page (with no image)
-              if (contents.find('img').length)
-                contents.find('head').append(
-                  '<style type="text/css">'
+                    // initialize drag-n-drop on attachments, so they can e.g.
+                    // be dropped into mail compose attachments in another window
+                    if (this.gui_objects.attachments)
+                        $('li > a', this.gui_objects.attachments).not('.drop').on('dragstart', function(e) {
+                            var n, href = this.href, dt = e.originalEvent.dataTransfer;
+                            if (dt) {
+                                // inject username to the uri
+                                href = href.replace(/^https?:\/\//, function(m) { return m + urlencode(ref.env.username) + '@';});
+                                // cleanup the node to get filename without the size test
+                                n = $(this).clone();
+                                n.children().remove();
+
+                                dt.setData('roundcube-uri', href);
+                                dt.setData('roundcube-name', n.text().trim());
+                            }
+                        });
+                }
+                else if (this.env.action == 'compose') {
+                    this.env.address_group_stack = [];
+                    this.env.compose_commands = ['send-attachment', 'remove-attachment', 'send', 'cancel',
+                        'toggle-editor', 'list-addresses', 'pushgroup', 'search', 'reset-search', 'extwin',
+                        'insert-response', 'menu-open', 'menu-close', 'load-attachment',
+                        'download-attachment', 'open-attachment', 'rename-attachment'];
+
+                    if (this.env.drafts_mailbox)
+                        this.env.compose_commands.push('savedraft');
+
+                    this.enable_command(this.env.compose_commands, true);
+
+                    // add more commands (not enabled)
+                    $.merge(this.env.compose_commands, ['add-recipient', 'firstpage', 'previouspage', 'nextpage', 'lastpage']);
+
+                    if (window.googie) {
+                        this.env.editor_config.spellchecker = googie;
+                        this.env.editor_config.spellcheck_observer = function(s) { ref.spellcheck_state(); };
+
+                        this.env.compose_commands.push('spellcheck');
+                        this.enable_command('spellcheck', true);
+                    }
+
+                    // initialize HTML editor
+                    this.editor_init(null, this.env.composebody);
+
+                    // init message compose form
+                    this.init_messageform();
+                }
+                else if (this.env.action == 'bounce') {
+                    this.init_messageform_inputs();
+                    this.env.compose_commands = [];
+                }
+                else if (this.env.action == 'get') {
+                    this.enable_command('download', true);
+                    this.enable_command('image-scale', 'image-rotate', !!/^image\//.test(this.env.mimetype));
+
+                    // Mozilla's PDF.js viewer does not allow printing from host page (#5125)
+                    // to minimize user confusion we disable the Print button on Firefox < 75
+                    this.enable_command('print', this.env.mimetype != 'application/pdf' || !bw.mz || bw.vendver >= 75);
+
+                    if (this.env.is_message) {
+                        this.enable_command('reply', 'reply-all', 'edit', 'viewsource',
+                            'forward', 'forward-inline', 'forward-attachment', 'bounce', true);
+                        if (this.env.list_post)
+                            this.enable_command('reply-list', true);
+                    }
+
+                    // center and scale the image in preview frame
+                    // TODO: Find a better way. Onload is late, also we could use embed.css
+                    if (this.env.mimetype.startsWith('image/'))
+                        $(this.gui_objects.messagepartframe).on('load', function() {
+                            var contents = $(this).contents();
+
+                            // do not apply styles to an error page (with no image)
+                            if (contents.find('img').length)
+                                contents.find('head').append(
+                                    '<style type="text/css">'
                   + 'img { max-width:100%; max-height:100%; } ' // scale
                   + 'body { display:flex; align-items:center; justify-content:center; height:100%; margin:0; }' // align
                   + '</style>'
-                );
-            });
-        }
-        // show printing dialog unless decryption must be done first
-        else if (this.env.action == 'print' && this.env.uid) {
-          if (!this.env.is_pgp_content && !this.env.pgp_mime_part) {
-            this.print_dialog();
-          }
-        }
-
-        // get unread count for each mailbox
-        if (this.gui_objects.mailboxlist) {
-          this.env.unread_counts = {};
-          this.gui_objects.folderlist = this.gui_objects.mailboxlist;
-          this.http_request('getunread', {_page: this.env.current_page});
-        }
-
-        // init address book widget
-        if (this.gui_objects.contactslist) {
-          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
-            { multiselect:true, draggable:false, keyboard:true });
-          this.contact_list
-            .addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
-            .addEventListener('select', function(o) { ref.compose_recipient_select(o); })
-            .addEventListener('dblclick', function(o) { ref.compose_add_recipient(); })
-            .addEventListener('keypress', function(o) {
-              if (o.key_pressed == o.ENTER_KEY) {
-                if (!ref.compose_add_recipient()) {
-                  // execute link action on <enter> if not a recipient entry
-                  if (o.last_selected && String(o.last_selected).charAt(0) == 'G') {
-                    $(o.rows[o.last_selected].obj).find('a').first().click();
-                  }
+                                );
+                        });
+                }
+                // show printing dialog unless decryption must be done first
+                else if (this.env.action == 'print' && this.env.uid) {
+                    if (!this.env.is_pgp_content && !this.env.pgp_mime_part) {
+                        this.print_dialog();
+                    }
                 }
-              }
-            })
-            .init();
 
-          // remember last focused address field
-          $('#_to,#_cc,#_bcc').focus(function() { ref.env.focused_field = this; });
+                // get unread count for each mailbox
+                if (this.gui_objects.mailboxlist) {
+                    this.env.unread_counts = {};
+                    this.gui_objects.folderlist = this.gui_objects.mailboxlist;
+                    this.http_request('getunread', {_page: this.env.current_page});
+                }
+
+                // init address book widget
+                if (this.gui_objects.contactslist) {
+                    this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
+                        { multiselect:true, draggable:false, keyboard:true });
+                    this.contact_list
+                        .addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
+                        .addEventListener('select', function(o) { ref.compose_recipient_select(o); })
+                        .addEventListener('dblclick', function(o) { ref.compose_add_recipient(); })
+                        .addEventListener('keypress', function(o) {
+                            if (o.key_pressed == o.ENTER_KEY) {
+                                if (!ref.compose_add_recipient()) {
+                                    // execute link action on <enter> if not a recipient entry
+                                    if (o.last_selected && String(o.last_selected).charAt(0) == 'G') {
+                                        $(o.rows[o.last_selected].obj).find('a').first().click();
+                                    }
+                                }
+                            }
+                        })
+                        .init();
+
+                    // remember last focused address field
+                    $('#_to,#_cc,#_bcc').focus(function() { ref.env.focused_field = this; });
+                }
+
+                if (this.gui_objects.addressbookslist) {
+                    this.gui_objects.folderlist = this.gui_objects.addressbookslist;
+                    this.enable_command('list-addresses', true);
+                }
+
+                // ask user to send MDN
+                if (this.env.mdn_request && this.env.uid) {
+                    this.mdn_request_dialog(this.env.uid, this.env.mailbox);
+                }
+
+                // detect browser capabilities
+                if (!this.is_framed() && !this.env.extwin)
+                    this.browser_capabilities_check();
+
+                break;
+
+            case 'addressbook':
+                this.env.address_group_stack = [];
+
+                if (this.gui_objects.folderlist)
+                    this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
+
+                this.enable_command('add', 'import', this.env.writable_source);
+                this.enable_command('list', 'listgroup', 'pushgroup', 'popgroup', 'listsearch', 'search', 'reset-search', 'advanced-search', true);
+
+                if (this.gui_objects.contactslist) {
+                    this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
+                        {multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
+                    this.contact_list
+                        .addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
+                        .addEventListener('keypress', function(o) { ref.list_keypress(o); })
+                        .addEventListener('select', function(o) { ref.contactlist_select(o); })
+                        .addEventListener('dragstart', function(o) { ref.drag_start(o); })
+                        .addEventListener('dragmove', function(e) { ref.drag_move(e); })
+                        .addEventListener('dragend', function(e) { ref.drag_end(e); })
+                        .init();
+
+                    $(this.gui_objects.qsearchbox).focusin(function() { ref.contact_list.blur(); });
+
+                    this.update_group_commands();
+                    this.command('list');
+                }
+
+                if (this.gui_objects.savedsearchlist) {
+                    this.savedsearchlist = new rcube_treelist_widget(this.gui_objects.savedsearchlist, {
+                        id_prefix: 'rcmli',
+                        id_encode: this.html_identifier_encode,
+                        id_decode: this.html_identifier_decode
+                    });
+
+                    this.savedsearchlist.addEventListener('select', function(node) {
+                        ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }); });
+                }
+
+                this.set_page_buttons();
+
+                if (this.env.cid) {
+                    this.enable_command('show', 'edit', 'qrcode', true);
+                    // register handlers for group assignment via checkboxes
+                    if (this.gui_objects.editform) {
+                        $('input.groupmember').change(function() {
+                            ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
+                        });
+                    }
+                }
+
+                if (this.gui_objects.editform) {
+                    this.enable_command('save', true);
+                    if (this.env.action == 'add' || this.env.action == 'edit' || this.env.action == 'search')
+                        this.init_contact_form();
+                }
+                else if (this.env.action == 'print') {
+                    this.print_dialog();
+                }
+
+                break;
+
+            case 'settings':
+                this.enable_command('show', 'save', true);
+
+                if (this.env.action == 'identities') {
+                    this.enable_command('add', this.env.identities_level < 2);
+                }
+                else if (this.env.action == 'edit-identity' || this.env.action == 'add-identity') {
+                    this.enable_command('save', 'edit', true);
+                    this.enable_command('delete', this.env.identities_level < 2);
+
+                    if (this.env.action == 'edit-identity') {
+                        this.check_mailvelope(this.env.action);
+                    }
+                }
+                else if (this.env.action == 'folders') {
+                    this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
+                }
+                else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
+                    this.enable_command('save', 'folder-size', true);
+                    parent.rcmail.env.exists = this.env.messagecount;
+                    parent.rcmail.enable_command('purge', this.env.messagecount);
+                }
+                else if (this.env.action == 'responses') {
+                    this.enable_command('add', true);
+                }
+
+                if (this.gui_objects.identitieslist) {
+                    this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist,
+                        {multiselect:false, draggable:false, keyboard:true});
+                    this.identity_list
+                        .addEventListener('select', function(o) { ref.identity_select(o); })
+                        .addEventListener('keypress', function(o) { ref.list_keypress(o); })
+                        .init()
+                        .focus();
+                }
+                else if (this.gui_objects.sectionslist) {
+                    this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:true});
+                    this.sections_list
+                        .addEventListener('select', function(o) { ref.section_select(o); })
+                        .init()
+                        .focus();
+                }
+                else if (this.gui_objects.subscriptionlist) {
+                    this.init_subscription_list();
+                }
+                else if (this.gui_objects.responseslist) {
+                    this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:true});
+                    this.responses_list
+                        .addEventListener('select', function(o) { ref.response_select(o); })
+                        .addEventListener('keypress', function(o) { ref.list_keypress(o); })
+                        .init()
+                        .focus();
+                }
+
+                break;
+
+            case 'login':
+                var tz, input_user = $('#rcmloginuser');
+                input_tz = $('#rcmlogintz');
+
+                if (input_user.val() == '')
+                    input_user.focus();
+                else
+                    $('#rcmloginpwd').focus();
+
+                // detect client timezone
+                try {
+                    tz = Intl.DateTimeFormat().resolvedOptions().timeZone;
+                } catch (e) { };
+
+                input_tz.val(tz ? tz : (new Date().getStdTimezoneOffset() / -60));
+
+                // display 'loading' message on form submit, lock submit button
+                $('form').submit(function () {
+                    $('[type=submit]', this).prop('disabled', true);
+                    ref.clear_messages();
+                    ref.display_message('', 'loading');
+                });
+
+                break;
         }
 
-        if (this.gui_objects.addressbookslist) {
-          this.gui_objects.folderlist = this.gui_objects.addressbookslist;
-          this.enable_command('list-addresses', true);
-        }
+        // select first input field in an edit form
+        if (this.gui_objects.editform)
+            $("input,select,textarea", this.gui_objects.editform)
+                .not(':hidden').not(':disabled').first().select().focus();
 
-        // ask user to send MDN
-        if (this.env.mdn_request && this.env.uid) {
-            this.mdn_request_dialog(this.env.uid, this.env.mailbox);
-        }
+        // prevent from form submit with Enter key in file input fields
+        if (bw.ie)
+            $('input[type=file]').keydown(function(e) { if (e.keyCode == '13') e.preventDefault(); });
 
-        // detect browser capabilities
-        if (!this.is_framed() && !this.env.extwin)
-          this.browser_capabilities_check();
+        // flag object as complete
+        this.loaded = true;
+        this.env.lastrefresh = new Date();
 
-        break;
+        // show message
+        if (this.pending_message)
+            this.display_message.apply(this, this.pending_message);
 
-      case 'addressbook':
-        this.env.address_group_stack = [];
-
-        if (this.gui_objects.folderlist)
-          this.env.contactfolders = $.extend($.extend({}, this.env.address_sources), this.env.contactgroups);
-
-        this.enable_command('add', 'import', this.env.writable_source);
-        this.enable_command('list', 'listgroup', 'pushgroup', 'popgroup', 'listsearch', 'search', 'reset-search', 'advanced-search', true);
-
-        if (this.gui_objects.contactslist) {
-          this.contact_list = new rcube_list_widget(this.gui_objects.contactslist,
-            {multiselect:true, draggable:this.gui_objects.folderlist?true:false, keyboard:true});
-          this.contact_list
-            .addEventListener('initrow', function(o) { ref.triggerEvent('insertrow', { cid:o.uid, row:o }); })
-            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
-            .addEventListener('select', function(o) { ref.contactlist_select(o); })
-            .addEventListener('dragstart', function(o) { ref.drag_start(o); })
-            .addEventListener('dragmove', function(e) { ref.drag_move(e); })
-            .addEventListener('dragend', function(e) { ref.drag_end(e); })
-            .init();
-
-          $(this.gui_objects.qsearchbox).focusin(function() { ref.contact_list.blur(); });
-
-          this.update_group_commands();
-          this.command('list');
-        }
-
-        if (this.gui_objects.savedsearchlist) {
-          this.savedsearchlist = new rcube_treelist_widget(this.gui_objects.savedsearchlist, {
-            id_prefix: 'rcmli',
-            id_encode: this.html_identifier_encode,
-            id_decode: this.html_identifier_decode
-          });
-
-          this.savedsearchlist.addEventListener('select', function(node) {
-            ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' }); });
-        }
-
-        this.set_page_buttons();
-
-        if (this.env.cid) {
-          this.enable_command('show', 'edit', 'qrcode', true);
-          // register handlers for group assignment via checkboxes
-          if (this.gui_objects.editform) {
-            $('input.groupmember').change(function() {
-              ref.group_member_change(this.checked ? 'add' : 'del', ref.env.cid, ref.env.source, this.value);
-            });
-          }
-        }
-
-        if (this.gui_objects.editform) {
-          this.enable_command('save', true);
-          if (this.env.action == 'add' || this.env.action == 'edit' || this.env.action == 'search')
-              this.init_contact_form();
-        }
-        else if (this.env.action == 'print') {
-          this.print_dialog();
-        }
-
-        break;
-
-      case 'settings':
-        this.enable_command('show', 'save', true);
-
-        if (this.env.action == 'identities') {
-          this.enable_command('add', this.env.identities_level < 2);
-        }
-        else if (this.env.action == 'edit-identity' || this.env.action == 'add-identity') {
-          this.enable_command('save', 'edit', true);
-          this.enable_command('delete', this.env.identities_level < 2);
-
-          if (this.env.action == 'edit-identity') {
-            this.check_mailvelope(this.env.action);
-          }
-        }
-        else if (this.env.action == 'folders') {
-          this.enable_command('subscribe', 'unsubscribe', 'create-folder', 'rename-folder', true);
-        }
-        else if (this.env.action == 'edit-folder' && this.gui_objects.editform) {
-          this.enable_command('save', 'folder-size', true);
-          parent.rcmail.env.exists = this.env.messagecount;
-          parent.rcmail.enable_command('purge', this.env.messagecount);
-        }
-        else if (this.env.action == 'responses') {
-          this.enable_command('add', true);
-        }
-
-        if (this.gui_objects.identitieslist) {
-          this.identity_list = new rcube_list_widget(this.gui_objects.identitieslist,
-            {multiselect:false, draggable:false, keyboard:true});
-          this.identity_list
-            .addEventListener('select', function(o) { ref.identity_select(o); })
-            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
-            .init()
-            .focus();
-        }
-        else if (this.gui_objects.sectionslist) {
-          this.sections_list = new rcube_list_widget(this.gui_objects.sectionslist, {multiselect:false, draggable:false, keyboard:true});
-          this.sections_list
-            .addEventListener('select', function(o) { ref.section_select(o); })
-            .init()
-            .focus();
-        }
-        else if (this.gui_objects.subscriptionlist) {
-          this.init_subscription_list();
-        }
-        else if (this.gui_objects.responseslist) {
-          this.responses_list = new rcube_list_widget(this.gui_objects.responseslist, {multiselect:false, draggable:false, keyboard:true});
-          this.responses_list
-            .addEventListener('select', function(o) { ref.response_select(o); })
-            .addEventListener('keypress', function(o) { ref.list_keypress(o); })
-            .init()
-            .focus();
-        }
-
-        break;
-
-      case 'login':
-        var tz, input_user = $('#rcmloginuser');
-            input_tz = $('#rcmlogintz');
-
-        if (input_user.val() == '')
-          input_user.focus();
-        else
-          $('#rcmloginpwd').focus();
-
-        // detect client timezone
-        try {
-            tz = Intl.DateTimeFormat().resolvedOptions().timeZone
-        } catch (e) { };
-
-        input_tz.val(tz ? tz : (new Date().getStdTimezoneOffset() / -60));
-
-        // display 'loading' message on form submit, lock submit button
-        $('form').submit(function () {
-          $('[type=submit]', this).prop('disabled', true);
-          ref.clear_messages();
-          ref.display_message('', 'loading');
-        });
-
-        break;
-    }
-
-    // select first input field in an edit form
-    if (this.gui_objects.editform)
-      $("input,select,textarea", this.gui_objects.editform)
-        .not(':hidden').not(':disabled').first().select().focus();
-
-    // prevent from form submit with Enter key in file input fields
-    if (bw.ie)
-      $('input[type=file]').keydown(function(e) { if (e.keyCode == '13') e.preventDefault(); });
-
-    // flag object as complete
-    this.loaded = true;
-    this.env.lastrefresh = new Date();
-
-    // show message
-    if (this.pending_message)
-      this.display_message.apply(this, this.pending_message);
-
-    // init treelist widget
-    if (this.gui_objects.folderlist && window.rcube_treelist_widget
+        // init treelist widget
+        if (this.gui_objects.folderlist && window.rcube_treelist_widget
       // some plugins may load rcube_treelist_widget and there's one case
       // when this will cause problems - addressbook widget in compose,
       // which already has been initialized using rcube_list_widget
       && this.gui_objects.folderlist != this.gui_objects.addressbookslist
-    ) {
-      this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
-          selectable: true,
-          id_prefix: 'rcmli',
-          parent_focus: true,
-          id_encode: this.html_identifier_encode,
-          id_decode: this.html_identifier_decode,
-          check_droptarget: function(node) { return !node.virtual && ref.check_droptarget(node.id) }
-      });
-
-      this.treelist
-        .addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
-        .addEventListener('expand', function(node) { ref.folder_collapsed(node) })
-        .addEventListener('beforeselect', function(node) { return !ref.busy; })
-        .addEventListener('select', function(node) {
-          ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' });
-          ref.mark_all_read_state();
-        });
-    }
-
-    // activate html5 file drop feature (if browser supports it and if configured)
-    if (this.gui_objects.filedrop && this.env.filedrop && window.FormData) {
-      $(document.body).on('dragover dragleave drop', function(e) { return ref.document_drag_hover(e, e.type == 'dragover'); });
-      $(this.gui_objects.filedrop).addClass('droptarget')
-        .on('dragover dragleave', function(e) { return ref.file_drag_hover(e, e.type == 'dragover'); })
-        .get(0).addEventListener('drop', function(e) { return ref.file_dropped(e); }, false);
-    }
-
-    // catch document (and iframe) mouse clicks
-    var body_mouseup = function(e) { return ref.doc_mouse_up(e); };
-    $(document.body)
-      .mouseup(body_mouseup)
-      .keydown(function(e) { return ref.doc_keypress(e); });
-
-    rcube_webmail.set_iframe_events({mouseup: body_mouseup});
-
-    // trigger init event hook
-    this.triggerEvent('init', { task:this.task, action:this.env.action });
-
-    // execute all foreign onload scripts
-    // @deprecated
-    for (n in this.onloads) {
-      if (typeof this.onloads[n] === 'string')
-        eval(this.onloads[n]);
-      else if (typeof this.onloads[n] === 'function')
-        this.onloads[n]();
-    }
-
-    // register menu buttons
-    $('[data-popup]').each(function() { ref.register_menu_button(this, $(this).data('popup')); });
-
-    // start keep-alive and refresh intervals
-    this.start_refresh();
-    this.start_keepalive();
-  };
-
-  this.log = function(msg)
-  {
-    if (this.env.devel_mode && window.console && console.log)
-      console.log(msg);
-  };
-
-  /*********************************************************/
-  /*********       client command interface        *********/
-  /*********************************************************/
-
-  // execute a specific command on the web client
-  this.command = function(command, props, obj, event, allow_disabled)
-  {
-    var ret;
-
-    if (obj && obj.blur && !(event && rcube_event.is_keyboard(event)))
-      obj.blur();
-
-    // do nothing if interface is locked by another command
-    // with exception for searching reset and menu
-    if (this.busy && !(command == 'reset-search' && this.last_command == 'search') && !command.match(/^menu-/))
-      return false;
-
-    // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
-    if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) {
-      return true;
-    }
-
-    // command not supported or allowed
-    if (!allow_disabled && !this.commands[command]) {
-      // pass command to parent window
-      if (this.is_framed())
-        parent.rcmail.command(command, props);
-
-      return false;
-    }
-
-    // check input before leaving compose step
-    if (this.task == 'mail' && this.env.action == 'compose' && !this.env.server_error && command != 'save-pref'
-      && ($.inArray(command, this.env.compose_commands) < 0 || command.startsWith('compose-encrypted') && ref.mailvelope_editor)
-      && !this.compose_skip_unsavedcheck
-    ) {
-      if (!this.env.is_sent && this.cmp_hash != this.compose_field_hash()) {
-        this.confirm_dialog(this.get_label('notsentwarning'), 'discard', function() {
-            // remove copy from local storage if compose screen is left intentionally
-            ref.remove_compose_data(ref.env.compose_id);
-            ref.compose_skip_unsavedcheck = true;
-            ref.command(command, props, obj, event);
-          });
-
-        return false;
-      }
-    }
-
-    this.last_command = command;
-    this.command_aborted = false;
-
-    // trigger plugin hooks
-    this.triggerEvent('actionbefore', {props: props, action: command, originalEvent: event});
-
-    if ((ret = this.triggerEvent('before' + command, props || event)) !== undefined) {
-      // abort if one of the handlers returned false
-      if (ret === false)
-        return false;
-
-      props = ret;
-    }
-
-    // process external commands
-    if (typeof this.command_handlers[command] === 'function') {
-      ret = this.command_handlers[command](props, obj, event);
-    }
-    else if (typeof this.command_handlers[command] === 'string') {
-      ret = window[this.command_handlers[command]](props, obj, event);
-    }
-    // process internal commands
-    else {
-      ret = this.command_handler(command, props, obj, event);
-    }
-
-    if (!this.command_aborted && this.triggerEvent('after' + command, props) === false)
-      ret = false;
-
-    this.triggerEvent('actionafter', {props: props, action: command, aborted: this.command_aborted, ret: ret, originalEvent: event});
-
-    if (ret === false)
-      return false;
-
-    if ((obj && ret !== true) || this.command_aborted === true)
-      return false;
-
-    return true;
-  };
-
-  // execute a specific known command
-  this.command_handler = function(command, props, obj, event)
-  {
-    var uid, cid, url, flag;
-
-    // process internal command
-    switch (command) {
-
-      // commands to switch task
-      case 'logout':
-      case 'mail':
-      case 'addressbook':
-      case 'settings':
-        this.switch_task(command);
-        break;
-
-      case 'about':
-        this.redirect('?_task=settings&_action=about', false);
-        break;
-
-      case 'permaurl':
-        if (obj && obj.href && obj.target)
-          return true;
-        if (this.env.permaurl)
-          parent.location.href = this.env.permaurl;
-        break;
-
-      case 'extwin':
-        if (this.env.action == 'compose') {
-          var form = this.gui_objects.messageform,
-            win = this.open_window('');
-
-          if (win) {
-            this.save_compose_form_local();
-            this.compose_skip_unsavedcheck = true;
-            $("[name='_action']", form).val('compose');
-            form.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
-            form.target = win.name;
-            form.submit();
-          }
-        }
-        else {
-          this.open_window(this.env.permaurl, true);
-        }
-        break;
-
-      case 'change-format':
-        url = this.env.permaurl + '&_format=' + props;
-
-        if (this.env.action == 'preview')
-          url = url.replace(/_action=show/, '_action=preview') + '&_framed=1';
-        if (this.env.extwin)
-          url += '&_extwin=1';
-
-        location.href = url;
-        break;
-
-      case 'menu-open':
-        if (props && props.menu == 'attachmentmenu') {
-          var mimetype = this.env.attachments[props.id];
-          if (mimetype && mimetype.mimetype) // in compose format is different
-            mimetype = mimetype.mimetype;
-          this.enable_command('open-attachment', mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0);
-        }
-        this.show_menu(props, props.show || undefined, event);
-        break;
-
-      case 'menu-close':
-        this.hide_menu(props, event);
-        break;
-
-      case 'menu-save':
-        this.triggerEvent(command, {props:props, originalEvent:event});
-        return false;
-
-      case 'open':
-        if (uid = this.get_single_uid()) {
-          obj.href = this.url('show', this.params_from_uid(uid, {_extwin: 1}));
-          return true;
-        }
-        break;
-
-      case 'close':
-        if (this.env.extwin)
-          window.close();
-        break;
-
-      case 'list':
-        if (props && props != '') {
-          this.reset_qsearch(true);
-        }
-        if (this.env.action == 'compose' && this.env.extwin) {
-          window.close();
-        }
-        else if (this.task == 'mail') {
-          this.list_mailbox(props, props ? 1 : '');
-          this.set_button_titles();
-        }
-        else if (this.task == 'addressbook')
-          this.list_contacts(props);
-        break;
-
-      case 'set-listmode':
-        this.set_list_options(null, undefined, undefined, props == 'threads' ? 1 : 0);
-        break;
-
-      case 'sort':
-        var sort_order = this.env.sort_order,
-          sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;
-
-        if (!this.env.disabled_sort_order)
-          sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';
-
-        // set table header and update env
-        this.set_list_sorting(sort_col, sort_order);
-
-        // reload message list
-        this.list_mailbox('', '', sort_col+'_'+sort_order);
-        break;
-
-      case 'nextpage':
-        this.list_page('next');
-        break;
-
-      case 'lastpage':
-        this.list_page('last');
-        break;
-
-      case 'previouspage':
-        this.list_page('prev');
-        break;
-
-      case 'firstpage':
-        this.list_page('first');
-        break;
-
-      case 'expunge':
-        if (this.env.exists)
-          this.expunge_mailbox(this.env.mailbox);
-        break;
-
-      case 'purge':
-      case 'empty-mailbox':
-        if (this.env.exists)
-          this.purge_mailbox(this.env.mailbox);
-        break;
-
-      // common commands used in multiple tasks
-      case 'show':
-        if (this.task == 'mail') {
-          uid = this.get_single_uid();
-          if (uid && (!this.env.uid || uid != this.env.uid)) {
-            var mbox = this.get_message_mailbox(uid);
-            if (mbox == this.env.drafts_mailbox)
-              this.open_compose_step({_draft_uid: uid, _mbox: mbox});
-            else
-              this.show_message(uid);
-          }
-        }
-        else if (this.task == 'addressbook') {
-          cid = props ? props : this.get_single_cid();
-          if (cid && !(this.env.action == 'show' && cid == this.env.cid))
-            this.load_contact(cid, 'show');
-        }
-        else if (this.task == 'settings') {
-          this.goto_url('settings/' + props, {_framed: 0});
-        }
-        break;
-
-      case 'add':
-        if (this.task == 'addressbook')
-          this.load_contact(0, 'add');
-        else if (this.task == 'settings' && this.env.action == 'responses')
-          this.load_response(0, 'add-response');
-        else if (this.task == 'settings')
-          this.load_identity(0, 'add-identity');
-        break;
-
-      case 'edit':
-        if (this.task == 'addressbook' && (cid = this.get_single_cid()))
-          this.load_contact(cid, 'edit');
-        else if (this.task == 'mail' && (uid = this.get_single_uid())) {
-          url = { _mbox: this.get_message_mailbox(uid) };
-          url[url._mbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = uid;
-          this.open_compose_step(url);
-        }
-        break;
-
-      case 'save':
-        var input, form = this.gui_objects.editform;
-        if (form) {
-          // user prefs
-          if ((input = $("[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) {
-            this.alert_dialog(this.get_label('nopagesizewarning'), function() {
-              input.focus();
+        ) {
+            this.treelist = new rcube_treelist_widget(this.gui_objects.folderlist, {
+                selectable: true,
+                id_prefix: 'rcmli',
+                parent_focus: true,
+                id_encode: this.html_identifier_encode,
+                id_decode: this.html_identifier_decode,
+                check_droptarget: function(node) { return !node.virtual && ref.check_droptarget(node.id); }
             });
-            break;
-          }
-          // contacts/identities
-          else {
-            // reload form
-            if (props == 'reload') {
-              form.action += '&_reload=1';
-            }
-            else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
-              (input = $("[name='_email']", form)) && input.length && !rcube_check_email(input.val())
-            ) {
-              this.alert_dialog(this.get_label('noemailwarning'), function() {
-                input.focus();
-              });
-              break;
-            }
-          }
 
-          // add selected source (on the list)
-          if (parent.rcmail && parent.rcmail.env.source)
-            form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);
-
-          form.submit();
-        }
-        break;
-
-      case 'delete':
-        // mail task
-        if (this.task == 'mail')
-          this.delete_messages(event);
-        // addressbook task
-        else if (this.task == 'addressbook')
-          this.delete_contacts();
-        // settings: canned response
-        else if (this.task == 'settings' && this.env.action == 'responses')
-          this.delete_response();
-        // settings: user identities
-        else if (this.task == 'settings')
-          this.delete_identity();
-        break;
-
-      // mail task commands
-      case 'move':
-      case 'moveto': // deprecated
-        if (this.task == 'mail')
-          this.move_messages(props, event);
-        else if (this.task == 'addressbook')
-          this.move_contacts(props, event);
-        break;
-
-      case 'copy':
-        if (this.task == 'mail')
-          this.copy_messages(props, event);
-        else if (this.task == 'addressbook')
-          this.copy_contacts(props, event);
-        break;
-
-      case 'mark':
-        if (props)
-          this.mark_message(props);
-        break;
-
-      case 'toggle_status':
-      case 'toggle_flag':
-        flag = command == 'toggle_flag' ? 'flagged' : 'read';
-
-        if (uid = props) {
-          // toggle flagged/unflagged
-          if (flag == 'flagged') {
-            if (this.message_list.rows[uid].flagged)
-              flag = 'unflagged';
-          }
-          // toggle read/unread
-          else if (this.message_list.rows[uid].deleted)
-            flag = 'undelete';
-          else if (!this.message_list.rows[uid].unread)
-            flag = 'unread';
-
-          this.mark_message(flag, uid);
+            this.treelist
+                .addEventListener('collapse', function(node) { ref.folder_collapsed(node); })
+                .addEventListener('expand', function(node) { ref.folder_collapsed(node); })
+                .addEventListener('beforeselect', function(node) { return !ref.busy; })
+                .addEventListener('select', function(node) {
+                    ref.triggerEvent('selectfolder', { folder:node.id, prefix:'rcmli' });
+                    ref.mark_all_read_state();
+                });
         }
 
-        break;
-
-      case 'add-contact':
-        this.add_contact(props);
-        break;
-
-      case 'load-remote':
-        if (this.env.uid) {
-          if (props && this.env.sender) {
-            this.add_contact(this.env.sender, true, props);
-            break;
-          }
-
-          this.show_message(this.env.uid, true, this.env.action == 'preview');
-        }
-        break;
-
-      case 'load-attachment':
-      case 'open-attachment':
-      case 'download-attachment':
-        var params, mimetype = this.env.attachments[props];
-
-        if (this.env.action == 'compose') {
-          params = {_file: props, _id: this.env.compose_id};
-          mimetype = mimetype ? mimetype.mimetype : '';
-        }
-        else {
-          params = {_mbox: this.env.mailbox, _uid: this.env.uid, _part: props};
+        // activate html5 file drop feature (if browser supports it and if configured)
+        if (this.gui_objects.filedrop && this.env.filedrop && window.FormData) {
+            $(document.body).on('dragover dragleave drop', function(e) { return ref.document_drag_hover(e, e.type == 'dragover'); });
+            $(this.gui_objects.filedrop).addClass('droptarget')
+                .on('dragover dragleave', function(e) { return ref.file_drag_hover(e, e.type == 'dragover'); })
+                .get(0).addEventListener('drop', function(e) { return ref.file_dropped(e); }, false);
         }
 
-        // open attachment in frame if it's of a supported mimetype
-        if (command != 'download-attachment' && mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0) {
-          // Note: We disable _framed for proper X-Frame-Options:deny support (#6688)
-          if (this.open_window(this.url('get', $.extend({_frame: 1, _framed: 0}, params))))
+        // catch document (and iframe) mouse clicks
+        var body_mouseup = function(e) { return ref.doc_mouse_up(e); };
+        $(document.body)
+            .mouseup(body_mouseup)
+            .keydown(function(e) { return ref.doc_keypress(e); });
+
+        rcube_webmail.set_iframe_events({mouseup: body_mouseup});
+
+        // trigger init event hook
+        this.triggerEvent('init', { task:this.task, action:this.env.action });
+
+        // execute all foreign onload scripts
+        // @deprecated
+        for (n in this.onloads) {
+            if (typeof this.onloads[n] === 'string')
+                eval(this.onloads[n]);
+            else if (typeof this.onloads[n] === 'function')
+                this.onloads[n]();
+        }
+
+        // register menu buttons
+        $('[data-popup]').each(function() { ref.register_menu_button(this, $(this).data('popup')); });
+
+        // start keep-alive and refresh intervals
+        this.start_refresh();
+        this.start_keepalive();
+    };
+
+    this.log = function(msg)
+    {
+        if (this.env.devel_mode && window.console && console.log)
+            console.log(msg);
+    };
+
+    /*********************************************************/
+    /*********       client command interface        *********/
+    /*********************************************************/
+
+    // execute a specific command on the web client
+    this.command = function(command, props, obj, event, allow_disabled)
+    {
+        var ret;
+
+        if (obj && obj.blur && !(event && rcube_event.is_keyboard(event)))
+            obj.blur();
+
+        // do nothing if interface is locked by another command
+        // with exception for searching reset and menu
+        if (this.busy && !(command == 'reset-search' && this.last_command == 'search') && !command.match(/^menu-/))
+            return false;
+
+        // let the browser handle this click (shift/ctrl usually opens the link in a new window/tab)
+        if ((obj && obj.href && String(obj.href).indexOf('#') < 0) && rcube_event.get_modifier(event)) {
             return true;
         }
 
-        params._download = 1;
+        // command not supported or allowed
+        if (!allow_disabled && !this.commands[command]) {
+            // pass command to parent window
+            if (this.is_framed())
+                parent.rcmail.command(command, props);
 
-        // prevent from page unload warning in compose
-        this.compose_skip_unsavedcheck = 1;
-        this.goto_url('get', params, false, true);
-        this.compose_skip_unsavedcheck = 0;
+            return false;
+        }
+
+        // check input before leaving compose step
+        if (this.task == 'mail' && this.env.action == 'compose' && !this.env.server_error && command != 'save-pref'
+      && ($.inArray(command, this.env.compose_commands) < 0 || command.startsWith('compose-encrypted') && ref.mailvelope_editor)
+      && !this.compose_skip_unsavedcheck
+        ) {
+            if (!this.env.is_sent && this.cmp_hash != this.compose_field_hash()) {
+                this.confirm_dialog(this.get_label('notsentwarning'), 'discard', function() {
+                    // remove copy from local storage if compose screen is left intentionally
+                    ref.remove_compose_data(ref.env.compose_id);
+                    ref.compose_skip_unsavedcheck = true;
+                    ref.command(command, props, obj, event);
+                });
+
+                return false;
+            }
+        }
+
+        this.last_command = command;
+        this.command_aborted = false;
+
+        // trigger plugin hooks
+        this.triggerEvent('actionbefore', {props: props, action: command, originalEvent: event});
+
+        if ((ret = this.triggerEvent('before' + command, props || event)) !== undefined) {
+            // abort if one of the handlers returned false
+            if (ret === false)
+                return false;
+
+            props = ret;
+        }
+
+        // process external commands
+        if (typeof this.command_handlers[command] === 'function') {
+            ret = this.command_handlers[command](props, obj, event);
+        }
+        else if (typeof this.command_handlers[command] === 'string') {
+            ret = window[this.command_handlers[command]](props, obj, event);
+        }
+        // process internal commands
+        else {
+            ret = this.command_handler(command, props, obj, event);
+        }
+
+        if (!this.command_aborted && this.triggerEvent('after' + command, props) === false)
+            ret = false;
+
+        this.triggerEvent('actionafter', {props: props, action: command, aborted: this.command_aborted, ret: ret, originalEvent: event});
+
+        if (ret === false)
+            return false;
+
+        if ((obj && ret !== true) || this.command_aborted === true)
+            return false;
 
         return true;
+    };
 
-      case 'select-all':
-        this.select_all_mode = props ? false : true;
-        this.dummy_select = true; // prevent msg opening if there's only one msg on the list
-        var list = this[this.task == 'addressbook' ? 'contact_list' : 'message_list'];
-        if (props == 'invert')
-          list.invert_selection();
+    // execute a specific known command
+    this.command_handler = function(command, props, obj, event)
+    {
+        var uid, cid, url, flag;
+
+        // process internal command
+        switch (command) {
+
+            // commands to switch task
+            case 'logout':
+            case 'mail':
+            case 'addressbook':
+            case 'settings':
+                this.switch_task(command);
+                break;
+
+            case 'about':
+                this.redirect('?_task=settings&_action=about', false);
+                break;
+
+            case 'permaurl':
+                if (obj && obj.href && obj.target)
+                    return true;
+                if (this.env.permaurl)
+                    parent.location.href = this.env.permaurl;
+                break;
+
+            case 'extwin':
+                if (this.env.action == 'compose') {
+                    var form = this.gui_objects.messageform,
+                        win = this.open_window('');
+
+                    if (win) {
+                        this.save_compose_form_local();
+                        this.compose_skip_unsavedcheck = true;
+                        $("[name='_action']", form).val('compose');
+                        form.action = this.url('mail/compose', { _id: this.env.compose_id, _extwin: 1 });
+                        form.target = win.name;
+                        form.submit();
+                    }
+                }
+                else {
+                    this.open_window(this.env.permaurl, true);
+                }
+                break;
+
+            case 'change-format':
+                url = this.env.permaurl + '&_format=' + props;
+
+                if (this.env.action == 'preview')
+                    url = url.replace(/_action=show/, '_action=preview') + '&_framed=1';
+                if (this.env.extwin)
+                    url += '&_extwin=1';
+
+                location.href = url;
+                break;
+
+            case 'menu-open':
+                if (props && props.menu == 'attachmentmenu') {
+                    var mimetype = this.env.attachments[props.id];
+                    if (mimetype && mimetype.mimetype) // in compose format is different
+                        mimetype = mimetype.mimetype;
+                    this.enable_command('open-attachment', mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0);
+                }
+                this.show_menu(props, props.show || undefined, event);
+                break;
+
+            case 'menu-close':
+                this.hide_menu(props, event);
+                break;
+
+            case 'menu-save':
+                this.triggerEvent(command, {props:props, originalEvent:event});
+                return false;
+
+            case 'open':
+                if (uid = this.get_single_uid()) {
+                    obj.href = this.url('show', this.params_from_uid(uid, {_extwin: 1}));
+                    return true;
+                }
+                break;
+
+            case 'close':
+                if (this.env.extwin)
+                    window.close();
+                break;
+
+            case 'list':
+                if (props && props != '') {
+                    this.reset_qsearch(true);
+                }
+                if (this.env.action == 'compose' && this.env.extwin) {
+                    window.close();
+                }
+                else if (this.task == 'mail') {
+                    this.list_mailbox(props, props ? 1 : '');
+                    this.set_button_titles();
+                }
+                else if (this.task == 'addressbook')
+                    this.list_contacts(props);
+                break;
+
+            case 'set-listmode':
+                this.set_list_options(null, undefined, undefined, props == 'threads' ? 1 : 0);
+                break;
+
+            case 'sort':
+                var sort_order = this.env.sort_order,
+                    sort_col = !this.env.disabled_sort_col ? props : this.env.sort_col;
+
+                if (!this.env.disabled_sort_order)
+                    sort_order = this.env.sort_col == sort_col && sort_order == 'ASC' ? 'DESC' : 'ASC';
+
+                // set table header and update env
+                this.set_list_sorting(sort_col, sort_order);
+
+                // reload message list
+                this.list_mailbox('', '', sort_col+'_'+sort_order);
+                break;
+
+            case 'nextpage':
+                this.list_page('next');
+                break;
+
+            case 'lastpage':
+                this.list_page('last');
+                break;
+
+            case 'previouspage':
+                this.list_page('prev');
+                break;
+
+            case 'firstpage':
+                this.list_page('first');
+                break;
+
+            case 'expunge':
+                if (this.env.exists)
+                    this.expunge_mailbox(this.env.mailbox);
+                break;
+
+            case 'purge':
+            case 'empty-mailbox':
+                if (this.env.exists)
+                    this.purge_mailbox(this.env.mailbox);
+                break;
+
+                // common commands used in multiple tasks
+            case 'show':
+                if (this.task == 'mail') {
+                    uid = this.get_single_uid();
+                    if (uid && (!this.env.uid || uid != this.env.uid)) {
+                        var mbox = this.get_message_mailbox(uid);
+                        if (mbox == this.env.drafts_mailbox)
+                            this.open_compose_step({_draft_uid: uid, _mbox: mbox});
+                        else
+                            this.show_message(uid);
+                    }
+                }
+                else if (this.task == 'addressbook') {
+                    cid = props ? props : this.get_single_cid();
+                    if (cid && !(this.env.action == 'show' && cid == this.env.cid))
+                        this.load_contact(cid, 'show');
+                }
+                else if (this.task == 'settings') {
+                    this.goto_url('settings/' + props, {_framed: 0});
+                }
+                break;
+
+            case 'add':
+                if (this.task == 'addressbook')
+                    this.load_contact(0, 'add');
+                else if (this.task == 'settings' && this.env.action == 'responses')
+                    this.load_response(0, 'add-response');
+                else if (this.task == 'settings')
+                    this.load_identity(0, 'add-identity');
+                break;
+
+            case 'edit':
+                if (this.task == 'addressbook' && (cid = this.get_single_cid()))
+                    this.load_contact(cid, 'edit');
+                else if (this.task == 'mail' && (uid = this.get_single_uid())) {
+                    url = { _mbox: this.get_message_mailbox(uid) };
+                    url[url._mbox == this.env.drafts_mailbox && props != 'new' ? '_draft_uid' : '_uid'] = uid;
+                    this.open_compose_step(url);
+                }
+                break;
+
+            case 'save':
+                var input, form = this.gui_objects.editform;
+                if (form) {
+                    // user prefs
+                    if ((input = $("[name='_pagesize']", form)) && input.length && isNaN(parseInt(input.val()))) {
+                        this.alert_dialog(this.get_label('nopagesizewarning'), function() {
+                            input.focus();
+                        });
+                        break;
+                    }
+                    // contacts/identities
+                    else {
+                        // reload form
+                        if (props == 'reload') {
+                            form.action += '&_reload=1';
+                        }
+                        else if (this.task == 'settings' && (this.env.identities_level % 2) == 0  &&
+              (input = $("[name='_email']", form)) && input.length && !rcube_check_email(input.val())
+                        ) {
+                            this.alert_dialog(this.get_label('noemailwarning'), function() {
+                                input.focus();
+                            });
+                            break;
+                        }
+                    }
+
+                    // add selected source (on the list)
+                    if (parent.rcmail && parent.rcmail.env.source)
+                        form.action = this.add_url(form.action, '_orig_source', parent.rcmail.env.source);
+
+                    form.submit();
+                }
+                break;
+
+            case 'delete':
+                // mail task
+                if (this.task == 'mail')
+                    this.delete_messages(event);
+                // addressbook task
+                else if (this.task == 'addressbook')
+                    this.delete_contacts();
+                // settings: canned response
+                else if (this.task == 'settings' && this.env.action == 'responses')
+                    this.delete_response();
+                // settings: user identities
+                else if (this.task == 'settings')
+                    this.delete_identity();
+                break;
+
+                // mail task commands
+            case 'move':
+            case 'moveto': // deprecated
+                if (this.task == 'mail')
+                    this.move_messages(props, event);
+                else if (this.task == 'addressbook')
+                    this.move_contacts(props, event);
+                break;
+
+            case 'copy':
+                if (this.task == 'mail')
+                    this.copy_messages(props, event);
+                else if (this.task == 'addressbook')
+                    this.copy_contacts(props, event);
+                break;
+
+            case 'mark':
+                if (props)
+                    this.mark_message(props);
+                break;
+
+            case 'toggle_status':
+            case 'toggle_flag':
+                flag = command == 'toggle_flag' ? 'flagged' : 'read';
+
+                if (uid = props) {
+                    // toggle flagged/unflagged
+                    if (flag == 'flagged') {
+                        if (this.message_list.rows[uid].flagged)
+                            flag = 'unflagged';
+                    }
+                    // toggle read/unread
+                    else if (this.message_list.rows[uid].deleted)
+                        flag = 'undelete';
+                    else if (!this.message_list.rows[uid].unread)
+                        flag = 'unread';
+
+                    this.mark_message(flag, uid);
+                }
+
+                break;
+
+            case 'add-contact':
+                this.add_contact(props);
+                break;
+
+            case 'load-remote':
+                if (this.env.uid) {
+                    if (props && this.env.sender) {
+                        this.add_contact(this.env.sender, true, props);
+                        break;
+                    }
+
+                    this.show_message(this.env.uid, true, this.env.action == 'preview');
+                }
+                break;
+
+            case 'load-attachment':
+            case 'open-attachment':
+            case 'download-attachment':
+                var params, mimetype = this.env.attachments[props];
+
+                if (this.env.action == 'compose') {
+                    params = {_file: props, _id: this.env.compose_id};
+                    mimetype = mimetype ? mimetype.mimetype : '';
+                }
+                else {
+                    params = {_mbox: this.env.mailbox, _uid: this.env.uid, _part: props};
+                }
+
+                // open attachment in frame if it's of a supported mimetype
+                if (command != 'download-attachment' && mimetype && this.env.mimetypes && $.inArray(mimetype, this.env.mimetypes) >= 0) {
+                    // Note: We disable _framed for proper X-Frame-Options:deny support (#6688)
+                    if (this.open_window(this.url('get', $.extend({_frame: 1, _framed: 0}, params))))
+                        return true;
+                }
+
+                params._download = 1;
+
+                // prevent from page unload warning in compose
+                this.compose_skip_unsavedcheck = 1;
+                this.goto_url('get', params, false, true);
+                this.compose_skip_unsavedcheck = 0;
+
+                return true;
+
+            case 'select-all':
+                this.select_all_mode = props ? false : true;
+                this.dummy_select = true; // prevent msg opening if there's only one msg on the list
+                var list = this[this.task == 'addressbook' ? 'contact_list' : 'message_list'];
+                if (props == 'invert')
+                    list.invert_selection();
+                else
+                    list.select_all(props == 'page' ? '' : props);
+                this.dummy_select = null;
+                break;
+
+            case 'select-none':
+                this.select_all_mode = false;
+                this[this.task == 'addressbook' ? 'contact_list' : 'message_list'].clear_selection();
+                break;
+
+            case 'expand-all':
+                this.env.autoexpand_threads = 1;
+                this.message_list.expand_all();
+                break;
+
+            case 'expand-unread':
+                this.env.autoexpand_threads = 2;
+                this.message_list.collapse_all();
+                this.expand_unread();
+                break;
+
+            case 'collapse-all':
+                this.env.autoexpand_threads = 0;
+                this.message_list.collapse_all();
+                break;
+
+            case 'nextmessage':
+                if (this.env.next_uid)
+                    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, false, this.env.action == 'preview');
+                break;
+
+            case 'firstmessage':
+                if (this.env.first_uid)
+                    this.show_message(this.env.first_uid);
+                break;
+
+            case 'compose':
+                url = {};
+
+                if (this.task == 'mail') {
+                    url = {_mbox: this.env.mailbox, _search: this.env.search_request};
+                    if (props)
+                        url._to = props;
+                }
+                // modify url if we're in addressbook
+                else if (this.task == 'addressbook') {
+                    // switch to mail compose step directly
+                    if (props && props.indexOf('@') > 0) {
+                        url._to = props;
+                    }
+                    else {
+                        var a_cids = [];
+                        // use contact id passed as command parameter
+                        if (props)
+                            a_cids.push(props);
+                        // get selected contacts
+                        else if (this.contact_list)
+                            a_cids = this.contact_list.get_selection();
+
+                        if (a_cids.length) {
+                            this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
+                            break;
+                        }
+                        else if (this.env.group && this.env.pagecount) {
+                            this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);
+                            break;
+                        }
+                    }
+                }
+                else if (props && typeof props == 'string') {
+                    url._to = props;
+                }
+                else if (props && typeof props == 'object') {
+                    $.extend(url, props);
+                }
+
+                this.open_compose_step(url);
+                break;
+
+            case 'spellcheck':
+                if (this.spellcheck_state()) {
+                    this.editor.spellcheck_stop();
+                }
+                else {
+                    this.editor.spellcheck_start();
+                }
+                break;
+
+            case 'savedraft':
+                // Reset the auto-save timer
+                clearTimeout(this.save_timer);
+
+                // compose form did not change (and draft wasn't saved already)
+                if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
+                    this.auto_save_start();
+                    break;
+                }
+
+                this.submit_messageform(true);
+                break;
+
+            case 'send':
+                if (!props.nocheck && !this.env.is_sent && !this.check_compose_input(command))
+                    break;
+
+                // Reset the auto-save timer
+                clearTimeout(this.save_timer);
+
+                this.submit_messageform();
+                break;
+
+            case 'send-attachment':
+                // Reset the auto-save timer
+                clearTimeout(this.save_timer);
+
+                if (!(flag = this.upload_file(props || this.gui_objects.uploadform, 'upload'))) {
+                    if (flag !== false)
+                        this.alert_dialog(this.get_label('selectimportfile'));
+                    aborted = true;
+                }
+                break;
+
+            case 'insert-sig':
+                this.change_identity($("[name='_from']")[0], true);
+                break;
+
+            case 'list-addresses':
+                this.list_contacts(props);
+                this.enable_command('add-recipient', false);
+                break;
+
+            case 'add-recipient':
+                this.compose_add_recipient(props);
+                break;
+
+            case 'reply-all':
+            case 'reply-list':
+            case 'reply':
+                if (uid = this.get_single_uid()) {
+                    url = {_reply_uid: uid, _mbox: this.get_message_mailbox(uid), _search: this.env.search_request};
+                    if (command == 'reply-all')
+                    // do reply-list, when list is detected and popup menu wasn't used
+                        url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
+                    else if (command == 'reply-list')
+                        url._all = 'list';
+
+                    this.open_compose_step(url);
+                }
+                break;
+
+            case 'forward-attachment':
+            case 'forward-inline':
+            case 'forward':
+                var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
+                if (uids.length) {
+                    url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox, _search: this.env.search_request };
+                    if (command == 'forward-attachment' || (!props && this.env.forward_attachment) || uids.length > 1)
+                        url._attachment = 1;
+                    this.open_compose_step(url);
+                }
+                break;
+
+            case 'print':
+                if (this.task == 'addressbook') {
+                    if (uid = this.get_single_cid()) {
+                        url = '&_action=print&_cid=' + uid;
+                        if (this.env.source)
+                            url += '&_source=' + urlencode(this.env.source);
+                        this.open_window(this.env.comm_path + url, true, true);
+                    }
+                }
+                else if (this.env.action == 'get' && !this.env.is_message) {
+                    this.gui_objects.messagepartframe.contentWindow.print();
+                }
+                else if (uid = this.get_single_uid()) {
+                    url = this.url('print', this.params_from_uid(uid, {_safe: this.env.safemode ? 1 : 0}));
+                    if (this.open_window(url, true, true)) {
+                        if (this.env.action != 'show' && this.env.action != 'get')
+                            this.mark_message('read', uid);
+                    }
+                }
+                break;
+
+            case 'viewsource':
+                if (uid = this.get_single_uid())
+                    this.open_window(this.url('viewsource', this.params_from_uid(uid)), true, true);
+                break;
+
+            case 'download':
+                if (this.env.action == 'get') {
+                    location.href = this.secure_url(location.href.replace(/_frame=/, '_download='));
+                }
+                else if (uid = this.get_single_uid()) {
+                    this.goto_url('viewsource', this.params_from_uid(uid, {_save: 1}), false, true);
+                }
+                break;
+
+                // quicksearch
+            case 'search':
+                return this.qsearch(props);
+
+                // reset quicksearch
+            case 'reset-search':
+                var n, s = this.env.search_request || this.env.qsearch;
+
+                this.reset_qsearch(true);
+
+                if (s && this.env.action == 'compose') {
+                    if (this.contact_list)
+                        this.list_contacts_clear();
+                }
+                else if (s && this.env.mailbox) {
+                    this.list_mailbox(this.env.mailbox, 1);
+                }
+                else if (s && this.task == 'addressbook') {
+                    this.env.source = this.env.last_source || '';
+                    this.env.group = this.env.last_group || '';
+                    this.list_contacts(this.env.source, this.env.group, 1);
+                }
+                break;
+
+            case 'pushgroup':
+                // add group ID and current search to stack
+                var group = {
+                    id: props.id,
+                    search_request: this.env.search_request,
+                    page: this.env.current_page,
+                    search: this.env.search_request && this.gui_objects.qsearchbox ? this.gui_objects.qsearchbox.value : null
+                };
+
+                this.env.address_group_stack.push(group);
+                if (obj && event)
+                    rcube_event.cancel(event);
+
+                // FIXME: no break?
+
+            case 'listgroup':
+                this.reset_qsearch();
+                this.list_contacts(props.source, props.id, 1, group);
+                break;
+
+            case 'popgroup':
+                if (this.env.address_group_stack.length) {
+                    var old = this.env.address_group_stack.pop();
+                    this.reset_qsearch();
+
+                    if (old.search_request) {
+                        // this code is executed when going back to the search result
+                        if (old.search && this.gui_objects.qsearchbox)
+                            $(this.gui_objects.qsearchbox).val(old.search);
+                        this.env.search_request = old.search_request;
+                        this.list_contacts_remote(null, null, this.env.current_page = old.page);
+                    }
+                    else
+                        this.list_contacts(props.source, this.env.address_group_stack[this.env.address_group_stack.length-1].id);
+                }
+                break;
+
+            case 'import-messages':
+                var form = props || this.gui_objects.importform,
+                    importlock = this.set_busy(true, 'importwait');
+
+                if (!(flag = this.upload_file(form, 'import', importlock))) {
+                    this.set_busy(false, null, importlock);
+                    if (flag !== false)
+                        this.alert_dialog(this.get_label('selectimportfile'));
+                    this.command_aborted = true;
+                }
+                break;
+
+            case 'import':
+                var dialog = $('<iframe>').attr('src', this.url('import', {_framed: 1, _target: this.env.source})),
+                    import_func = function(e) {
+                        var win = dialog[0].contentWindow,
+                            form = null;
+
+                        if (win.rcmail.gui_objects.importformmap)
+                            form = win.rcmail.gui_objects.importformmap;
+                        else
+                            form = win.rcmail.gui_objects.importform;
+
+                        if (form) {
+                            var lock, file = win.$('#rcmimportfile')[0];
+                            if (file && !file.value) {
+                                win.rcmail.alert_dialog(win.rcmail.get_label('selectimportfile'));
+                                return;
+                            }
+
+                            lock = win.rcmail.set_busy(true, 'importwait');
+                            $('[name="_unlock"]', form).val(lock);
+                            form.submit();
+                            win.rcmail.lock_form(form, true);
+                            // disable Import button
+                            $(e.target).attr('disabled', true).next().focus();
+                        }
+                    },
+                    close_func = function(event, ui) {
+                        $(this).remove();
+                        if (ref.import_state == 'reload')
+                            ref.command('list');
+                    };
+
+                this.import_state = null;
+                this.import_dialog = this.simple_dialog(dialog, 'importcontacts', import_func, {
+                    close: close_func,
+                    button: 'import',
+                    width: 500,
+                    height: 300
+                });
+
+                break;
+
+            case 'export':
+                if (this.contact_list.rowcount > 0) {
+                    this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request }, false, true);
+                }
+                break;
+
+            case 'export-selected':
+                if (this.contact_list.rowcount > 0) {
+                    this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') }, false, true);
+                }
+                break;
+
+            case 'upload-photo':
+                this.upload_contact_photo(props || this.gui_objects.uploadform);
+                break;
+
+            case 'delete-photo':
+                this.replace_contact_photo('-del-');
+                break;
+
+            case 'undo':
+                this.http_request('undo', '', this.display_message('', 'loading'));
+                break;
+
+                // unified command call (command name == function name)
+            default:
+                var func = command.replace(/-/g, '_');
+                if (this[func] && typeof this[func] === 'function') {
+                    return this[func](props, obj, event);
+                }
+        }
+    };
+
+    // set command(s) enabled or disabled
+    this.enable_command = function()
+    {
+        var i, n, args = Array.prototype.slice.call(arguments),
+            enable = args.pop(), cmd;
+
+        for (n=0; n<args.length; n++) {
+            cmd = args[n];
+            // argument of type array
+            if (typeof cmd === 'string') {
+                this.commands[cmd] = enable;
+                this.set_button(cmd, (enable ? 'act' : 'pas'));
+                this.triggerEvent('enable-command', {command: cmd, status: enable});
+            }
+            // push array elements into commands array
+            else {
+                for (i in cmd)
+                    args.push(cmd[i]);
+            }
+        }
+
+        this.set_menu_buttons();
+    };
+
+    this.command_enabled = function(cmd)
+    {
+        return this.commands[cmd];
+    };
+
+    // lock/unlock interface
+    this.set_busy = function(a, message, id)
+    {
+        if (a && message) {
+            var msg = this.get_label(message);
+            if (msg == message)
+                msg = 'Loading...';
+
+            id = this.display_message(msg, 'loading');
+        }
+        else if (!a && id) {
+            this.hide_message(id);
+        }
+
+        this.busy = a;
+
+        if (this.gui_objects.editform)
+            this.lock_form(this.gui_objects.editform, a);
+
+        return id;
+    };
+
+    // return a localized string
+    this.get_label = function(name, domain)
+    {
+        if (domain && this.labels[domain+'.'+name])
+            return this.labels[domain+'.'+name];
+        else if (this.labels[name])
+            return this.labels[name];
         else
-          list.select_all(props == 'page' ? '' : props);
-        this.dummy_select = null;
-        break;
+            return name;
+    };
 
-      case 'select-none':
-        this.select_all_mode = false;
-        this[this.task == 'addressbook' ? 'contact_list' : 'message_list'].clear_selection();
-        break;
+    // alias for convenience reasons
+    this.gettext = this.get_label;
 
-      case 'expand-all':
-        this.env.autoexpand_threads = 1;
-        this.message_list.expand_all();
-        break;
+    // switch to another application task
+    this.switch_task = function(task)
+    {
+        var action, path;
 
-      case 'expand-unread':
-        this.env.autoexpand_threads = 2;
-        this.message_list.collapse_all();
-        this.expand_unread();
-        break;
-
-      case 'collapse-all':
-        this.env.autoexpand_threads = 0;
-        this.message_list.collapse_all();
-        break;
-
-      case 'nextmessage':
-        if (this.env.next_uid)
-          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, false, this.env.action == 'preview');
-        break;
-
-      case 'firstmessage':
-        if (this.env.first_uid)
-          this.show_message(this.env.first_uid);
-        break;
-
-      case 'compose':
-        url = {};
-
-        if (this.task == 'mail') {
-          url = {_mbox: this.env.mailbox, _search: this.env.search_request};
-          if (props)
-            url._to = props;
+        if ((path = task.split('/')).length == 2) {
+            task = path[0];
+            action = path[1];
         }
-        // modify url if we're in addressbook
-        else if (this.task == 'addressbook') {
-          // switch to mail compose step directly
-          if (props && props.indexOf('@') > 0) {
-            url._to = props;
-          }
-          else {
-            var a_cids = [];
-            // use contact id passed as command parameter
-            if (props)
-              a_cids.push(props);
-            // get selected contacts
-            else if (this.contact_list)
-              a_cids = this.contact_list.get_selection();
 
-            if (a_cids.length) {
-              this.http_post('mailto', { _cid: a_cids.join(','), _source: this.env.source }, true);
-              break;
+        if (this.task === task && task != 'mail')
+            return;
+
+        var url = this.get_task_url(task);
+
+        if (action)
+            url += '&_action=' + action;
+
+        if (task == 'mail')
+            url += '&_mbox=INBOX';
+        else if (task == 'logout') {
+            url = this.secure_url(url);
+            this.clear_compose_data();
+        }
+
+        this.redirect(url);
+    };
+
+    this.get_task_url = function(task, url)
+    {
+        if (!url)
+            url = this.env.comm_path;
+
+        if (url.match(/[?&]_task=[a-zA-Z0-9_-]+/))
+            return url.replace(/_task=[a-zA-Z0-9_-]+/, '_task=' + task);
+        else
+            return url.replace(/\?.*$/, '') + '?_task=' + task;
+    };
+
+    this.reload = function(delay)
+    {
+        if (this.is_framed())
+            parent.rcmail.reload(delay);
+        else if (delay)
+            setTimeout(function() { ref.reload(); }, delay);
+        else if (window.location)
+            location.href = this.url('', {_extwin: this.env.extwin});
+    };
+
+    // Add variable to GET string, replace old value if exists
+    this.add_url = function(url, name, value)
+    {
+        var urldata, datax, hash = '';
+
+        value = urlencode(value);
+
+        if (/(#[a-z0-9_-]*)$/.test(url)) {
+            hash = RegExp.$1;
+            url = url.substr(0, url.length - hash.length);
+        }
+
+        if (/(\?.*)$/.test(url)) {
+            urldata = RegExp.$1;
+            datax = RegExp('((\\?|&)'+RegExp.escape(name)+'=[^&]*)');
+
+            if (datax.test(urldata))
+                urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
+            else
+                urldata += '&' + name + '=' + value;
+
+            return url.replace(/(\?.*)$/, urldata) + hash;
+        }
+
+        return url + '?' + name + '=' + value + hash;
+    };
+
+    // append CSRF protection token to the given url
+    this.secure_url = function(url)
+    {
+        return this.add_url(url, '_token', this.env.request_token);
+    },
+
+    this.is_framed = function()
+    {
+        return this.env.framed && parent.rcmail && parent.rcmail != this && typeof parent.rcmail.command == 'function';
+    };
+
+    this.save_pref = function(prop)
+    {
+        var request = {_name: prop.name, _value: prop.value};
+
+        if (prop.session)
+            request._session = prop.session;
+        if (prop.env)
+            this.env[prop.env] = prop.value;
+
+        this.http_post('save-pref', request);
+    };
+
+    this.html_identifier = function(str, encode)
+    {
+        return encode ? this.html_identifier_encode(str) : String(str).replace(this.identifier_expr, '_');
+    };
+
+    this.html_identifier_encode = function(str)
+    {
+        return Base64.encode(String(str)).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
+    };
+
+    this.html_identifier_decode = function(str)
+    {
+        str = String(str).replace(/-/g, '+').replace(/_/g, '/');
+
+        while (str.length % 4) str += '=';
+
+        return Base64.decode(str);
+    };
+
+
+    /*********************************************************/
+    /*********        event handling methods         *********/
+    /*********************************************************/
+
+    this.drag_menu = function(e, target)
+    {
+        var modkey = rcube_event.get_modifier(e),
+            menu = this.gui_objects.dragmenu;
+
+        if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
+            var pos = rcube_event.get_mouse_pos(e);
+            this.env.drag_target = target;
+            this.show_menu(this.gui_objects.dragmenu.id, true, e);
+            $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'});
+            return true;
+        }
+
+        return false;
+    };
+
+    this.drag_menu_action = function(action)
+    {
+        var menu = this.gui_objects.dragmenu;
+        if (menu) {
+            $(menu).hide();
+        }
+
+        this.command(action, this.env.drag_target);
+        this.env.drag_target = null;
+    };
+
+    this.drag_start = function(list)
+    {
+        this.drag_active = true;
+
+        if (this.preview_timer)
+            clearTimeout(this.preview_timer);
+
+        // prepare treelist widget for dragging interactions
+        if (this.treelist)
+            this.treelist.drag_start();
+    };
+
+    this.drag_end = function(e)
+    {
+        var list, model;
+
+        if (this.treelist)
+            this.treelist.drag_end();
+
+        // execute drag & drop action when mouse was released
+        if (list = this.message_list)
+            model = this.env.mailboxes;
+        else if (list = this.contact_list)
+            model = this.env.contactfolders;
+
+        // Note: we accept only mouse events to ignore dragging aborts with ESC key (#6623)
+        if (this.drag_active && model && this.env.last_folder_target && !rcube_event.is_keyboard(e)) {
+            var target = model[this.env.last_folder_target];
+            list.draglayer.hide();
+
+            if (this.contact_list) {
+                if (!this.contacts_drag_menu(e, target))
+                    this.command('move', target);
             }
-            else if (this.env.group && this.env.pagecount) {
-              this.http_post('mailto', { _gid: this.env.group, _source: this.env.source }, true);
-              break;
+            else if (!this.drag_menu(e, target))
+                this.command('move', target);
+        }
+
+        this.drag_active = false;
+        this.env.last_folder_target = null;
+    };
+
+    this.drag_move = function(e)
+    {
+        if (this.gui_objects.folderlist) {
+            var drag_target, oldclass,
+                layerclass = 'draglayernormal',
+                mouse = rcube_event.get_mouse_pos(e);
+
+            if (this.contact_list && this.contact_list.draglayer)
+                oldclass = this.contact_list.draglayer.attr('class');
+
+            // mouse intersects a valid drop target on the treelist
+            if (this.treelist && (drag_target = this.treelist.intersects(mouse, true))) {
+                this.env.last_folder_target = drag_target;
+                layerclass = 'draglayer' + (this.check_droptarget(drag_target) > 1 ? 'copy' : 'normal');
+            }
+            else {
+                // Clear target, otherwise drag end will trigger move into last valid droptarget
+                this.env.last_folder_target = null;
             }
-          }
-        }
-        else if (props && typeof props == 'string') {
-          url._to = props;
-        }
-        else if (props && typeof props == 'object') {
-          $.extend(url, props);
-        }
 
-        this.open_compose_step(url);
-        break;
+            if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
+                this.contact_list.draglayer.attr('class', layerclass);
+        }
+    };
 
-      case 'spellcheck':
-        if (this.spellcheck_state()) {
-          this.editor.spellcheck_stop();
+    this.collapse_folder = function(name)
+    {
+        if (this.treelist)
+            this.treelist.toggle(name);
+    };
+
+    this.folder_collapsed = function(node)
+    {
+        if (this.folder_collapsed_timer)
+            clearTimeout(this.folder_collapsed_timer);
+
+        var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders',
+            old = this.env[prefname];
+
+        if (node.collapsed) {
+            this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&';
+
+            // select the folder if one of its children is currently selected
+            // don't select if it's virtual (#1488346)
+            if (!node.virtual && this.env.mailbox && this.env.mailbox.startsWith(node.id + this.env.delimiter))
+                this.command('list', node.id);
         }
         else {
-          this.editor.spellcheck_start();
-        }
-        break;
-
-      case 'savedraft':
-        // Reset the auto-save timer
-        clearTimeout(this.save_timer);
-
-        // compose form did not change (and draft wasn't saved already)
-        if (this.env.draft_id && this.cmp_hash == this.compose_field_hash()) {
-          this.auto_save_start();
-          break;
+            var reg = new RegExp('&'+urlencode(node.id)+'&');
+            this.env[prefname] = this.env[prefname].replace(reg, '');
         }
 
-        this.submit_messageform(true);
-        break;
+        if (!this.drag_active) {
+            if (old !== this.env[prefname])
+                this.folder_collapsed_timer = setTimeout(function() { ref.command('save-pref', { name: prefname, value: ref.env[prefname] }); }, 10);
 
-      case 'send':
-        if (!props.nocheck && !this.env.is_sent && !this.check_compose_input(command))
-          break;
-
-        // Reset the auto-save timer
-        clearTimeout(this.save_timer);
-
-        this.submit_messageform();
-        break;
-
-      case 'send-attachment':
-        // Reset the auto-save timer
-        clearTimeout(this.save_timer);
-
-        if (!(flag = this.upload_file(props || this.gui_objects.uploadform, 'upload'))) {
-          if (flag !== false)
-            this.alert_dialog(this.get_label('selectimportfile'));
-          aborted = true;
+            if (this.env.unread_counts)
+                this.set_unread_count_display(node.id, false);
         }
-        break;
+    };
 
-      case 'insert-sig':
-        this.change_identity($("[name='_from']")[0], true);
-        break;
+    // global mouse-click handler to cleanup some UI elements
+    this.doc_mouse_up = function(e)
+    {
+        var list, id, target = rcube_event.get_target(e);
 
-      case 'list-addresses':
-        this.list_contacts(props);
-        this.enable_command('add-recipient', false);
-        break;
+        // ignore event if jquery UI dialog is open
+        if ($(target).closest('.ui-dialog, .ui-widget-overlay').length)
+            return;
 
-      case 'add-recipient':
-        this.compose_add_recipient(props);
-        break;
-
-      case 'reply-all':
-      case 'reply-list':
-      case 'reply':
-        if (uid = this.get_single_uid()) {
-          url = {_reply_uid: uid, _mbox: this.get_message_mailbox(uid), _search: this.env.search_request};
-          if (command == 'reply-all')
-            // do reply-list, when list is detected and popup menu wasn't used
-            url._all = (!props && this.env.reply_all_mode == 1 && this.commands['reply-list'] ? 'list' : 'all');
-          else if (command == 'reply-list')
-            url._all = 'list';
-
-          this.open_compose_step(url);
+        // remove focus from list widgets
+        if (window.rcube_list_widget && rcube_list_widget._instances.length) {
+            $.each(rcube_list_widget._instances, function(i, list) {
+                if (list && !rcube_mouse_is_over(e, list.list.parentNode))
+                    list.blur();
+            });
         }
-        break;
 
-      case 'forward-attachment':
-      case 'forward-inline':
-      case 'forward':
-        var uids = this.env.uid ? [this.env.uid] : (this.message_list ? this.message_list.get_selection() : []);
-        if (uids.length) {
-          url = { _forward_uid: this.uids_to_list(uids), _mbox: this.env.mailbox, _search: this.env.search_request };
-          if (command == 'forward-attachment' || (!props && this.env.forward_attachment) || uids.length > 1)
-            url._attachment = 1;
-          this.open_compose_step(url);
+        // reset 'pressed' buttons
+        if (this.buttons_sel) {
+            for (id in this.buttons_sel)
+                if (typeof id !== 'function')
+                    this.button_out(this.buttons_sel[id], id);
+            this.buttons_sel = {};
         }
-        break;
 
-      case 'print':
-        if (this.task == 'addressbook') {
-          if (uid = this.get_single_cid()) {
-            url = '&_action=print&_cid=' + uid;
-            if (this.env.source)
-              url += '&_source=' + urlencode(this.env.source);
-            this.open_window(this.env.comm_path + url, true, true);
-          }
-        }
-        else if (this.env.action == 'get' && !this.env.is_message) {
-          this.gui_objects.messagepartframe.contentWindow.print();
-        }
-        else if (uid = this.get_single_uid()) {
-          url = this.url('print', this.params_from_uid(uid, {_safe: this.env.safemode ? 1 : 0}));
-          if (this.open_window(url, true, true)) {
-            if (this.env.action != 'show' && this.env.action != 'get')
-              this.mark_message('read', uid);
-          }
-        }
-        break;
+        // reset popup menus; delayed to have updated menu_stack data
+        setTimeout(function(e) {
+            var obj, skip, config, id, i, parents = $(target).parents();
+            for (i = ref.menu_stack.length - 1; i >= 0; i--) {
+                id = ref.menu_stack[i];
+                obj = $('#' + id);
 
-      case 'viewsource':
-        if (uid = this.get_single_uid())
-          this.open_window(this.url('viewsource', this.params_from_uid(uid)), true, true);
-        break;
-
-      case 'download':
-        if (this.env.action == 'get') {
-          location.href = this.secure_url(location.href.replace(/_frame=/, '_download='));
-        }
-        else if (uid = this.get_single_uid()) {
-          this.goto_url('viewsource', this.params_from_uid(uid, {_save: 1}), false, true);
-        }
-        break;
-
-      // quicksearch
-      case 'search':
-        return this.qsearch(props);
-
-      // reset quicksearch
-      case 'reset-search':
-        var n, s = this.env.search_request || this.env.qsearch;
-
-        this.reset_qsearch(true);
-
-        if (s && this.env.action == 'compose') {
-          if (this.contact_list)
-            this.list_contacts_clear();
-        }
-        else if (s && this.env.mailbox) {
-          this.list_mailbox(this.env.mailbox, 1);
-        }
-        else if (s && this.task == 'addressbook') {
-          this.env.source = this.env.last_source || '';
-          this.env.group = this.env.last_group || '';
-          this.list_contacts(this.env.source, this.env.group, 1);
-        }
-        break;
-
-      case 'pushgroup':
-        // add group ID and current search to stack
-        var group = {
-          id: props.id,
-          search_request: this.env.search_request,
-          page: this.env.current_page,
-          search: this.env.search_request && this.gui_objects.qsearchbox ? this.gui_objects.qsearchbox.value : null
-        };
-
-        this.env.address_group_stack.push(group);
-        if (obj && event)
-          rcube_event.cancel(event);
-
-        // FIXME: no break?
-
-      case 'listgroup':
-        this.reset_qsearch();
-        this.list_contacts(props.source, props.id, 1, group);
-        break;
-
-      case 'popgroup':
-        if (this.env.address_group_stack.length) {
-          var old = this.env.address_group_stack.pop();
-          this.reset_qsearch();
-
-          if (old.search_request) {
-            // this code is executed when going back to the search result
-            if (old.search && this.gui_objects.qsearchbox)
-              $(this.gui_objects.qsearchbox).val(old.search);
-            this.env.search_request = old.search_request;
-            this.list_contacts_remote(null, null, this.env.current_page = old.page);
-          }
-          else
-            this.list_contacts(props.source, this.env.address_group_stack[this.env.address_group_stack.length-1].id);
-        }
-        break;
-
-      case 'import-messages':
-        var form = props || this.gui_objects.importform,
-          importlock = this.set_busy(true, 'importwait');
-
-        if (!(flag = this.upload_file(form, 'import', importlock))) {
-          this.set_busy(false, null, importlock);
-          if (flag !== false)
-            this.alert_dialog(this.get_label('selectimportfile'));
-          this.command_aborted = true;
-        }
-        break;
-
-      case 'import':
-        var dialog = $('<iframe>').attr('src', this.url('import', {_framed: 1, _target: this.env.source})),
-          import_func = function(e) {
-            var win = dialog[0].contentWindow,
-              form = null;
-
-            if (win.rcmail.gui_objects.importformmap)
-              form = win.rcmail.gui_objects.importformmap;
-            else
-              form = win.rcmail.gui_objects.importform;
-
-            if (form) {
-              var lock, file = win.$('#rcmimportfile')[0];
-              if (file && !file.value) {
-                win.rcmail.alert_dialog(win.rcmail.get_label('selectimportfile'));
-                return;
-              }
-
-              lock = win.rcmail.set_busy(true, 'importwait');
-              $('[name="_unlock"]', form).val(lock);
-              form.submit();
-              win.rcmail.lock_form(form, true);
-              // disable Import button
-              $(e.target).attr('disabled', true).next().focus();
-            }
-          },
-          close_func = function(event, ui) {
-            $(this).remove();
-            if (ref.import_state == 'reload')
-              ref.command('list');
-          };
-
-        this.import_state = null;
-        this.import_dialog = this.simple_dialog(dialog, 'importcontacts', import_func, {
-          close: close_func,
-          button: 'import',
-          width: 500,
-          height: 300
-        });
-
-        break;
-
-      case 'export':
-        if (this.contact_list.rowcount > 0) {
-          this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _search: this.env.search_request }, false, true);
-        }
-        break;
-
-      case 'export-selected':
-        if (this.contact_list.rowcount > 0) {
-          this.goto_url('export', { _source: this.env.source, _gid: this.env.group, _cid: this.contact_list.get_selection().join(',') }, false, true);
-        }
-        break;
-
-      case 'upload-photo':
-        this.upload_contact_photo(props || this.gui_objects.uploadform);
-        break;
-
-      case 'delete-photo':
-        this.replace_contact_photo('-del-');
-        break;
-
-      case 'undo':
-        this.http_request('undo', '', this.display_message('', 'loading'));
-        break;
-
-      // unified command call (command name == function name)
-      default:
-        var func = command.replace(/-/g, '_');
-        if (this[func] && typeof this[func] === 'function') {
-          return this[func](props, obj, event);
-        }
-    }
-  };
-
-  // set command(s) enabled or disabled
-  this.enable_command = function()
-  {
-    var i, n, args = Array.prototype.slice.call(arguments),
-      enable = args.pop(), cmd;
-
-    for (n=0; n<args.length; n++) {
-      cmd = args[n];
-      // argument of type array
-      if (typeof cmd === 'string') {
-        this.commands[cmd] = enable;
-        this.set_button(cmd, (enable ? 'act' : 'pas'));
-        this.triggerEvent('enable-command', {command: cmd, status: enable});
-      }
-      // push array elements into commands array
-      else {
-        for (i in cmd)
-          args.push(cmd[i]);
-      }
-    }
-
-    this.set_menu_buttons();
-  };
-
-  this.command_enabled = function(cmd)
-  {
-    return this.commands[cmd];
-  };
-
-  // lock/unlock interface
-  this.set_busy = function(a, message, id)
-  {
-    if (a && message) {
-      var msg = this.get_label(message);
-      if (msg == message)
-        msg = 'Loading...';
-
-      id = this.display_message(msg, 'loading');
-    }
-    else if (!a && id) {
-      this.hide_message(id);
-    }
-
-    this.busy = a;
-
-    if (this.gui_objects.editform)
-      this.lock_form(this.gui_objects.editform, a);
-
-    return id;
-  };
-
-  // return a localized string
-  this.get_label = function(name, domain)
-  {
-    if (domain && this.labels[domain+'.'+name])
-      return this.labels[domain+'.'+name];
-    else if (this.labels[name])
-      return this.labels[name];
-    else
-      return name;
-  };
-
-  // alias for convenience reasons
-  this.gettext = this.get_label;
-
-  // switch to another application task
-  this.switch_task = function(task)
-  {
-    var action, path;
-
-    if ((path = task.split('/')).length == 2) {
-      task = path[0];
-      action = path[1];
-    }
-
-    if (this.task === task && task != 'mail')
-      return;
-
-    var url = this.get_task_url(task);
-
-    if (action)
-      url += '&_action=' + action;
-
-    if (task == 'mail')
-      url += '&_mbox=INBOX';
-    else if (task == 'logout') {
-      url = this.secure_url(url);
-      this.clear_compose_data();
-    }
-
-    this.redirect(url);
-  };
-
-  this.get_task_url = function(task, url)
-  {
-    if (!url)
-      url = this.env.comm_path;
-
-    if (url.match(/[?&]_task=[a-zA-Z0-9_-]+/))
-        return url.replace(/_task=[a-zA-Z0-9_-]+/, '_task=' + task);
-    else
-        return url.replace(/\?.*$/, '') + '?_task=' + task;
-  };
-
-  this.reload = function(delay)
-  {
-    if (this.is_framed())
-      parent.rcmail.reload(delay);
-    else if (delay)
-      setTimeout(function() { ref.reload(); }, delay);
-    else if (window.location)
-      location.href = this.url('', {_extwin: this.env.extwin});
-  };
-
-  // Add variable to GET string, replace old value if exists
-  this.add_url = function(url, name, value)
-  {
-    var urldata, datax, hash = '';
-
-    value = urlencode(value);
-
-    if (/(#[a-z0-9_-]*)$/.test(url)) {
-      hash = RegExp.$1;
-      url = url.substr(0, url.length - hash.length);
-    }
-
-    if (/(\?.*)$/.test(url)) {
-      urldata = RegExp.$1;
-      datax = RegExp('((\\?|&)'+RegExp.escape(name)+'=[^&]*)');
-
-      if (datax.test(urldata))
-        urldata = urldata.replace(datax, RegExp.$2 + name + '=' + value);
-      else
-        urldata += '&' + name + '=' + value;
-
-      return url.replace(/(\?.*)$/, urldata) + hash;
-    }
-
-    return url + '?' + name + '=' + value + hash;
-  };
-
-  // append CSRF protection token to the given url
-  this.secure_url = function(url)
-  {
-    return this.add_url(url, '_token', this.env.request_token);
-  },
-
-  this.is_framed = function()
-  {
-    return this.env.framed && parent.rcmail && parent.rcmail != this && typeof parent.rcmail.command == 'function';
-  };
-
-  this.save_pref = function(prop)
-  {
-    var request = {_name: prop.name, _value: prop.value};
-
-    if (prop.session)
-      request._session = prop.session;
-    if (prop.env)
-      this.env[prop.env] = prop.value;
-
-    this.http_post('save-pref', request);
-  };
-
-  this.html_identifier = function(str, encode)
-  {
-    return encode ? this.html_identifier_encode(str) : String(str).replace(this.identifier_expr, '_');
-  };
-
-  this.html_identifier_encode = function(str)
-  {
-    return Base64.encode(String(str)).replace(/=+$/, '').replace(/\+/g, '-').replace(/\//g, '_');
-  };
-
-  this.html_identifier_decode = function(str)
-  {
-    str = String(str).replace(/-/g, '+').replace(/_/g, '/');
-
-    while (str.length % 4) str += '=';
-
-    return Base64.decode(str);
-  };
-
-
-  /*********************************************************/
-  /*********        event handling methods         *********/
-  /*********************************************************/
-
-  this.drag_menu = function(e, target)
-  {
-    var modkey = rcube_event.get_modifier(e),
-      menu = this.gui_objects.dragmenu;
-
-    if (menu && modkey == SHIFT_KEY && this.commands['copy']) {
-      var pos = rcube_event.get_mouse_pos(e);
-      this.env.drag_target = target;
-      this.show_menu(this.gui_objects.dragmenu.id, true, e);
-      $(menu).css({top: (pos.y-10)+'px', left: (pos.x-10)+'px'});
-      return true;
-    }
-
-    return false;
-  };
-
-  this.drag_menu_action = function(action)
-  {
-    var menu = this.gui_objects.dragmenu;
-    if (menu) {
-      $(menu).hide();
-    }
-
-    this.command(action, this.env.drag_target);
-    this.env.drag_target = null;
-  };
-
-  this.drag_start = function(list)
-  {
-    this.drag_active = true;
-
-    if (this.preview_timer)
-      clearTimeout(this.preview_timer);
-
-    // prepare treelist widget for dragging interactions
-    if (this.treelist)
-      this.treelist.drag_start();
-  };
-
-  this.drag_end = function(e)
-  {
-    var list, model;
-
-    if (this.treelist)
-      this.treelist.drag_end();
-
-    // execute drag & drop action when mouse was released
-    if (list = this.message_list)
-      model = this.env.mailboxes;
-    else if (list = this.contact_list)
-      model = this.env.contactfolders;
-
-    // Note: we accept only mouse events to ignore dragging aborts with ESC key (#6623)
-    if (this.drag_active && model && this.env.last_folder_target && !rcube_event.is_keyboard(e)) {
-      var target = model[this.env.last_folder_target];
-      list.draglayer.hide();
-
-      if (this.contact_list) {
-        if (!this.contacts_drag_menu(e, target))
-          this.command('move', target);
-      }
-      else if (!this.drag_menu(e, target))
-        this.command('move', target);
-    }
-
-    this.drag_active = false;
-    this.env.last_folder_target = null;
-  };
-
-  this.drag_move = function(e)
-  {
-    if (this.gui_objects.folderlist) {
-      var drag_target, oldclass,
-        layerclass = 'draglayernormal',
-        mouse = rcube_event.get_mouse_pos(e);
-
-      if (this.contact_list && this.contact_list.draglayer)
-        oldclass = this.contact_list.draglayer.attr('class');
-
-      // mouse intersects a valid drop target on the treelist
-      if (this.treelist && (drag_target = this.treelist.intersects(mouse, true))) {
-        this.env.last_folder_target = drag_target;
-        layerclass = 'draglayer' + (this.check_droptarget(drag_target) > 1 ? 'copy' : 'normal');
-      }
-      else {
-        // Clear target, otherwise drag end will trigger move into last valid droptarget
-        this.env.last_folder_target = null;
-      }
-
-      if (layerclass != oldclass && this.contact_list && this.contact_list.draglayer)
-        this.contact_list.draglayer.attr('class', layerclass);
-    }
-  };
-
-  this.collapse_folder = function(name)
-  {
-    if (this.treelist)
-      this.treelist.toggle(name);
-  };
-
-  this.folder_collapsed = function(node)
-  {
-    if (this.folder_collapsed_timer)
-      clearTimeout(this.folder_collapsed_timer);
-
-    var prefname = this.env.task == 'addressbook' ? 'collapsed_abooks' : 'collapsed_folders',
-      old = this.env[prefname];
-
-    if (node.collapsed) {
-      this.env[prefname] = this.env[prefname] + '&'+urlencode(node.id)+'&';
-
-      // select the folder if one of its children is currently selected
-      // don't select if it's virtual (#1488346)
-      if (!node.virtual && this.env.mailbox && this.env.mailbox.startsWith(node.id + this.env.delimiter))
-        this.command('list', node.id);
-    }
-    else {
-      var reg = new RegExp('&'+urlencode(node.id)+'&');
-      this.env[prefname] = this.env[prefname].replace(reg, '');
-    }
-
-    if (!this.drag_active) {
-      if (old !== this.env[prefname])
-        this.folder_collapsed_timer = setTimeout(function() { ref.command('save-pref', { name: prefname, value: ref.env[prefname] }); }, 10);
-
-      if (this.env.unread_counts)
-        this.set_unread_count_display(node.id, false);
-    }
-  };
-
-  // global mouse-click handler to cleanup some UI elements
-  this.doc_mouse_up = function(e)
-  {
-    var list, id, target = rcube_event.get_target(e);
-
-    // ignore event if jquery UI dialog is open
-    if ($(target).closest('.ui-dialog, .ui-widget-overlay').length)
-      return;
-
-    // remove focus from list widgets
-    if (window.rcube_list_widget && rcube_list_widget._instances.length) {
-      $.each(rcube_list_widget._instances, function(i,list) {
-        if (list && !rcube_mouse_is_over(e, list.list.parentNode))
-          list.blur();
-      });
-    }
-
-    // reset 'pressed' buttons
-    if (this.buttons_sel) {
-      for (id in this.buttons_sel)
-        if (typeof id !== 'function')
-          this.button_out(this.buttons_sel[id], id);
-      this.buttons_sel = {};
-    }
-
-    // reset popup menus; delayed to have updated menu_stack data
-    setTimeout(function(e) {
-      var obj, skip, config, id, i, parents = $(target).parents();
-      for (i = ref.menu_stack.length - 1; i >= 0; i--) {
-        id = ref.menu_stack[i];
-        obj = $('#' + id);
-
-        if (obj.is(':visible')
+                if (obj.is(':visible')
           && target != obj.data('opener')
           && target != obj.get(0)  // check if scroll bar was clicked (#1489832)
           && !parents.is(obj.data('opener'))
           && id != skip
           && (obj.attr('data-editable') != 'true' || !$(target).parents('#' + id).length)
           && (obj.attr('data-sticky') != 'true' || !rcube_mouse_is_over(e, obj.get(0)))
-        ) {
-          ref.hide_menu(id, e);
-        }
-        skip = obj.data('parent');
-      }
-    }, 10, e);
-  };
-
-  // global keypress event handler
-  this.doc_keypress = function(e)
-  {
-    // Helper method to move focus to the next/prev active menu item
-    var focus_menu_item = function(dir) {
-      var obj, item, mod = dir < 0 ? 'prevAll' : 'nextAll', limit = dir < 0 ? 'last' : 'first';
-      if (ref.focused_menu && (obj = $('#'+ref.focused_menu))) {
-        item = obj.find(':focus').closest('li')[mod]().has(':not([aria-disabled=true])').find('a,input')[limit]();
-        if (!item.length)
-          item = obj.find(':focus').closest('ul')[mod]().has(':not([aria-disabled=true])').find('a,input')[limit]();
-        return item.focus().length;
-      }
-
-      return 0;
+                ) {
+                    ref.hide_menu(id, e);
+                }
+                skip = obj.data('parent');
+            }
+        }, 10, e);
     };
 
-    var target = e.target || {},
-      keyCode = rcube_event.get_keycode(e);
+    // global keypress event handler
+    this.doc_keypress = function(e)
+    {
+    // Helper method to move focus to the next/prev active menu item
+        var focus_menu_item = function(dir) {
+            var obj, item, mod = dir < 0 ? 'prevAll' : 'nextAll', limit = dir < 0 ? 'last' : 'first';
+            if (ref.focused_menu && (obj = $('#'+ref.focused_menu))) {
+                item = obj.find(':focus').closest('li')[mod]().has(':not([aria-disabled=true])').find('a,input')[limit]();
+                if (!item.length)
+                    item = obj.find(':focus').closest('ul')[mod]().has(':not([aria-disabled=true])').find('a,input')[limit]();
+                return item.focus().length;
+            }
 
-    if (e.keyCode != 27 && (!this.menu_keyboard_active || target.nodeName == 'TEXTAREA' || target.nodeName == 'SELECT')) {
-      return true;
-    }
+            return 0;
+        };
 
-    switch (keyCode) {
-      case 38:
-      case 40:
-      case 63232: // "up", in safari keypress
-      case 63233: // "down", in safari keypress
-        focus_menu_item(keyCode == 38 || keyCode == 63232 ? -1 : 1);
-        return rcube_event.cancel(e);
+        var target = e.target || {},
+            keyCode = rcube_event.get_keycode(e);
 
-      case 9:   // tab
-        if (this.focused_menu) {
-          var mod = rcube_event.get_modifier(e);
-          if (!focus_menu_item(mod == SHIFT_KEY ? -1 : 1)) {
-            this.hide_menu(this.focused_menu, e);
-          }
+        if (e.keyCode != 27 && (!this.menu_keyboard_active || target.nodeName == 'TEXTAREA' || target.nodeName == 'SELECT')) {
+            return true;
         }
-        return rcube_event.cancel(e);
 
-      case 27:  // esc
-        if (this.menu_stack.length)
-          this.hide_menu(this.menu_stack[this.menu_stack.length-1], e);
-        break;
-    }
+        switch (keyCode) {
+            case 38:
+            case 40:
+            case 63232: // "up", in safari keypress
+            case 63233: // "down", in safari keypress
+                focus_menu_item(keyCode == 38 || keyCode == 63232 ? -1 : 1);
+                return rcube_event.cancel(e);
 
-    return true;
-  }
+            case 9:   // tab
+                if (this.focused_menu) {
+                    var mod = rcube_event.get_modifier(e);
+                    if (!focus_menu_item(mod == SHIFT_KEY ? -1 : 1)) {
+                        this.hide_menu(this.focused_menu, e);
+                    }
+                }
+                return rcube_event.cancel(e);
 
-  // Common handler for a keypress event on a list widget
-  this.list_keypress = function(list, conf)
-  {
-    if (list.modkey == CONTROL_KEY)
-      return;
+            case 27:  // esc
+                if (this.menu_stack.length)
+                    this.hide_menu(this.menu_stack[this.menu_stack.length-1], e);
+                break;
+        }
 
-    if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
-      this.command(conf && conf.del ? conf.del : 'delete');
-    else if (list.key_pressed == 33)
-      this.command(conf && conf.prev ? conf.prev : 'previouspage');
-    else if (list.key_pressed == 34)
-      this.command(conf && conf.next ? conf.next : 'nextpage');
-  };
+        return true;
+    };
 
-  // Handler for a keypress event on a messages list widget
-  this.msglist_keypress = function(list)
-  {
+    // Common handler for a keypress event on a list widget
+    this.list_keypress = function(list, conf)
+    {
+        if (list.modkey == CONTROL_KEY)
+            return;
+
+        if (list.key_pressed == list.DELETE_KEY || list.key_pressed == list.BACKSPACE_KEY)
+            this.command(conf && conf.del ? conf.del : 'delete');
+        else if (list.key_pressed == 33)
+            this.command(conf && conf.prev ? conf.prev : 'previouspage');
+        else if (list.key_pressed == 34)
+            this.command(conf && conf.next ? conf.next : 'nextpage');
+    };
+
+    // Handler for a keypress event on a messages list widget
+    this.msglist_keypress = function(list)
+    {
     // On Enter open the message in list layout mode (no preview frame)
-    if (list.key_pressed == list.ENTER_KEY && !this.env.contentframe)
-      this.command('show');
-    else
-      this.list_keypress(list);
-  };
+        if (list.key_pressed == list.ENTER_KEY && !this.env.contentframe)
+            this.command('show');
+        else
+            this.list_keypress(list);
+    };
 
-  this.msglist_select = function(list)
-  {
-    if (this.preview_timer)
-      clearTimeout(this.preview_timer);
+    this.msglist_select = function(list)
+    {
+        if (this.preview_timer)
+            clearTimeout(this.preview_timer);
 
-    var isDraft = false,
-      selected = list.get_single_selection(),
-      selection = list.get_selection(false),
-      selected_count = selection.length;
+        var isDraft = false,
+            selected = list.get_single_selection(),
+            selection = list.get_selection(false),
+            selected_count = selection.length;
 
-    this.enable_command(this.env.message_commands, selected != null);
+        this.enable_command(this.env.message_commands, selected != null);
 
-    // Find out whether any of the selected messages comes from the Drafts folder
-    if (selected_count > 0) {
-      if (!this.env.multifolder_listing) {
-        isDraft = this.env.mailbox == this.env.drafts_mailbox
-      }
-      else {
-        $.each(selection, function(i, v) {
-          if (ref.get_message_mailbox(v) == ref.env.drafts_mailbox) {
-            isDraft = true;
-            return false;
-          }
-        });
-      }
-    }
-
-    // Disable some actions enabled above
-    if (selected) {
-      if (isDraft) {
-        this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-inline',
-          'forward-attachment', 'bounce', false);
-      }
-      else {
-        var msg = this.env.messages[selected];
-        if (!msg.ml)
-          this.enable_command('reply-list', false);
-      }
-    }
-
-    // Multi-message commands
-    this.enable_command('delete', 'move', 'copy', 'mark', selected_count > 0);
-    this.enable_command('forward', 'forward-attachment', !isDraft && selected_count > 0);
-
-    // reset all-pages-selection
-    if (selected || (selected_count && selected_count != list.rowcount))
-      this.select_all_mode = false;
-
-    // start timer for message preview (wait for double click)
-    if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select) {
-      // try to be responsive and try not to overload the server when user is pressing up/down key repeatedly
-      var now = new Date().getTime(),
-        time_diff = now - (this._last_msglist_select_time || 0),
-        preview_pane_delay = this.preview_delay_click;
-
-      // user is selecting messages repeatedly, wait until this ends (use larger delay)
-      if (time_diff < this.preview_delay_select) {
-        preview_pane_delay = this.preview_delay_select;
-        if (this.preview_timer) {
-          clearTimeout(this.preview_timer);
+        // Find out whether any of the selected messages comes from the Drafts folder
+        if (selected_count > 0) {
+            if (!this.env.multifolder_listing) {
+                isDraft = this.env.mailbox == this.env.drafts_mailbox;
+            }
+            else {
+                $.each(selection, function(i, v) {
+                    if (ref.get_message_mailbox(v) == ref.env.drafts_mailbox) {
+                        isDraft = true;
+                        return false;
+                    }
+                });
+            }
         }
-        if (this.env.contentframe) {
-          this.show_contentframe(false);
+
+        // Disable some actions enabled above
+        if (selected) {
+            if (isDraft) {
+                this.enable_command('reply', 'reply-all', 'reply-list', 'forward', 'forward-inline',
+                    'forward-attachment', 'bounce', false);
+            }
+            else {
+                var msg = this.env.messages[selected];
+                if (!msg.ml)
+                    this.enable_command('reply-list', false);
+            }
         }
-      }
 
-      this._last_msglist_select_time = now;
-      this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, preview_pane_delay);
-    }
-    else if (this.env.contentframe) {
-      this.show_contentframe(false);
-    }
-  };
+        // Multi-message commands
+        this.enable_command('delete', 'move', 'copy', 'mark', selected_count > 0);
+        this.enable_command('forward', 'forward-attachment', !isDraft && selected_count > 0);
 
-  this.msglist_dbl_click = function(list)
-  {
-    if (this.preview_timer)
-      clearTimeout(this.preview_timer);
+        // reset all-pages-selection
+        if (selected || (selected_count && selected_count != list.rowcount))
+            this.select_all_mode = false;
 
-    var mbox, uid = list.get_single_selection();
+        // start timer for message preview (wait for double click)
+        if (selected && this.env.contentframe && !list.multi_selecting && !this.dummy_select) {
+            // try to be responsive and try not to overload the server when user is pressing up/down key repeatedly
+            var now = new Date().getTime(),
+                time_diff = now - (this._last_msglist_select_time || 0),
+                preview_pane_delay = this.preview_delay_click;
 
-    // TODO: Here we should just use this.command('show') but we can't
-    // because at this point this.busy=true (set by msglist_get_preview())
+            // user is selecting messages repeatedly, wait until this ends (use larger delay)
+            if (time_diff < this.preview_delay_select) {
+                preview_pane_delay = this.preview_delay_select;
+                if (this.preview_timer) {
+                    clearTimeout(this.preview_timer);
+                }
+                if (this.env.contentframe) {
+                    this.show_contentframe(false);
+                }
+            }
 
-    if (uid) {
-      mbox = this.get_message_mailbox(uid);
-      if (mbox == this.env.drafts_mailbox)
-        this.open_compose_step({_draft_uid: uid, _mbox: mbox});
-      else
-        this.show_message(uid);
-    }
-  };
+            this._last_msglist_select_time = now;
+            this.preview_timer = setTimeout(function() { ref.msglist_get_preview(); }, preview_pane_delay);
+        }
+        else if (this.env.contentframe) {
+            this.show_contentframe(false);
+        }
+    };
 
-  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.msglist_dbl_click = function(list)
+    {
+        if (this.preview_timer)
+            clearTimeout(this.preview_timer);
 
-  this.msglist_expand = function(row)
-  {
-    if (this.env.messages[row.uid])
-      this.env.messages[row.uid].expanded = row.expanded;
-    $(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
-  };
+        var mbox, uid = list.get_single_selection();
 
-  this.msglist_set_coltypes = function(list)
-  {
-    var i, found, name, cols = list.thead.rows[0].cells;
+        // TODO: Here we should just use this.command('show') but we can't
+        // because at this point this.busy=true (set by msglist_get_preview())
 
-    this.env.listcols = [];
+        if (uid) {
+            mbox = this.get_message_mailbox(uid);
+            if (mbox == this.env.drafts_mailbox)
+                this.open_compose_step({_draft_uid: uid, _mbox: mbox});
+            else
+                this.show_message(uid);
+        }
+    };
 
-    for (i=0; i<cols.length; i++)
-      if (cols[i].id && cols[i].id.startsWith('rcm')) {
-        name = cols[i].id.slice(3);
-        this.env.listcols.push(name);
-      }
+    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);
+    };
 
-    // update message list setup
-    this.msglist_setup(this.env.layout);
+    this.msglist_expand = function(row)
+    {
+        if (this.env.messages[row.uid])
+            this.env.messages[row.uid].expanded = row.expanded;
+        $(row.obj)[row.expanded?'addClass':'removeClass']('expanded');
+    };
 
-    if ((found = $.inArray('flag', this.env.listcols)) >= 0)
-      this.env.flagged_col = found;
+    this.msglist_set_coltypes = function(list)
+    {
+        var i, found, name, cols = list.thead.rows[0].cells;
 
-    if ((found = $.inArray('subject', this.env.listcols)) >= 0)
-      this.env.subject_col = found;
+        this.env.listcols = [];
 
-    this.command('save-pref', { name: 'list_cols', value: this.env.listcols, session: 'list_attrib/columns' });
-  };
+        for (i=0; i<cols.length; i++)
+            if (cols[i].id && cols[i].id.startsWith('rcm')) {
+                name = cols[i].id.slice(3);
+                this.env.listcols.push(name);
+            }
 
-  this.msglist_setup = function(layout)
-  {
-    var ret, listcols;
+        // update message list setup
+        this.msglist_setup(this.env.layout);
 
-    // allow plugins or skins to override default list layout
-    if (ret = this.triggerEvent('msglist_layout', layout))
-      layout = ret;
+        if ((found = $.inArray('flag', this.env.listcols)) >= 0)
+            this.env.flagged_col = found;
 
-    listcols = this.env[layout == 'widescreen' ? 'listcols_widescreen' : 'listcols'];
+        if ((found = $.inArray('subject', this.env.listcols)) >= 0)
+            this.env.subject_col = found;
 
-    if (layout == 'widescreen' && !this.env.threading)
-      listcols = $.grep(listcols, function(value) { return value != 'threads'; });
+        this.command('save-pref', { name: 'list_cols', value: this.env.listcols, session: 'list_attrib/columns' });
+    };
 
-    // set env vars for message list
-    this.env.msglist_layout = layout;
-    this.env.msglist_cols = listcols;
+    this.msglist_setup = function(layout)
+    {
+        var ret, listcols;
 
-    // Set sort-* class on the list element
-    var list = this.gui_objects.messagelist,
-      classes = list.className.split(' ').filter(function(v) { return !v.startsWith('sort-'); });
+        // allow plugins or skins to override default list layout
+        if (ret = this.triggerEvent('msglist_layout', layout))
+            layout = ret;
 
-    classes.push('sort-' + (this.env.sort_col || 'none'));
-    list.className = classes.join(' ');
-  };
+        listcols = this.env[layout == 'widescreen' ? 'listcols_widescreen' : 'listcols'];
 
-  this.check_droptarget = function(id)
-  {
-    switch (this.task) {
-      case 'mail':
-        return (this.env.mailboxes[id]
+        if (layout == 'widescreen' && !this.env.threading)
+            listcols = $.grep(listcols, function(value) { return value != 'threads'; });
+
+        // set env vars for message list
+        this.env.msglist_layout = layout;
+        this.env.msglist_cols = listcols;
+
+        // Set sort-* class on the list element
+        var list = this.gui_objects.messagelist,
+            classes = list.className.split(' ').filter(function(v) { return !v.startsWith('sort-'); });
+
+        classes.push('sort-' + (this.env.sort_col || 'none'));
+        list.className = classes.join(' ');
+    };
+
+    this.check_droptarget = function(id)
+    {
+        switch (this.task) {
+            case 'mail':
+                return (this.env.mailboxes[id]
             && !this.env.mailboxes[id].virtual
             && (this.env.mailboxes[id].id != this.env.mailbox || this.is_multifolder_listing())) ? 1 : 0;
 
-      case 'addressbook':
-        var target;
-        if (id != this.env.source && (target = this.env.contactfolders[id])) {
-          // droptarget is a group
-          if (target.type == 'group') {
-            if (target.id != this.env.group && !this.env.contactfolders[target.source].readonly) {
-              var is_other = this.env.selection_sources.length > 1 || $.inArray(target.source, this.env.selection_sources) == -1;
-              return !is_other || this.commands.move ? 1 : 2;
-            }
-          }
-          // droptarget is a (writable) addressbook and it's not the source
-          else if (!target.readonly && (this.env.selection_sources.length > 1 || $.inArray(id, this.env.selection_sources) == -1)) {
-            return this.commands.move ? 1 : 2;
-          }
+            case 'addressbook':
+                var target;
+                if (id != this.env.source && (target = this.env.contactfolders[id])) {
+                    // droptarget is a group
+                    if (target.type == 'group') {
+                        if (target.id != this.env.group && !this.env.contactfolders[target.source].readonly) {
+                            var is_other = this.env.selection_sources.length > 1 || $.inArray(target.source, this.env.selection_sources) == -1;
+                            return !is_other || this.commands.move ? 1 : 2;
+                        }
+                    }
+                    // droptarget is a (writable) addressbook and it's not the source
+                    else if (!target.readonly && (this.env.selection_sources.length > 1 || $.inArray(id, this.env.selection_sources) == -1)) {
+                        return this.commands.move ? 1 : 2;
+                    }
+                }
         }
-    }
 
-    return 0;
-  };
+        return 0;
+    };
 
-  // open popup window
-  this.open_window = function(url, small, toolbar)
-  {
-    var wname = 'rcmextwin' + new Date().getTime();
+    // open popup window
+    this.open_window = function(url, small, toolbar)
+    {
+        var wname = 'rcmextwin' + new Date().getTime();
 
-    url += (url.match(/\?/) ? '&' : '?') + '_extwin=1';
+        url += (url.match(/\?/) ? '&' : '?') + '_extwin=1';
 
-    if (this.env.standard_windows)
-      var extwin = window.open(url, wname);
-    else {
-      var win = this.is_framed() ? parent.window : window,
-        page = $(win),
-        page_width = page.width(),
-        page_height = bw.mz ? $('body', win).height() : page.height(),
-        w = Math.min(small ? this.env.popup_width_small : this.env.popup_width, page_width),
-        h = page_height, // always use same height
-        l = (win.screenLeft || win.screenX) + 20,
-        t = (win.screenTop || win.screenY) + 20,
-        extwin = window.open(url, wname,
-          'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,location=no,scrollbars=yes'
+        if (this.env.standard_windows)
+            var extwin = window.open(url, wname);
+        else {
+            var win = this.is_framed() ? parent.window : window,
+                page = $(win),
+                page_width = page.width(),
+                page_height = bw.mz ? $('body', win).height() : page.height(),
+                w = Math.min(small ? this.env.popup_width_small : this.env.popup_width, page_width),
+                h = page_height, // always use same height
+                l = (win.screenLeft || win.screenX) + 20,
+                t = (win.screenTop || win.screenY) + 20,
+                extwin = window.open(url, wname,
+                    'width='+w+',height='+h+',top='+t+',left='+l+',resizable=yes,location=no,scrollbars=yes'
           +(toolbar ? ',toolbar=yes,menubar=yes,status=yes' : ',toolbar=no,menubar=no,status=no'));
-    }
+        }
 
-    // detect popup blocker (#1489618)
-    // don't care this might not work with all browsers
-    if (!extwin || extwin.closed) {
-      this.display_message('windowopenerror', 'warning');
-      return;
-    }
+        // detect popup blocker (#1489618)
+        // don't care this might not work with all browsers
+        if (!extwin || extwin.closed) {
+            this.display_message('windowopenerror', 'warning');
+            return;
+        }
 
-    // write loading... message to empty windows
-    if (!url && extwin.document) {
-      extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');
-    }
+        // write loading... message to empty windows
+        if (!url && extwin.document) {
+            extwin.document.write('<html><body>' + this.get_label('loading') + '</body></html>');
+        }
 
-    // allow plugins to grab the window reference (#1489413)
-    this.triggerEvent('openwindow', { url:url, handle:extwin });
+        // allow plugins to grab the window reference (#1489413)
+        this.triggerEvent('openwindow', { url:url, handle:extwin });
 
-    // focus window, delayed to bring to front
-    setTimeout(function() { extwin && extwin.focus(); }, 10);
+        // focus window, delayed to bring to front
+        setTimeout(function() { extwin && extwin.focus(); }, 10);
 
-    return extwin;
-  };
+        return extwin;
+    };
 
 
-  /*********************************************************/
-  /*********     (message) list functionality      *********/
-  /*********************************************************/
+    /*********************************************************/
+    /*********     (message) list functionality      *********/
+    /*********************************************************/
 
-  this.init_message_row = function(row)
-  {
-    var i, fn = {}, uid = row.uid,
-      status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.id;
+    this.init_message_row = function(row)
+    {
+        var i, fn = {}, uid = row.uid,
+            status_icon = (this.env.status_col != null ? 'status' : 'msg') + 'icn' + row.id;
 
-    if (uid && this.env.messages[uid])
-      $.extend(row, this.env.messages[uid]);
+        if (uid && this.env.messages[uid])
+            $.extend(row, this.env.messages[uid]);
 
-    // set eventhandler to status icon
-    if (row.icon = document.getElementById(status_icon)) {
-      fn.icon = function(e) { ref.command('toggle_status', uid); };
-    }
+        // set eventhandler to status icon
+        if (row.icon = document.getElementById(status_icon)) {
+            fn.icon = function(e) { ref.command('toggle_status', uid); };
+        }
 
-    // save message icon position too
-    if (this.env.status_col != null)
-      row.msgicon = document.getElementById('msgicn'+row.id);
-    else
-      row.msgicon = row.icon;
+        // save message icon position too
+        if (this.env.status_col != null)
+            row.msgicon = document.getElementById('msgicn'+row.id);
+        else
+            row.msgicon = row.icon;
 
-    // set eventhandler to flag icon
-    if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.id))) {
-      fn.flagicon = function(e) { ref.command('toggle_flag', uid); };
-    }
+        // set eventhandler to flag icon
+        if (this.env.flagged_col != null && (row.flagicon = document.getElementById('flagicn'+row.id))) {
+            fn.flagicon = function(e) { ref.command('toggle_flag', uid); };
+        }
 
-    // set event handler to thread expand/collapse icon
-    if (!row.depth && row.has_children && (row.expando = document.getElementById('rcmexpando'+row.id))) {
-      fn.expando = function(e) { ref.expand_message_row(e, uid); };
-    }
+        // set event handler to thread expand/collapse icon
+        if (!row.depth && row.has_children && (row.expando = document.getElementById('rcmexpando'+row.id))) {
+            fn.expando = function(e) { ref.expand_message_row(e, uid); };
+        }
 
-    // attach events
-    $.each(fn, function(i, f) {
-      row[i].onclick = function(e) { f(e); return rcube_event.cancel(e); };
-      if (bw.touch && row[i].addEventListener) {
-        row[i].addEventListener('touchend', function(e) {
-          if (e.changedTouches.length == 1) {
-            f(e);
-            return rcube_event.cancel(e);
-          }
-        }, false);
-      }
-    });
+        // attach events
+        $.each(fn, function(i, f) {
+            row[i].onclick = function(e) { f(e); return rcube_event.cancel(e); };
+            if (bw.touch && row[i].addEventListener) {
+                row[i].addEventListener('touchend', function(e) {
+                    if (e.changedTouches.length == 1) {
+                        f(e);
+                        return rcube_event.cancel(e);
+                    }
+                }, false);
+            }
+        });
 
-    this.triggerEvent('insertrow', { uid:uid, row:row });
-  };
+        this.triggerEvent('insertrow', { uid:uid, row:row });
+    };
 
-  // create a table row in the message list
-  this.add_message_row = function(uid, cols, flags, attop)
-  {
-    if (!this.gui_objects.messagelist || !this.message_list)
-      return false;
+    // create a table row in the message list
+    this.add_message_row = function(uid, cols, flags, attop)
+    {
+        if (!this.gui_objects.messagelist || !this.message_list)
+            return false;
 
-    // Prevent from adding messages from different folder (#1487752)
-    if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
-      return false;
+        // Prevent from adding messages from different folder (#1487752)
+        if (flags.mbox != this.env.mailbox && !flags.skip_mbox_check)
+            return false;
 
-    // When deleting messages fast it may happen that the same message
-    // from the next page could be added many times, we prevent this here
-    if (this.message_list.rows[uid])
-      return false;
+        // When deleting messages fast it may happen that the same message
+        // from the next page could be added many times, we prevent this here
+        if (this.message_list.rows[uid])
+            return false;
 
-    if (!this.env.messages[uid])
-      this.env.messages[uid] = {};
+        if (!this.env.messages[uid])
+            this.env.messages[uid] = {};
 
-    // merge flags over local message object
-    $.extend(this.env.messages[uid], {
-      deleted: flags.deleted?1:0,
-      replied: flags.answered?1:0,
-      unread: !flags.seen?1:0,
-      forwarded: flags.forwarded?1:0,
-      flagged: flags.flagged?1:0,
-      has_children: flags.has_children?1:0,
-      depth: flags.depth?flags.depth:0,
-      unread_children: flags.unread_children || 0,
-      flagged_children: flags.flagged_children || 0,
-      parent_uid: flags.parent_uid || 0,
-      selected: this.select_all_mode || this.message_list.in_selection(uid),
-      ml: flags.ml?1:0,
-      ctype: flags.ctype,
-      mbox: flags.mbox,
-      size: cols.size,
-      date: cols.date,
-      // flags from plugins
-      flags: flags.extra_flags
-    });
+        // merge flags over local message object
+        $.extend(this.env.messages[uid], {
+            deleted: flags.deleted?1:0,
+            replied: flags.answered?1:0,
+            unread: !flags.seen?1:0,
+            forwarded: flags.forwarded?1:0,
+            flagged: flags.flagged?1:0,
+            has_children: flags.has_children?1:0,
+            depth: flags.depth?flags.depth:0,
+            unread_children: flags.unread_children || 0,
+            flagged_children: flags.flagged_children || 0,
+            parent_uid: flags.parent_uid || 0,
+            selected: this.select_all_mode || this.message_list.in_selection(uid),
+            ml: flags.ml?1:0,
+            ctype: flags.ctype,
+            mbox: flags.mbox,
+            size: cols.size,
+            date: cols.date,
+            // flags from plugins
+            flags: flags.extra_flags
+        });
 
-    var c, n, col, html, css_class, label, status_class = '', status_label = '',
-      tree = '', expando = '',
-      list = this.message_list,
-      rows = list.rows,
-      message = this.env.messages[uid],
-      msg_id = this.html_identifier(uid,true),
-      row_class = 'message'
+        var c, n, col, html, css_class, label, status_class = '', status_label = '',
+            tree = '', expando = '',
+            list = this.message_list,
+            rows = list.rows,
+            message = this.env.messages[uid],
+            msg_id = this.html_identifier(uid, true),
+            row_class = 'message'
         + (!flags.seen ? ' unread' : '')
         + (flags.deleted ? ' deleted' : '')
         + (flags.flagged ? ' flagged' : '')
         + (message.selected ? ' selected' : ''),
-      row = { cols:[], style:{}, id:'rcmrow'+msg_id, uid:uid },
-      layout = this.env.msglist_layout,
-      listcols = this.env.msglist_cols;
+            row = { cols:[], style:{}, id:'rcmrow'+msg_id, uid:uid },
+            layout = this.env.msglist_layout,
+            listcols = this.env.msglist_cols;
 
-    // widescreen layout does not have a separate status column
-    if (layout == 'widescreen')
-      this.env.status_col = null;
-    else if ((n = $.inArray('status', listcols)) >= 0)
-      this.env.status_col = n;
+        // widescreen layout does not have a separate status column
+        if (layout == 'widescreen')
+            this.env.status_col = null;
+        else if ((n = $.inArray('status', listcols)) >= 0)
+            this.env.status_col = n;
 
-    // message status icons
-    css_class = 'msgicon';
-    if (this.env.status_col === null) {
-      css_class += ' status';
-      if (flags.deleted) {
-        status_class += ' deleted';
-        status_label += this.get_label('deleted') + ' ';
-      }
-      else if (!flags.seen) {
-        status_class += ' unread';
-        status_label += this.get_label('unread') + ' ';
-      }
-      else if (flags.unread_children > 0) {
-        status_class += ' unreadchildren';
-      }
-    }
-    if (flags.answered) {
-      status_class += ' replied';
-      status_label += this.get_label('replied') + ' ';
-    }
-    if (flags.forwarded) {
-      status_class += ' forwarded';
-      status_label += this.get_label('forwarded') + ' ';
-    }
+        // message status icons
+        css_class = 'msgicon';
+        if (this.env.status_col === null) {
+            css_class += ' status';
+            if (flags.deleted) {
+                status_class += ' deleted';
+                status_label += this.get_label('deleted') + ' ';
+            }
+            else if (!flags.seen) {
+                status_class += ' unread';
+                status_label += this.get_label('unread') + ' ';
+            }
+            else if (flags.unread_children > 0) {
+                status_class += ' unreadchildren';
+            }
+        }
+        if (flags.answered) {
+            status_class += ' replied';
+            status_label += this.get_label('replied') + ' ';
+        }
+        if (flags.forwarded) {
+            status_class += ' forwarded';
+            status_label += this.get_label('forwarded') + ' ';
+        }
 
-    // update selection
-    if (message.selected && !list.in_selection(uid))
-      list.selection.push(uid);
+        // update selection
+        if (message.selected && !list.in_selection(uid))
+            list.selection.push(uid);
 
-    // threads
-    if (this.env.threading) {
-      if (message.depth) {
-        // This assumes that div width is hardcoded to 15px,
-        tree += '<span id="rcmtab' + msg_id + '" class="branch" style="width:' + (message.depth * 15) + 'px;">&nbsp;&nbsp;</span>';
+        // threads
+        if (this.env.threading) {
+            if (message.depth) {
+                // This assumes that div width is hardcoded to 15px,
+                tree += '<span id="rcmtab' + msg_id + '" class="branch" style="width:' + (message.depth * 15) + 'px;">&nbsp;&nbsp;</span>';
 
-        if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
+                if ((rows[message.parent_uid] && rows[message.parent_uid].expanded === false)
           || ((this.env.autoexpand_threads == 0 || this.env.autoexpand_threads == 2) &&
             (!rows[message.parent_uid] || !rows[message.parent_uid].expanded))
-        ) {
-          row.style.display = 'none';
-          message.expanded = false;
-        }
-        else
-          message.expanded = true;
+                ) {
+                    row.style.display = 'none';
+                    message.expanded = false;
+                }
+                else
+                    message.expanded = true;
 
-        row_class += ' thread expanded';
-      }
-      else if (message.has_children) {
-        if (message.expanded === undefined && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
-          message.expanded = true;
+                row_class += ' thread expanded';
+            }
+            else if (message.has_children) {
+                if (message.expanded === undefined && (this.env.autoexpand_threads == 1 || (this.env.autoexpand_threads == 2 && message.unread_children))) {
+                    message.expanded = true;
+                }
+
+                expando = '<div id="rcmexpando' + row.id + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">&nbsp;&nbsp;</div>';
+                row_class += ' thread' + (message.expanded ? ' expanded' : '');
+            }
+
+            if (flags.unread_children && flags.seen && !message.expanded)
+                row_class += ' unroot';
+
+            if (flags.flagged_children && !message.expanded)
+                row_class += ' flaggedroot';
         }
 
-        expando = '<div id="rcmexpando' + row.id + '" class="' + (message.expanded ? 'expanded' : 'collapsed') + '">&nbsp;&nbsp;</div>';
-        row_class += ' thread' + (message.expanded ? ' expanded' : '');
-      }
+        tree += '<span id="msgicn'+row.id+'" class="'+css_class+status_class+'" title="'+status_label+'"></span>';
+        row.className = row_class;
 
-      if (flags.unread_children && flags.seen && !message.expanded)
-        row_class += ' unroot';
-
-      if (flags.flagged_children && !message.expanded)
-        row_class += ' flaggedroot';
-    }
-
-    tree += '<span id="msgicn'+row.id+'" class="'+css_class+status_class+'" title="'+status_label+'"></span>';
-    row.className = row_class;
-
-    // build subject link
-    if (cols.subject) {
-      var action  = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show',
-        uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid',
-        query = { _mbox: flags.mbox };
-      query[uid_param] = uid;
-      cols.subject = '<a href="' + this.url(action, query) + '" onclick="return rcube_event.keyboard_only(event)"' +
+        // build subject link
+        if (cols.subject) {
+            var action  = flags.mbox == this.env.drafts_mailbox ? 'compose' : 'show',
+                uid_param = flags.mbox == this.env.drafts_mailbox ? '_draft_uid' : '_uid',
+                query = { _mbox: flags.mbox };
+            query[uid_param] = uid;
+            cols.subject = '<a href="' + this.url(action, query) + '" onclick="return rcube_event.keyboard_only(event)"' +
         ' onmouseover="rcube_webmail.long_subject_title(this,'+(message.depth+1)+')" tabindex="-1"><span>'+cols.subject+'</span></a>';
-    }
-
-    // add each submitted col
-    for (n in listcols) {
-      c = listcols[n];
-      col = {className: String(c).toLowerCase(), events:{}};
-
-      if (this.env.coltypes[c] && this.env.coltypes[c].hidden) {
-        col.className += ' hidden';
-      }
-
-      if (c == 'flag') {
-        css_class = (flags.flagged ? 'flagged' : 'unflagged');
-        label = this.get_label(css_class);
-        html = '<span id="flagicn'+row.id+'" class="'+css_class+'" title="'+label+'"></span>';
-      }
-      else if (c == 'attachment') {
-        label = this.get_label('withattachment');
-        if (flags.attachmentClass)
-          html = '<span class="'+flags.attachmentClass+'" title="'+label+'"></span>';
-        else if (flags.ctype == 'multipart/report')
-          html = '<span class="report"></span>';
-        else if (flags.ctype == 'multipart/encrypted' || flags.ctype == 'application/pkcs7-mime')
-          html = '<span class="encrypted"></span>';
-        else if (flags.hasattachment || (!flags.hasnoattachment && /application\/|multipart\/(m|signed)/.test(flags.ctype)))
-          html = '<span class="attachment" title="'+label+'"></span>';
-        else
-          html = '&nbsp;';
-      }
-      else if (c == 'status') {
-        label = '';
-        if (flags.deleted) {
-          css_class = 'deleted';
-          label = this.get_label('deleted');
         }
-        else if (!flags.seen) {
-          css_class = 'unread';
-          label = this.get_label('unread');
+
+        // add each submitted col
+        for (n in listcols) {
+            c = listcols[n];
+            col = {className: String(c).toLowerCase(), events:{}};
+
+            if (this.env.coltypes[c] && this.env.coltypes[c].hidden) {
+                col.className += ' hidden';
+            }
+
+            if (c == 'flag') {
+                css_class = (flags.flagged ? 'flagged' : 'unflagged');
+                label = this.get_label(css_class);
+                html = '<span id="flagicn'+row.id+'" class="'+css_class+'" title="'+label+'"></span>';
+            }
+            else if (c == 'attachment') {
+                label = this.get_label('withattachment');
+                if (flags.attachmentClass)
+                    html = '<span class="'+flags.attachmentClass+'" title="'+label+'"></span>';
+                else if (flags.ctype == 'multipart/report')
+                    html = '<span class="report"></span>';
+                else if (flags.ctype == 'multipart/encrypted' || flags.ctype == 'application/pkcs7-mime')
+                    html = '<span class="encrypted"></span>';
+                else if (flags.hasattachment || (!flags.hasnoattachment && /application\/|multipart\/(m|signed)/.test(flags.ctype)))
+                    html = '<span class="attachment" title="'+label+'"></span>';
+                else
+                    html = '&nbsp;';
+            }
+            else if (c == 'status') {
+                label = '';
+                if (flags.deleted) {
+                    css_class = 'deleted';
+                    label = this.get_label('deleted');
+                }
+                else if (!flags.seen) {
+                    css_class = 'unread';
+                    label = this.get_label('unread');
+                }
+                else if (flags.unread_children > 0) {
+                    css_class = 'unreadchildren';
+                }
+                else
+                    css_class = 'msgicon';
+                html = '<span id="statusicn'+row.id+'" class="'+css_class+status_class+'" title="'+label+'"></span>';
+            }
+            else if (c == 'threads')
+                html = expando;
+            else if (c == 'subject') {
+                html = tree + cols[c];
+            }
+            else if (c == 'priority') {
+                if (flags.prio > 0 && flags.prio < 6) {
+                    label = this.get_label('priority') + ' ' + flags.prio;
+                    html = '<span class="prio'+flags.prio+'" title="'+label+'"></span>';
+                }
+                else
+                    html = '&nbsp;';
+            }
+            else if (c == 'folder') {
+                html = '<span onmouseover="rcube_webmail.long_subject_title(this)">' + cols[c] + '<span>';
+            }
+            else
+                html = cols[c];
+
+            col.innerHTML = html;
+            row.cols.push(col);
         }
-        else if (flags.unread_children > 0) {
-          css_class = 'unreadchildren';
+
+        if (layout == 'widescreen')
+            row = this.widescreen_message_row(row, uid, message);
+
+        list.insert_row(row, attop);
+
+        // remove 'old' row
+        if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
+            var uid = list.get_last_row();
+            list.remove_row(uid);
+            list.clear_selection(uid);
         }
-        else
-          css_class = 'msgicon';
-        html = '<span id="statusicn'+row.id+'" class="'+css_class+status_class+'" title="'+label+'"></span>';
-      }
-      else if (c == 'threads')
-        html = expando;
-      else if (c == 'subject') {
-        html = tree + cols[c];
-      }
-      else if (c == 'priority') {
-        if (flags.prio > 0 && flags.prio < 6) {
-          label = this.get_label('priority') + ' ' + flags.prio;
-          html = '<span class="prio'+flags.prio+'" title="'+label+'"></span>';
-        }
-        else
-          html = '&nbsp;';
-      }
-      else if (c == 'folder') {
-        html = '<span onmouseover="rcube_webmail.long_subject_title(this)">' + cols[c] + '<span>';
-      }
-      else
-        html = cols[c];
+    };
 
-      col.innerHTML = html;
-      row.cols.push(col);
-    }
+    // Converts standard message list record into "widescreen" (3-column) layout
+    this.widescreen_message_row = function(row, uid, message)
+    {
+        var domrow = document.createElement('tr');
 
-    if (layout == 'widescreen')
-      row = this.widescreen_message_row(row, uid, message);
+        domrow.id = row.id;
+        domrow.uid = row.uid;
+        domrow.className = row.className;
+        if (row.style) $.extend(domrow.style, row.style);
 
-    list.insert_row(row, attop);
+        $.each(this.env.widescreen_list_template, function() {
+            if (!ref.env.threading && this.className == 'threads')
+                return;
 
-    // remove 'old' row
-    if (attop && this.env.pagesize && list.rowcount > this.env.pagesize) {
-      var uid = list.get_last_row();
-      list.remove_row(uid);
-      list.clear_selection(uid);
-    }
-  };
+            var i, n, e, col, domcol,
+                domcell = document.createElement('td');
 
-  // Converts standard message list record into "widescreen" (3-column) layout
-  this.widescreen_message_row = function(row, uid, message)
-  {
-    var domrow = document.createElement('tr');
+            if (this.className) domcell.className = this.className;
 
-    domrow.id = row.id;
-    domrow.uid = row.uid;
-    domrow.className = row.className;
-    if (row.style) $.extend(domrow.style, row.style);
+            for (i=0; this.cells && i < this.cells.length; i++) {
+                for (n=0; row.cols && n < row.cols.length; n++) {
+                    if (this.cells[i] == row.cols[n].className) {
+                        col = row.cols[n];
+                        domcol = document.createElement('span');
+                        domcol.className = this.cells[i];
+                        if (this.className == 'subject' && domcol.className != 'subject')
+                            domcol.className += ' skip-on-drag';
+                        if (col.innerHTML)
+                            domcol.innerHTML = col.innerHTML;
+                        domcell.appendChild(domcol);
+                        break;
+                    }
+                }
+            }
 
-    $.each(this.env.widescreen_list_template, function() {
-      if (!ref.env.threading && this.className == 'threads')
-        return;
-
-      var i, n, e, col, domcol,
-        domcell = document.createElement('td');
-
-      if (this.className) domcell.className = this.className;
-
-      for (i=0; this.cells && i < this.cells.length; i++) {
-        for (n=0; row.cols && n < row.cols.length; n++) {
-          if (this.cells[i] == row.cols[n].className) {
-            col = row.cols[n];
-            domcol = document.createElement('span');
-            domcol.className = this.cells[i];
-            if (this.className == 'subject' && domcol.className != 'subject')
-              domcol.className += ' skip-on-drag';
-            if (col.innerHTML)
-              domcol.innerHTML = col.innerHTML;
-            domcell.appendChild(domcol);
-            break;
-          }
-        }
-      }
-
-      domrow.appendChild(domcell);
-    });
-
-    if (this.env.threading && message.depth) {
-      n = this.calculate_thread_padding(message.depth);
-      $('td.subject', domrow).attr('style', 'padding-left:' + n + ' !important');
-      $('span.branch', domrow).remove();
-    }
-
-    return domrow;
-  };
-
-  this.calculate_thread_padding = function(level)
-  {
-     ref.env.thread_padding.match(/^([0-9.]+)(.+)/);
-     return (Math.min(6, level) * parseFloat(RegExp.$1)) + RegExp.$2;
-  };
-
-  this.set_list_sorting = function(sort_col, sort_order)
-  {
-    var sort_old = this.env.sort_col == 'arrival' ? 'date' : this.env.sort_col,
-      sort_new = sort_col == 'arrival' ? 'date' : sort_col;
-
-    // set table header class
-    $('#rcm' + sort_old).removeClass('sorted' + this.env.sort_order.toUpperCase());
-    if (sort_new)
-      $('#rcm' + sort_new).addClass('sorted' + sort_order);
-
-    // if sorting by 'arrival' is selected, click on date column should not switch to 'date'
-    $('#rcmdate > a').prop('rel', sort_col == 'arrival' ? 'arrival' : 'date');
-
-    this.env.sort_col = sort_col;
-    this.env.sort_order = sort_order;
-  };
-
-  this.set_list_options = function(cols, sort_col, sort_order, threads, layout)
-  {
-    var update, post_data = {};
-
-    if (sort_col === undefined)
-      sort_col = this.env.sort_col;
-    if (!sort_order)
-      sort_order = this.env.sort_order;
-
-    if (this.env.sort_col != sort_col || this.env.sort_order != sort_order) {
-      update = 1;
-      this.set_list_sorting(sort_col, sort_order);
-    }
-
-    if (this.env.threading != threads) {
-      update = 1;
-      post_data._threads = threads;
-    }
-
-    if (layout && this.env.layout != layout) {
-      this.triggerEvent('layout-change', {old_layout: this.env.layout, new_layout: layout});
-      update = 1;
-      this.env.layout = post_data._layout = layout;
-
-      // update message list setup
-      this.msglist_setup(this.env.layout);
-    }
-
-    if (cols && cols.length) {
-      // make sure new columns are added at the end of the list
-      var i, idx, name, newcols = [], oldcols = this.env.listcols;
-
-      for (i=0; i<oldcols.length; i++) {
-        name = oldcols[i];
-        idx = $.inArray(name, cols);
-        if (idx != -1) {
-          newcols.push(name);
-          delete cols[idx];
-        }
-      }
-      for (i=0; i<cols.length; i++)
-        if (cols[i])
-          newcols.push(cols[i]);
-
-      if (newcols.join() != oldcols.join()) {
-        update = 1;
-        post_data._cols = newcols.join(',');
-      }
-    }
-
-    if (update)
-      this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
-  };
-
-  // when user double-clicks on a row
-  this.show_message = function(id, safe, preview)
-  {
-    if (!id)
-      return;
-
-    var win, target = window,
-      url = this.params_from_uid(id, {_caps: this.browser_capabilities()});
-
-    if (preview && (win = this.get_frame_window(this.env.contentframe))) {
-      target = win;
-      url._framed = 1;
-    }
-
-    if (safe)
-      url._safe = 1;
-
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      url._search = this.env.search_request;
-
-    if (this.env.extwin)
-      url._extwin = 1;
-
-    url = this.url(preview ? 'preview': 'show', url);
-
-    if (preview)
-      this.preview_id = id;
-
-    if (preview && String(target.location.href).indexOf(url) >= 0) {
-      this.show_contentframe(true);
-    }
-    else {
-      if (!preview && this.env.message_extwin && !this.env.extwin)
-        this.open_window(url, true);
-      else {
-        // "Allow remote resources" reloads the page, we remove this request from the history,
-        // so Back button works as expected, i.e. ignores the reload request (#6620)
-        if (safe && document.referrer && window.history.replaceState)
-          window.history.replaceState({}, '', document.referrer);
-
-        this.location_href(url, target, true);
-      }
-    }
-  };
-
-  // update message status and unread counter after marking a message as read
-  this.set_unread_message = function(id, folder)
-  {
-    var self = this;
-
-    // find window with messages list
-    if (!self.message_list)
-      self = self.opener();
-
-    if (!self && window.parent)
-      self = parent.rcmail;
-
-    if (!self || !self.message_list)
-      return;
-
-    // this may fail in multifolder mode
-    if (self.set_message(id, 'unread', false) === false)
-      self.set_message(id + '-' + folder, 'unread', false);
-
-    if (self.env.unread_counts[folder] > 0) {
-      self.env.unread_counts[folder] -= 1;
-      self.set_unread_count(folder, self.env.unread_counts[folder], folder == 'INBOX' && !self.is_multifolder_listing());
-    }
-  };
-
-  this.show_contentframe = function(show)
-  {
-    var frame, win, name = this.env.contentframe;
-
-    if (frame = this.get_frame_element(name)) {
-      if (!show && (win = this.get_frame_window(name))) {
-        if (win.location.href.indexOf(this.env.blankpage) < 0) {
-          if (win.stop)
-            win.stop();
-          else // IE
-            win.document.execCommand('Stop');
-
-          win.location.href = this.env.blankpage;
-        }
-      }
-      else if (!bw.safari && !bw.konq)
-        $(frame)[show ? 'show' : 'hide']();
-    }
-
-    if (!show) {
-      this.unlock_frame();
-      delete this.preview_id;
-    }
-  };
-
-  this.get_frame_element = function(id)
-  {
-    var frame;
-
-    if (id && (frame = document.getElementById(id)))
-      return frame;
-  };
-
-  this.get_frame_window = function(id)
-  {
-    var frame = this.get_frame_element(id);
-
-    if (frame && frame.name && window.frames)
-      return window.frames[frame.name];
-  };
-
-  this.lock_frame = function(target)
-  {
-    var rc = this.is_framed() ? parent.rcmail : this;
-
-    if (!rc.env.frame_lock)
-      rc.env.frame_lock = rc.set_busy(true, 'loading');
-
-    try {
-      if (target.frameElement)
-        $(target.frameElement).on('load.lock', function(e) {
-          rc.unlock_frame();
-          $(this).off('load.lock');
+            domrow.appendChild(domcell);
         });
-    } catch(e) { /* Ignore permission denied error */ };
-  };
 
-  this.unlock_frame = function()
-  {
-    if (this.env.frame_lock) {
-      this.set_busy(false, null, this.env.frame_lock);
-      this.env.frame_lock = null;
-    }
-  };
+        if (this.env.threading && message.depth) {
+            n = this.calculate_thread_padding(message.depth);
+            $('td.subject', domrow).attr('style', 'padding-left:' + n + ' !important');
+            $('span.branch', domrow).remove();
+        }
 
-  // list a specific page
-  this.list_page = function(page)
-  {
-    if (page == 'next')
-      page = this.env.current_page+1;
-    else if (page == 'last')
-      page = this.env.pagecount;
-    else if (page == 'prev' && this.env.current_page > 1)
-      page = this.env.current_page-1;
-    else if (page == 'first' && this.env.current_page > 1)
-      page = 1;
+        return domrow;
+    };
 
-    if (page > 0 && page <= this.env.pagecount) {
-      this.env.current_page = page;
+    this.calculate_thread_padding = function(level)
+    {
+        ref.env.thread_padding.match(/^([0-9.]+)(.+)/);
+        return (Math.min(6, level) * parseFloat(RegExp.$1)) + RegExp.$2;
+    };
 
-      if (this.task == 'addressbook' || this.contact_list)
-        this.list_contacts(this.env.source, this.env.group, page);
-      else if (this.task == 'mail')
-        this.list_mailbox(this.env.mailbox, page);
-    }
-  };
+    this.set_list_sorting = function(sort_col, sort_order)
+    {
+        var sort_old = this.env.sort_col == 'arrival' ? 'date' : this.env.sort_col,
+            sort_new = sort_col == 'arrival' ? 'date' : sort_col;
 
-  // sends request to check for recent messages
-  this.checkmail = function()
-  {
-    var lock = this.set_busy(true, 'checkingmail'),
-      params = this.check_recent_params();
+        // set table header class
+        $('#rcm' + sort_old).removeClass('sorted' + this.env.sort_order.toUpperCase());
+        if (sort_new)
+            $('#rcm' + sort_new).addClass('sorted' + sort_order);
 
-    this.http_post('check-recent', params, lock);
-  };
+        // if sorting by 'arrival' is selected, click on date column should not switch to 'date'
+        $('#rcmdate > a').prop('rel', sort_col == 'arrival' ? 'arrival' : 'date');
 
-  // list messages of a specific mailbox using filter
-  this.filter_mailbox = function(filter)
-  {
-    if (this.filter_disabled)
-      return;
+        this.env.sort_col = sort_col;
+        this.env.sort_order = sort_order;
+    };
 
-    var params = this.search_params(false, filter),
-      lock = this.set_busy(true, 'searching');
+    this.set_list_options = function(cols, sort_col, sort_order, threads, layout)
+    {
+        var update, post_data = {};
 
-    this.clear_message_list();
+        if (sort_col === undefined)
+            sort_col = this.env.sort_col;
+        if (!sort_order)
+            sort_order = this.env.sort_order;
 
-    // reset vars
-    this.env.current_page = 1;
-    this.env.search_filter = filter;
-    this.http_request('search', params, lock);
-    this.update_state({_mbox: params._mbox, _filter: filter, _scope: params._scope});
-  };
+        if (this.env.sort_col != sort_col || this.env.sort_order != sort_order) {
+            update = 1;
+            this.set_list_sorting(sort_col, sort_order);
+        }
 
-  // reload the current message listing
-  this.refresh_list = function()
-  {
-    this.list_mailbox(this.env.mailbox, this.env.current_page || 1, null, { _clear:1 }, true);
-    if (this.message_list)
-      this.message_list.clear_selection();
-  };
+        if (this.env.threading != threads) {
+            update = 1;
+            post_data._threads = threads;
+        }
 
-  // list messages of a specific mailbox
-  this.list_mailbox = function(mbox, page, sort, url, update_only)
-  {
-    var win, target = window;
+        if (layout && this.env.layout != layout) {
+            this.triggerEvent('layout-change', {old_layout: this.env.layout, new_layout: layout});
+            update = 1;
+            this.env.layout = post_data._layout = layout;
 
-    if (typeof url != 'object')
-      url = {};
+            // update message list setup
+            this.msglist_setup(this.env.layout);
+        }
 
-    if (!mbox)
-      mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';
+        if (cols && cols.length) {
+            // make sure new columns are added at the end of the list
+            var i, idx, name, newcols = [], oldcols = this.env.listcols;
 
-    // add sort to url if set
-    if (sort)
-      url._sort = sort;
+            for (i=0; i<oldcols.length; i++) {
+                name = oldcols[i];
+                idx = $.inArray(name, cols);
+                if (idx != -1) {
+                    newcols.push(name);
+                    delete cols[idx];
+                }
+            }
+            for (i=0; i<cols.length; i++)
+                if (cols[i])
+                    newcols.push(cols[i]);
 
-    // folder change, reset page, search scope, etc.
-    if (this.env.mailbox != mbox) {
-      page = 1;
-      this.env.current_page = page;
-      this.env.search_scope = this.env.search_scope || 'base';
-      this.select_all_mode = false;
-      this.reset_search_filter();
-    }
-    // also send search request to get the right messages
-    else if (this.env.search_request)
-      url._search = this.env.search_request;
+            if (newcols.join() != oldcols.join()) {
+                update = 1;
+                post_data._cols = newcols.join(',');
+            }
+        }
 
-    if (!update_only) {
-      // unselect selected messages and clear the list and message data
-      this.clear_message_list();
+        if (update)
+            this.list_mailbox('', '', sort_col+'_'+sort_order, post_data);
+    };
 
-      if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
-        url._refresh = 1;
+    // when user double-clicks on a row
+    this.show_message = function(id, safe, preview)
+    {
+        if (!id)
+            return;
 
-      this.select_folder(mbox, '', true);
-      this.unmark_folder(mbox, 'recent', '', true);
-      this.env.mailbox = mbox;
-    }
+        var win, target = window,
+            url = this.params_from_uid(id, {_caps: this.browser_capabilities()});
 
-    // load message list remotely
-    if (this.gui_objects.messagelist) {
-      this.list_mailbox_remote(mbox, page, url);
-      return;
-    }
+        if (preview && (win = this.get_frame_window(this.env.contentframe))) {
+            target = win;
+            url._framed = 1;
+        }
 
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      target = win;
-      url._framed = 1;
-    }
+        if (safe)
+            url._safe = 1;
 
-    if (this.env.uid)
-      url._uid = this.env.uid;
+        // also send search request to get the right messages
+        if (this.env.search_request)
+            url._search = this.env.search_request;
 
-    if (page)
-      url._page = page;
+        if (this.env.extwin)
+            url._extwin = 1;
 
-    // load message list to target frame/window
-    if (mbox) {
-      url._mbox = mbox;
-      this.set_busy(true, 'loading');
-      this.location_href(url, target);
-    }
-  };
+        url = this.url(preview ? 'preview': 'show', url);
 
-  this.clear_message_list = function()
-  {
-    this.env.messages = {};
+        if (preview)
+            this.preview_id = id;
 
-    this.show_contentframe(false);
-    if (this.message_list)
-      this.message_list.clear(true);
-  };
+        if (preview && String(target.location.href).indexOf(url) >= 0) {
+            this.show_contentframe(true);
+        }
+        else {
+            if (!preview && this.env.message_extwin && !this.env.extwin)
+                this.open_window(url, true);
+            else {
+                // "Allow remote resources" reloads the page, we remove this request from the history,
+                // so Back button works as expected, i.e. ignores the reload request (#6620)
+                if (safe && document.referrer && window.history.replaceState)
+                    window.history.replaceState({}, '', document.referrer);
 
-  // send remote request to load message list
-  this.list_mailbox_remote = function(mbox, page, url)
-  {
-    var lock = this.set_busy(true, 'loading');
+                this.location_href(url, target, true);
+            }
+        }
+    };
 
-    if (typeof url != 'object')
-      url = {};
+    // update message status and unread counter after marking a message as read
+    this.set_unread_message = function(id, folder)
+    {
+        var self = this;
 
-    url._layout = this.env.layout
-    url._mbox = mbox;
-    url._page = page;
+        // find window with messages list
+        if (!self.message_list)
+            self = self.opener();
 
-    this.http_request('list', url, lock);
-    this.update_state({ _mbox: mbox, _page: (page && page > 1 ? page : null) });
-  };
+        if (!self && window.parent)
+            self = parent.rcmail;
 
-  // removes messages that doesn't exists from list selection array
-  this.update_selection = function()
-  {
-    var list = this.message_list,
-      selected = list.selection,
-      rows = list.rows,
-      i, selection = [];
+        if (!self || !self.message_list)
+            return;
 
-    for (i in selected)
-      if (rows[selected[i]])
-        selection.push(selected[i]);
+        // this may fail in multifolder mode
+        if (self.set_message(id, 'unread', false) === false)
+            self.set_message(id + '-' + folder, 'unread', false);
 
-    list.selection = selection;
+        if (self.env.unread_counts[folder] > 0) {
+            self.env.unread_counts[folder] -= 1;
+            self.set_unread_count(folder, self.env.unread_counts[folder], folder == 'INBOX' && !self.is_multifolder_listing());
+        }
+    };
 
-    // reset preview frame, if currently previewed message is not selected (has been removed)
-    try {
-      var win = this.get_frame_window(this.env.contentframe),
-        id = win.rcmail.env.uid;
+    this.show_contentframe = function(show)
+    {
+        var frame, win, name = this.env.contentframe;
+
+        if (frame = this.get_frame_element(name)) {
+            if (!show && (win = this.get_frame_window(name))) {
+                if (win.location.href.indexOf(this.env.blankpage) < 0) {
+                    if (win.stop)
+                        win.stop();
+                    else // IE
+                        win.document.execCommand('Stop');
+
+                    win.location.href = this.env.blankpage;
+                }
+            }
+            else if (!bw.safari && !bw.konq)
+                $(frame)[show ? 'show' : 'hide']();
+        }
+
+        if (!show) {
+            this.unlock_frame();
+            delete this.preview_id;
+        }
+    };
+
+    this.get_frame_element = function(id)
+    {
+        var frame;
+
+        if (id && (frame = document.getElementById(id)))
+            return frame;
+    };
+
+    this.get_frame_window = function(id)
+    {
+        var frame = this.get_frame_element(id);
+
+        if (frame && frame.name && window.frames)
+            return window.frames[frame.name];
+    };
+
+    this.lock_frame = function(target)
+    {
+        var rc = this.is_framed() ? parent.rcmail : this;
+
+        if (!rc.env.frame_lock)
+            rc.env.frame_lock = rc.set_busy(true, 'loading');
+
+        try {
+            if (target.frameElement)
+                $(target.frameElement).on('load.lock', function(e) {
+                    rc.unlock_frame();
+                    $(this).off('load.lock');
+                });
+        } catch(e) { /* Ignore permission denied error */ };
+    };
+
+    this.unlock_frame = function()
+    {
+        if (this.env.frame_lock) {
+            this.set_busy(false, null, this.env.frame_lock);
+            this.env.frame_lock = null;
+        }
+    };
+
+    // list a specific page
+    this.list_page = function(page)
+    {
+        if (page == 'next')
+            page = this.env.current_page+1;
+        else if (page == 'last')
+            page = this.env.pagecount;
+        else if (page == 'prev' && this.env.current_page > 1)
+            page = this.env.current_page-1;
+        else if (page == 'first' && this.env.current_page > 1)
+            page = 1;
+
+        if (page > 0 && page <= this.env.pagecount) {
+            this.env.current_page = page;
+
+            if (this.task == 'addressbook' || this.contact_list)
+                this.list_contacts(this.env.source, this.env.group, page);
+            else if (this.task == 'mail')
+                this.list_mailbox(this.env.mailbox, page);
+        }
+    };
+
+    // sends request to check for recent messages
+    this.checkmail = function()
+    {
+        var lock = this.set_busy(true, 'checkingmail'),
+            params = this.check_recent_params();
+
+        this.http_post('check-recent', params, lock);
+    };
+
+    // list messages of a specific mailbox using filter
+    this.filter_mailbox = function(filter)
+    {
+        if (this.filter_disabled)
+            return;
+
+        var params = this.search_params(false, filter),
+            lock = this.set_busy(true, 'searching');
+
+        this.clear_message_list();
+
+        // reset vars
+        this.env.current_page = 1;
+        this.env.search_filter = filter;
+        this.http_request('search', params, lock);
+        this.update_state({_mbox: params._mbox, _filter: filter, _scope: params._scope});
+    };
+
+    // reload the current message listing
+    this.refresh_list = function()
+    {
+        this.list_mailbox(this.env.mailbox, this.env.current_page || 1, null, { _clear:1 }, true);
+        if (this.message_list)
+            this.message_list.clear_selection();
+    };
+
+    // list messages of a specific mailbox
+    this.list_mailbox = function(mbox, page, sort, url, update_only)
+    {
+        var win, target = window;
+
+        if (typeof url != 'object')
+            url = {};
+
+        if (!mbox)
+            mbox = this.env.mailbox ? this.env.mailbox : 'INBOX';
+
+        // add sort to url if set
+        if (sort)
+            url._sort = sort;
+
+        // folder change, reset page, search scope, etc.
+        if (this.env.mailbox != mbox) {
+            page = 1;
+            this.env.current_page = page;
+            this.env.search_scope = this.env.search_scope || 'base';
+            this.select_all_mode = false;
+            this.reset_search_filter();
+        }
+        // also send search request to get the right messages
+        else if (this.env.search_request)
+            url._search = this.env.search_request;
+
+        if (!update_only) {
+            // unselect selected messages and clear the list and message data
+            this.clear_message_list();
+
+            if (mbox != this.env.mailbox || (mbox == this.env.mailbox && !page && !sort))
+                url._refresh = 1;
+
+            this.select_folder(mbox, '', true);
+            this.unmark_folder(mbox, 'recent', '', true);
+            this.env.mailbox = mbox;
+        }
+
+        // load message list remotely
+        if (this.gui_objects.messagelist) {
+            this.list_mailbox_remote(mbox, page, url);
+            return;
+        }
+
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            target = win;
+            url._framed = 1;
+        }
+
+        if (this.env.uid)
+            url._uid = this.env.uid;
+
+        if (page)
+            url._page = page;
+
+        // load message list to target frame/window
+        if (mbox) {
+            url._mbox = mbox;
+            this.set_busy(true, 'loading');
+            this.location_href(url, target);
+        }
+    };
+
+    this.clear_message_list = function()
+    {
+        this.env.messages = {};
 
-      if (id && !list.in_selection(id))
         this.show_contentframe(false);
-    }
-    catch (e) {};
-  };
+        if (this.message_list)
+            this.message_list.clear(true);
+    };
 
-  // expand all threads with unread children
-  this.expand_unread = function()
-  {
-    var r, tbody = this.message_list.tbody,
-      new_row = tbody.firstChild;
+    // send remote request to load message list
+    this.list_mailbox_remote = function(mbox, page, url)
+    {
+        var lock = this.set_busy(true, 'loading');
 
-    while (new_row) {
-      if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
-        this.message_list.expand_all(r);
-        this.set_unread_children(r.uid);
-      }
+        if (typeof url != 'object')
+            url = {};
 
-      new_row = new_row.nextSibling;
-    }
+        url._layout = this.env.layout;
+        url._mbox = mbox;
+        url._page = page;
 
-    return false;
-  };
+        this.http_request('list', url, lock);
+        this.update_state({ _mbox: mbox, _page: (page && page > 1 ? page : null) });
+    };
 
-  // thread expanding/collapsing handler
-  this.expand_message_row = function(e, uid)
-  {
-    var row = this.message_list.rows[uid];
+    // removes messages that doesn't exists from list selection array
+    this.update_selection = function()
+    {
+        var list = this.message_list,
+            selected = list.selection,
+            rows = list.rows,
+            i, selection = [];
 
-    // handle unread_children/flagged_children mark
-    row.expanded = !row.expanded;
-    this.set_unread_children(uid);
-    this.set_flagged_children(uid);
-    row.expanded = !row.expanded;
+        for (i in selected)
+            if (rows[selected[i]])
+                selection.push(selected[i]);
 
-    this.message_list.expand_row(e, uid);
-  };
+        list.selection = selection;
 
-  // message list expanding
-  this.expand_threads = function()
-  {
-    if (!this.env.threading || !this.env.autoexpand_threads || !this.message_list)
-      return;
+        // reset preview frame, if currently previewed message is not selected (has been removed)
+        try {
+            var win = this.get_frame_window(this.env.contentframe),
+                id = win.rcmail.env.uid;
 
-    switch (this.env.autoexpand_threads) {
-      case 2: this.expand_unread(); break;
-      case 1: this.message_list.expand_all(); break;
-    }
-  };
+            if (id && !list.in_selection(id))
+                this.show_contentframe(false);
+        }
+        catch (e) {};
+    };
 
-  // Initializes threads indicators/expanders after list update
-  this.init_threads = function(roots, mbox)
-  {
+    // expand all threads with unread children
+    this.expand_unread = function()
+    {
+        var r, tbody = this.message_list.tbody,
+            new_row = tbody.firstChild;
+
+        while (new_row) {
+            if (new_row.nodeType == 1 && (r = this.message_list.rows[new_row.uid]) && r.unread_children) {
+                this.message_list.expand_all(r);
+                this.set_unread_children(r.uid);
+            }
+
+            new_row = new_row.nextSibling;
+        }
+
+        return false;
+    };
+
+    // thread expanding/collapsing handler
+    this.expand_message_row = function(e, uid)
+    {
+        var row = this.message_list.rows[uid];
+
+        // handle unread_children/flagged_children mark
+        row.expanded = !row.expanded;
+        this.set_unread_children(uid);
+        this.set_flagged_children(uid);
+        row.expanded = !row.expanded;
+
+        this.message_list.expand_row(e, uid);
+    };
+
+    // message list expanding
+    this.expand_threads = function()
+    {
+        if (!this.env.threading || !this.env.autoexpand_threads || !this.message_list)
+            return;
+
+        switch (this.env.autoexpand_threads) {
+            case 2: this.expand_unread(); break;
+            case 1: this.message_list.expand_all(); break;
+        }
+    };
+
+    // Initializes threads indicators/expanders after list update
+    this.init_threads = function(roots, mbox)
+    {
     // #1487752
-    if (mbox && mbox != this.env.mailbox)
-      return false;
+        if (mbox && mbox != this.env.mailbox)
+            return false;
 
-    for (var n=0, len=roots.length; n<len; n++)
-      this.add_tree_icons(roots[n]);
-    this.expand_threads();
-  };
+        for (var n=0, len=roots.length; n<len; n++)
+            this.add_tree_icons(roots[n]);
+        this.expand_threads();
+    };
 
-  // adds threads tree icons to the list (or specified thread)
-  this.add_tree_icons = function(root)
-  {
-    var i, l, r, n, len, pos, tmp = [], uid = [],
-      row, rows = this.message_list.rows;
+    // adds threads tree icons to the list (or specified thread)
+    this.add_tree_icons = function(root)
+    {
+        var i, l, r, n, len, pos, tmp = [], uid = [],
+            row, rows = this.message_list.rows;
 
-    if (root)
-      row = rows[root] ? rows[root].obj : null;
-    else
-      row = this.message_list.tbody.firstChild;
+        if (root)
+            row = rows[root] ? rows[root].obj : null;
+        else
+            row = this.message_list.tbody.firstChild;
 
-    while (row) {
-      if (row.nodeType == 1 && (r = rows[row.uid])) {
-        if (r.depth) {
-          for (i=tmp.length-1; i>=0; i--) {
-            len = tmp[i].length;
-            if (len > r.depth) {
-              pos = len - r.depth;
-              if (!(tmp[i][pos] & 2))
-                tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
+        while (row) {
+            if (row.nodeType == 1 && (r = rows[row.uid])) {
+                if (r.depth) {
+                    for (i=tmp.length-1; i>=0; i--) {
+                        len = tmp[i].length;
+                        if (len > r.depth) {
+                            pos = len - r.depth;
+                            if (!(tmp[i][pos] & 2))
+                                tmp[i][pos] = tmp[i][pos] ? tmp[i][pos]+2 : 2;
+                        }
+                        else if (len == r.depth) {
+                            if (!(tmp[i][0] & 2))
+                                tmp[i][0] += 2;
+                        }
+                        if (r.depth > len)
+                            break;
+                    }
+
+                    tmp.push(new Array(r.depth));
+                    tmp[tmp.length-1][0] = 1;
+                    uid.push(r.uid);
+                }
+                else {
+                    if (tmp.length) {
+                        for (i in tmp) {
+                            this.set_tree_icons(uid[i], tmp[i]);
+                        }
+                        tmp = [];
+                        uid = [];
+                    }
+                    if (root && row != rows[root].obj)
+                        break;
+                }
             }
-            else if (len == r.depth) {
-              if (!(tmp[i][0] & 2))
-                tmp[i][0] += 2;
-            }
-            if (r.depth > len)
-              break;
-          }
-
-          tmp.push(new Array(r.depth));
-          tmp[tmp.length-1][0] = 1;
-          uid.push(r.uid);
+            row = row.nextSibling;
         }
-        else {
-          if (tmp.length) {
+
+        if (tmp.length) {
             for (i in tmp) {
-              this.set_tree_icons(uid[i], tmp[i]);
+                this.set_tree_icons(uid[i], tmp[i]);
             }
-            tmp = [];
-            uid = [];
-          }
-          if (root && row != rows[root].obj)
-            break;
         }
-      }
-      row = row.nextSibling;
-    }
+    };
 
-    if (tmp.length) {
-      for (i in tmp) {
-        this.set_tree_icons(uid[i], tmp[i]);
-      }
-    }
-  };
+    // adds tree icons to specified message row
+    this.set_tree_icons = function(uid, tree)
+    {
+        var i, divs = [], html = '', len = tree.length;
 
-  // adds tree icons to specified message row
-  this.set_tree_icons = function(uid, tree)
-  {
-    var i, divs = [], html = '', len = tree.length;
+        for (i=0; i<len; i++) {
+            if (tree[i] > 2)
+                divs.push({'class': 'l3', width: 15});
+            else if (tree[i] > 1)
+                divs.push({'class': 'l2', width: 15});
+            else if (tree[i] > 0)
+                divs.push({'class': 'l1', width: 15});
+            // separator div
+            else if (divs.length && !divs[divs.length-1]['class'])
+                divs[divs.length-1].width += 15;
+            else
+                divs.push({'class': null, width: 15});
+        }
 
-    for (i=0; i<len; i++) {
-      if (tree[i] > 2)
-        divs.push({'class': 'l3', width: 15});
-      else if (tree[i] > 1)
-        divs.push({'class': 'l2', width: 15});
-      else if (tree[i] > 0)
-        divs.push({'class': 'l1', width: 15});
-      // separator div
-      else if (divs.length && !divs[divs.length-1]['class'])
-        divs[divs.length-1].width += 15;
-      else
-        divs.push({'class': null, width: 15});
-    }
+        for (i=divs.length-1; i>=0; i--) {
+            if (divs[i]['class'])
+                html += '<div class="tree '+divs[i]['class']+'" />';
+            else
+                html += '<div style="width:'+divs[i].width+'px" />';
+        }
 
-    for (i=divs.length-1; i>=0; i--) {
-      if (divs[i]['class'])
-        html += '<div class="tree '+divs[i]['class']+'" />';
-      else
-        html += '<div style="width:'+divs[i].width+'px" />';
-    }
+        if (html)
+            $('#rcmtab'+this.html_identifier(uid, true)).html(html);
+    };
 
-    if (html)
-      $('#rcmtab'+this.html_identifier(uid, true)).html(html);
-  };
+    // update parent in a thread
+    this.update_thread_root = function(uid, flag)
+    {
+        if (!this.env.threading)
+            return;
 
-  // update parent in a thread
-  this.update_thread_root = function(uid, flag)
-  {
-    if (!this.env.threading)
-      return;
+        var root = this.message_list.find_root(uid);
 
-    var root = this.message_list.find_root(uid);
+        if (uid == root)
+            return;
 
-    if (uid == root)
-      return;
+        var p = this.message_list.rows[root];
 
-    var p = this.message_list.rows[root];
-
-    if (flag == 'read' && p.unread_children) {
-      p.unread_children--;
-    }
-    else if (flag == 'unread' && p.has_children) {
-      // unread_children may be undefined
-      p.unread_children = (p.unread_children || 0) + 1;
-    }
-    else if (flag == 'unflagged' && p.flagged_children) {
-      p.flagged_children--;
-    }
-    else if (flag == 'flagged' && p.has_children) {
-      p.flagged_children = (p.flagged_children || 0) + 1;
-    }
-    else {
-      return;
-    }
-
-    this.set_message_icon(root);
-    this.set_unread_children(root);
-    this.set_flagged_children(root);
-  };
-
-  // update thread indicators for all messages in a thread below the specified message
-  // return number of removed/added root level messages
-  this.update_thread = function(uid)
-  {
-    if (!this.env.threading || !this.message_list.rows[uid])
-      return 0;
-
-    var r, parent, count = 0,
-      list = this.message_list,
-      rows = list.rows,
-      row = rows[uid],
-      depth = rows[uid].depth,
-      roots = [];
-
-    if (!row.depth) // root message: decrease roots count
-      count--;
-
-    // update unread_children for thread root
-    if (row.depth && row.unread) {
-      parent = list.find_root(uid);
-      rows[parent].unread_children--;
-      this.set_unread_children(parent);
-    }
-
-    // update unread_children for thread root
-    if (row.depth && row.flagged) {
-      parent = list.find_root(uid);
-      rows[parent].flagged_children--;
-      this.set_flagged_children(parent);
-    }
-
-    parent = row.parent_uid;
-
-    // children
-    row = row.obj.nextSibling;
-    while (row) {
-      if (row.nodeType == 1 && (r = rows[row.uid])) {
-        if (!r.depth || r.depth <= depth)
-          break;
-
-        r.depth--; // move left
-        // reset width and clear the content of a tab, icons will be added later
-        $('#rcmtab'+r.id).width(r.depth * 15).html('');
-        if (!r.depth) { // a new root
-          count++; // increase roots count
-          r.parent_uid = 0;
-          if (r.has_children) {
-            // replace 'leaf' with 'collapsed'
-            $('#' + r.id + ' .leaf').first()
-              .attr('id', 'rcmexpando' + r.id)
-              .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
-              .mousedown({uid: r.uid}, function(e) {
-                return ref.expand_message_row(e, e.data.uid);
-              });
-
-            r.unread_children = 0;
-            roots.push(r);
-          }
-          // show if it was hidden
-          if (r.obj.style.display == 'none')
-            $(r.obj).show();
+        if (flag == 'read' && p.unread_children) {
+            p.unread_children--;
+        }
+        else if (flag == 'unread' && p.has_children) {
+            // unread_children may be undefined
+            p.unread_children = (p.unread_children || 0) + 1;
+        }
+        else if (flag == 'unflagged' && p.flagged_children) {
+            p.flagged_children--;
+        }
+        else if (flag == 'flagged' && p.has_children) {
+            p.flagged_children = (p.flagged_children || 0) + 1;
         }
         else {
-          if (r.depth == depth)
-            r.parent_uid = parent;
-          if (r.unread && roots.length)
-            roots[roots.length-1].unread_children++;
-        }
-      }
-      row = row.nextSibling;
-    }
-
-    // update unread_children/flagged_children for roots
-    for (r=0; r<roots.length; r++) {
-      this.set_unread_children(roots[r].uid);
-      this.set_flagged_children(roots[r].uid);
-    }
-
-    return count;
-  };
-
-  this.delete_excessive_thread_rows = function()
-  {
-    var rows = this.message_list.rows,
-      tbody = this.message_list.tbody,
-      row = tbody.firstChild,
-      cnt = this.env.pagesize + 1;
-
-    while (row) {
-      if (row.nodeType == 1 && (r = rows[row.uid])) {
-        if (!r.depth && cnt)
-          cnt--;
-
-        if (!cnt)
-          this.message_list.remove_row(row.uid);
-      }
-      row = row.nextSibling;
-    }
-  };
-
-  // set message icon
-  this.set_message_icon = function(uid)
-  {
-    var css_class, label = '',
-      row = this.message_list.rows[uid];
-
-    if (!row)
-      return false;
-
-    if (row.icon) {
-      css_class = 'msgicon';
-      if (row.deleted) {
-        css_class += ' deleted';
-        label += this.get_label('deleted') + ' ';
-      }
-      else if (row.unread) {
-        css_class += ' unread';
-        label += this.get_label('unread') + ' ';
-      }
-      else if (row.unread_children)
-        css_class += ' unreadchildren';
-      if (row.msgicon == row.icon) {
-        if (row.replied) {
-          css_class += ' replied';
-          label += this.get_label('replied') + ' ';
-        }
-        if (row.forwarded) {
-          css_class += ' forwarded';
-          label += this.get_label('forwarded') + ' ';
-        }
-        css_class += ' status';
-      }
-
-      $(row.icon).attr({'class': css_class, title: label});
-    }
-
-    if (row.msgicon && row.msgicon != row.icon) {
-      label = '';
-      css_class = 'msgicon';
-      if (!row.unread && row.unread_children) {
-        css_class += ' unreadchildren';
-      }
-      if (row.replied) {
-        css_class += ' replied';
-        label += this.get_label('replied') + ' ';
-      }
-      if (row.forwarded) {
-        css_class += ' forwarded';
-        label += this.get_label('forwarded') + ' ';
-      }
-
-      $(row.msgicon).attr({'class': css_class, title: label});
-    }
-
-    if (row.flagicon) {
-      css_class = (row.flagged ? 'flagged' : 'unflagged');
-      label = this.get_label(css_class);
-      $(row.flagicon).attr('class', css_class)
-        .attr({'aria-label': label, title: label});
-    }
-  };
-
-  // set message status
-  this.set_message_status = function(uid, flag, status)
-  {
-    var row = this.message_list.rows[uid];
-
-    if (!row)
-      return false;
-
-    if (flag == 'unread') {
-      if (row.unread != status)
-        this.update_thread_root(uid, status ? 'unread' : 'read');
-    }
-    else if (flag == 'flagged') {
-      this.update_thread_root(uid, status ? 'flagged' : 'unflagged');
-    }
-
-    if ($.inArray(flag, ['unread', 'deleted', 'replied', 'forwarded', 'flagged']) > -1)
-      row[flag] = status;
-  };
-
-  // set message row status, class and icon
-  this.set_message = function(uid, flag, status)
-  {
-    var row = this.message_list && this.message_list.rows[uid];
-
-    if (!row)
-      return false;
-
-    if (flag)
-      this.set_message_status(uid, flag, status);
-
-    if ($.inArray(flag, ['unread', 'deleted', 'flagged']) > -1)
-      $(row.obj)[row[flag] ? 'addClass' : 'removeClass'](flag);
-
-    this.set_unread_children(uid);
-    this.set_message_icon(uid);
-  };
-
-  // sets unroot (unread_children) class of parent row
-  this.set_unread_children = function(uid)
-  {
-    var row = this.message_list.rows[uid];
-
-    if (row.parent_uid)
-      return;
-
-    var enable = !row.unread && row.unread_children && !row.expanded;
-    $(row.obj)[enable ? 'addClass' : 'removeClass']('unroot');
-  };
-
-  // sets flaggedroot (flagged_children) class of parent row
-  this.set_flagged_children = function(uid)
-  {
-    var row = this.message_list.rows[uid];
-
-    if (row.parent_uid)
-      return;
-
-    var enable = row.flagged_children && !row.expanded;
-    $(row.obj)[enable ? 'addClass' : 'removeClass']('flaggedroot');
-  };
-
-  // copy selected messages to the specified mailbox
-  this.copy_messages = function(mbox, event, uids)
-  {
-    if (mbox && typeof mbox === 'object') {
-      if (mbox.uids) uids = mbox.uids;
-      mbox = mbox.id;
-    }
-    else if (!mbox) {
-      uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
-      return this.folder_selector(event, function(folder, obj) {
-        ref.command('copy', {id: folder, uids: uids}, obj, event, true);
-      });
-    }
-
-    // exit if current or no mailbox specified
-    if (!mbox || mbox == this.env.mailbox)
-      return;
-
-    var post_data = this.selection_post_data({_target_mbox: mbox, _uid: uids});
-
-    // exit if selection is empty
-    if (!post_data._uid)
-      return;
-
-    // send request to server
-    this.http_post('copy', post_data, this.display_message('copyingmessage', 'loading'));
-  };
-
-  // move selected messages to the specified mailbox
-  this.move_messages = function(mbox, event, uids)
-  {
-    if (mbox && typeof mbox === 'object') {
-      if (mbox.uids) uids = mbox.uids;
-      mbox = mbox.id;
-    }
-    else if (!mbox) {
-      uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
-      return this.folder_selector(event, function(folder, obj) {
-        ref.command('move', {id: folder, uids: uids}, obj, event, true);
-      });
-    }
-
-    // exit if current or no mailbox specified
-    if (!mbox || (mbox == this.env.mailbox && !this.is_multifolder_listing()))
-      return;
-
-    var lock = false, post_data = this.selection_post_data({_target_mbox: mbox, _uid: uids});
-
-    // exit if selection is empty
-    if (!post_data._uid)
-      return;
-
-    // show wait message
-    if (this.env.action == 'show')
-      lock = this.set_busy(true, 'movingmessage');
-
-    // Hide message command buttons until a message is selected
-    this.enable_command(this.env.message_commands, false);
-
-    this.with_selected_messages('move', post_data, lock);
-
-    if (this.env.action != 'show')
-      this.show_contentframe(false);
-  };
-
-  // delete selected messages from the current mailbox
-  this.delete_messages = function(event, uid)
-  {
-    var list = this.message_list, trash = this.env.trash_mailbox;
-
-    // if config is set to flag for deletion
-    if (this.env.flag_for_deletion) {
-      this.mark_message('delete', uid);
-      return false;
-    }
-    // if there isn't a defined trash mailbox or we are in it
-    else if (!trash || this.env.mailbox == trash)
-      this.permanently_remove_messages(uid);
-    // we're in Junk folder and delete_junk is enabled
-    else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
-      this.permanently_remove_messages(uid);
-    // if there is a trash mailbox defined and we're not currently in it
-    else {
-      // if shift was pressed delete it immediately
-      if ((list && list.modkey == SHIFT_KEY) || (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
-        this.confirm_dialog(this.get_label('deletemessagesconfirm'), 'delete', function() {
-            ref.permanently_remove_messages(uid);
-          });
-      }
-      else
-        this.move_messages(trash, event, uid ? [uid] : null);
-    }
-
-    return true;
-  };
-
-  // delete the selected messages permanently
-  this.permanently_remove_messages = function(uid)
-  {
-    var post_data = this.selection_post_data(uid ? {_uid: uid} : null);
-
-    // exit if selection is empty
-    if (!post_data._uid)
-      return;
-
-    this.with_selected_messages('delete', post_data);
-    this.show_contentframe(false);
-  };
-
-  // Send a specific move/delete request with UIDs of all selected messages
-  this.with_selected_messages = function(action, post_data, lock, http_action)
-  {
-    var msg, count = 0,
-      remove = (action == 'delete' || !this.is_multifolder_listing());
-
-    // update the list (remove rows, clear selection)
-    if (this.message_list) {
-      var n, len, id, root, roots = [],
-        selection = post_data._uid,
-        display_next = this.check_display_next();
-
-      if (selection === '*')
-        selection = this.message_list.get_selection();
-      else if (!Array.isArray(selection))
-        selection = String(selection).split(',');
-
-      for (n=0, len=selection.length; n<len; n++) {
-        id = selection[n];
-
-        if (this.env.threading) {
-          count += this.update_thread(id);
-          root = this.message_list.find_root(id);
-          if (root != id && $.inArray(root, roots) < 0) {
-            roots.push(root);
-          }
+            return;
         }
 
-        if (remove)
-          this.message_list.remove_row(id, display_next && n == selection.length-1);
-      }
+        this.set_message_icon(root);
+        this.set_unread_children(root);
+        this.set_flagged_children(root);
+    };
 
-      // make sure there are no selected rows
-      if (!display_next && remove)
-        this.message_list.clear_selection();
+    // update thread indicators for all messages in a thread below the specified message
+    // return number of removed/added root level messages
+    this.update_thread = function(uid)
+    {
+        if (!this.env.threading || !this.message_list.rows[uid])
+            return 0;
 
-      // update thread tree icons
-      for (n=0, len=roots.length; n<len; n++) {
-        this.add_tree_icons(roots[n]);
-      }
-    }
+        var r, parent, count = 0,
+            list = this.message_list,
+            rows = list.rows,
+            row = rows[uid],
+            depth = rows[uid].depth,
+            roots = [];
 
-    if (count < 0)
-      post_data._count = (count*-1);
-    // remove threads from the end of the list
-    else if (count > 0 && remove)
-      this.delete_excessive_thread_rows();
+        if (!row.depth) // root message: decrease roots count
+            count--;
 
-    if (!remove)
-      post_data._refresh = 1;
+        // update unread_children for thread root
+        if (row.depth && row.unread) {
+            parent = list.find_root(uid);
+            rows[parent].unread_children--;
+            this.set_unread_children(parent);
+        }
 
-    if (!lock) {
-      msg = action == 'move' ? 'movingmessage' : 'deletingmessage';
-      lock = this.display_message(msg, 'loading');
-    }
+        // update unread_children for thread root
+        if (row.depth && row.flagged) {
+            parent = list.find_root(uid);
+            rows[parent].flagged_children--;
+            this.set_flagged_children(parent);
+        }
 
-    // send request to server
-    this.http_post(http_action || action, post_data, lock);
-  };
+        parent = row.parent_uid;
 
-  // build post data for message delete/move/copy/flag requests
-  this.selection_post_data = function(data)
-  {
-    if (!data || typeof(data) != 'object')
-      data = {};
+        // children
+        row = row.obj.nextSibling;
+        while (row) {
+            if (row.nodeType == 1 && (r = rows[row.uid])) {
+                if (!r.depth || r.depth <= depth)
+                    break;
 
-    if (!data._uid)
-      data._uid = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
+                r.depth--; // move left
+                // reset width and clear the content of a tab, icons will be added later
+                $('#rcmtab'+r.id).width(r.depth * 15).html('');
+                if (!r.depth) { // a new root
+                    count++; // increase roots count
+                    r.parent_uid = 0;
+                    if (r.has_children) {
+                        // replace 'leaf' with 'collapsed'
+                        $('#' + r.id + ' .leaf').first()
+                            .attr('id', 'rcmexpando' + r.id)
+                            .attr('class', (r.obj.style.display != 'none' ? 'expanded' : 'collapsed'))
+                            .mousedown({uid: r.uid}, function(e) {
+                                return ref.expand_message_row(e, e.data.uid);
+                            });
 
-    data._mbox = this.env.mailbox;
-    data._uid = this.uids_to_list(data._uid);
+                        r.unread_children = 0;
+                        roots.push(r);
+                    }
+                    // show if it was hidden
+                    if (r.obj.style.display == 'none')
+                        $(r.obj).show();
+                }
+                else {
+                    if (r.depth == depth)
+                        r.parent_uid = parent;
+                    if (r.unread && roots.length)
+                        roots[roots.length-1].unread_children++;
+                }
+            }
+            row = row.nextSibling;
+        }
 
-    if (this.env.action)
-      data._from = this.env.action;
+        // update unread_children/flagged_children for roots
+        for (r=0; r<roots.length; r++) {
+            this.set_unread_children(roots[r].uid);
+            this.set_flagged_children(roots[r].uid);
+        }
 
-    // also send search request to get the right messages
-    if (this.env.search_request)
-      data._search = this.env.search_request;
+        return count;
+    };
 
-    if (this.env.display_next && this.env.next_uid)
-      data._next_uid = this.env.next_uid;
+    this.delete_excessive_thread_rows = function()
+    {
+        var rows = this.message_list.rows,
+            tbody = this.message_list.tbody,
+            row = tbody.firstChild,
+            cnt = this.env.pagesize + 1;
 
-    return data;
-  };
+        while (row) {
+            if (row.nodeType == 1 && (r = rows[row.uid])) {
+                if (!r.depth && cnt)
+                    cnt--;
 
-  this.check_display_next = function()
-  {
-    return this.env.display_next && (this.preview_id || !this.env.contentframe);
-  };
+                if (!cnt)
+                    this.message_list.remove_row(row.uid);
+            }
+            row = row.nextSibling;
+        }
+    };
 
-  // set a specific flag to one or more messages
-  this.mark_message = function(flag, uid)
-  {
-    var a_uids = [], r_uids = [], len, n, id,
-      list = this.message_list;
+    // set message icon
+    this.set_message_icon = function(uid)
+    {
+        var css_class, label = '',
+            row = this.message_list.rows[uid];
 
-    if (uid)
-      a_uids.push(uid);
-    else if (this.env.uid)
-      a_uids.push(this.env.uid);
-    else if (list)
-      a_uids = list.get_selection();
+        if (!row)
+            return false;
 
-    if (!list)
-      r_uids = a_uids;
-    else {
-      list.focus();
-      for (n=0, len=a_uids.length; n<len; n++) {
-        id = a_uids[n];
-        if ((flag == 'read' && list.rows[id].unread)
+        if (row.icon) {
+            css_class = 'msgicon';
+            if (row.deleted) {
+                css_class += ' deleted';
+                label += this.get_label('deleted') + ' ';
+            }
+            else if (row.unread) {
+                css_class += ' unread';
+                label += this.get_label('unread') + ' ';
+            }
+            else if (row.unread_children)
+                css_class += ' unreadchildren';
+            if (row.msgicon == row.icon) {
+                if (row.replied) {
+                    css_class += ' replied';
+                    label += this.get_label('replied') + ' ';
+                }
+                if (row.forwarded) {
+                    css_class += ' forwarded';
+                    label += this.get_label('forwarded') + ' ';
+                }
+                css_class += ' status';
+            }
+
+            $(row.icon).attr({'class': css_class, title: label});
+        }
+
+        if (row.msgicon && row.msgicon != row.icon) {
+            label = '';
+            css_class = 'msgicon';
+            if (!row.unread && row.unread_children) {
+                css_class += ' unreadchildren';
+            }
+            if (row.replied) {
+                css_class += ' replied';
+                label += this.get_label('replied') + ' ';
+            }
+            if (row.forwarded) {
+                css_class += ' forwarded';
+                label += this.get_label('forwarded') + ' ';
+            }
+
+            $(row.msgicon).attr({'class': css_class, title: label});
+        }
+
+        if (row.flagicon) {
+            css_class = (row.flagged ? 'flagged' : 'unflagged');
+            label = this.get_label(css_class);
+            $(row.flagicon).attr('class', css_class)
+                .attr({'aria-label': label, title: label});
+        }
+    };
+
+    // set message status
+    this.set_message_status = function(uid, flag, status)
+    {
+        var row = this.message_list.rows[uid];
+
+        if (!row)
+            return false;
+
+        if (flag == 'unread') {
+            if (row.unread != status)
+                this.update_thread_root(uid, status ? 'unread' : 'read');
+        }
+        else if (flag == 'flagged') {
+            this.update_thread_root(uid, status ? 'flagged' : 'unflagged');
+        }
+
+        if ($.inArray(flag, ['unread', 'deleted', 'replied', 'forwarded', 'flagged']) > -1)
+            row[flag] = status;
+    };
+
+    // set message row status, class and icon
+    this.set_message = function(uid, flag, status)
+    {
+        var row = this.message_list && this.message_list.rows[uid];
+
+        if (!row)
+            return false;
+
+        if (flag)
+            this.set_message_status(uid, flag, status);
+
+        if ($.inArray(flag, ['unread', 'deleted', 'flagged']) > -1)
+            $(row.obj)[row[flag] ? 'addClass' : 'removeClass'](flag);
+
+        this.set_unread_children(uid);
+        this.set_message_icon(uid);
+    };
+
+    // sets unroot (unread_children) class of parent row
+    this.set_unread_children = function(uid)
+    {
+        var row = this.message_list.rows[uid];
+
+        if (row.parent_uid)
+            return;
+
+        var enable = !row.unread && row.unread_children && !row.expanded;
+        $(row.obj)[enable ? 'addClass' : 'removeClass']('unroot');
+    };
+
+    // sets flaggedroot (flagged_children) class of parent row
+    this.set_flagged_children = function(uid)
+    {
+        var row = this.message_list.rows[uid];
+
+        if (row.parent_uid)
+            return;
+
+        var enable = row.flagged_children && !row.expanded;
+        $(row.obj)[enable ? 'addClass' : 'removeClass']('flaggedroot');
+    };
+
+    // copy selected messages to the specified mailbox
+    this.copy_messages = function(mbox, event, uids)
+    {
+        if (mbox && typeof mbox === 'object') {
+            if (mbox.uids) uids = mbox.uids;
+            mbox = mbox.id;
+        }
+        else if (!mbox) {
+            uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
+            return this.folder_selector(event, function(folder, obj) {
+                ref.command('copy', {id: folder, uids: uids}, obj, event, true);
+            });
+        }
+
+        // exit if current or no mailbox specified
+        if (!mbox || mbox == this.env.mailbox)
+            return;
+
+        var post_data = this.selection_post_data({_target_mbox: mbox, _uid: uids});
+
+        // exit if selection is empty
+        if (!post_data._uid)
+            return;
+
+        // send request to server
+        this.http_post('copy', post_data, this.display_message('copyingmessage', 'loading'));
+    };
+
+    // move selected messages to the specified mailbox
+    this.move_messages = function(mbox, event, uids)
+    {
+        if (mbox && typeof mbox === 'object') {
+            if (mbox.uids) uids = mbox.uids;
+            mbox = mbox.id;
+        }
+        else if (!mbox) {
+            uids = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
+            return this.folder_selector(event, function(folder, obj) {
+                ref.command('move', {id: folder, uids: uids}, obj, event, true);
+            });
+        }
+
+        // exit if current or no mailbox specified
+        if (!mbox || (mbox == this.env.mailbox && !this.is_multifolder_listing()))
+            return;
+
+        var lock = false, post_data = this.selection_post_data({_target_mbox: mbox, _uid: uids});
+
+        // exit if selection is empty
+        if (!post_data._uid)
+            return;
+
+        // show wait message
+        if (this.env.action == 'show')
+            lock = this.set_busy(true, 'movingmessage');
+
+        // Hide message command buttons until a message is selected
+        this.enable_command(this.env.message_commands, false);
+
+        this.with_selected_messages('move', post_data, lock);
+
+        if (this.env.action != 'show')
+            this.show_contentframe(false);
+    };
+
+    // delete selected messages from the current mailbox
+    this.delete_messages = function(event, uid)
+    {
+        var list = this.message_list, trash = this.env.trash_mailbox;
+
+        // if config is set to flag for deletion
+        if (this.env.flag_for_deletion) {
+            this.mark_message('delete', uid);
+            return false;
+        }
+        // if there isn't a defined trash mailbox or we are in it
+        else if (!trash || this.env.mailbox == trash)
+            this.permanently_remove_messages(uid);
+        // we're in Junk folder and delete_junk is enabled
+        else if (this.env.delete_junk && this.env.junk_mailbox && this.env.mailbox == this.env.junk_mailbox)
+            this.permanently_remove_messages(uid);
+        // if there is a trash mailbox defined and we're not currently in it
+        else {
+            // if shift was pressed delete it immediately
+            if ((list && list.modkey == SHIFT_KEY) || (event && rcube_event.get_modifier(event) == SHIFT_KEY)) {
+                this.confirm_dialog(this.get_label('deletemessagesconfirm'), 'delete', function() {
+                    ref.permanently_remove_messages(uid);
+                });
+            }
+            else
+                this.move_messages(trash, event, uid ? [uid] : null);
+        }
+
+        return true;
+    };
+
+    // delete the selected messages permanently
+    this.permanently_remove_messages = function(uid)
+    {
+        var post_data = this.selection_post_data(uid ? {_uid: uid} : null);
+
+        // exit if selection is empty
+        if (!post_data._uid)
+            return;
+
+        this.with_selected_messages('delete', post_data);
+        this.show_contentframe(false);
+    };
+
+    // Send a specific move/delete request with UIDs of all selected messages
+    this.with_selected_messages = function(action, post_data, lock, http_action)
+    {
+        var msg, count = 0,
+            remove = (action == 'delete' || !this.is_multifolder_listing());
+
+        // update the list (remove rows, clear selection)
+        if (this.message_list) {
+            var n, len, id, root, roots = [],
+                selection = post_data._uid,
+                display_next = this.check_display_next();
+
+            if (selection === '*')
+                selection = this.message_list.get_selection();
+            else if (!Array.isArray(selection))
+                selection = String(selection).split(',');
+
+            for (n=0, len=selection.length; n<len; n++) {
+                id = selection[n];
+
+                if (this.env.threading) {
+                    count += this.update_thread(id);
+                    root = this.message_list.find_root(id);
+                    if (root != id && $.inArray(root, roots) < 0) {
+                        roots.push(root);
+                    }
+                }
+
+                if (remove)
+                    this.message_list.remove_row(id, display_next && n == selection.length-1);
+            }
+
+            // make sure there are no selected rows
+            if (!display_next && remove)
+                this.message_list.clear_selection();
+
+            // update thread tree icons
+            for (n=0, len=roots.length; n<len; n++) {
+                this.add_tree_icons(roots[n]);
+            }
+        }
+
+        if (count < 0)
+            post_data._count = (count*-1);
+        // remove threads from the end of the list
+        else if (count > 0 && remove)
+            this.delete_excessive_thread_rows();
+
+        if (!remove)
+            post_data._refresh = 1;
+
+        if (!lock) {
+            msg = action == 'move' ? 'movingmessage' : 'deletingmessage';
+            lock = this.display_message(msg, 'loading');
+        }
+
+        // send request to server
+        this.http_post(http_action || action, post_data, lock);
+    };
+
+    // build post data for message delete/move/copy/flag requests
+    this.selection_post_data = function(data)
+    {
+        if (!data || typeof(data) != 'object')
+            data = {};
+
+        if (!data._uid)
+            data._uid = this.env.uid ? [this.env.uid] : this.message_list.get_selection();
+
+        data._mbox = this.env.mailbox;
+        data._uid = this.uids_to_list(data._uid);
+
+        if (this.env.action)
+            data._from = this.env.action;
+
+        // also send search request to get the right messages
+        if (this.env.search_request)
+            data._search = this.env.search_request;
+
+        if (this.env.display_next && this.env.next_uid)
+            data._next_uid = this.env.next_uid;
+
+        return data;
+    };
+
+    this.check_display_next = function()
+    {
+        return this.env.display_next && (this.preview_id || !this.env.contentframe);
+    };
+
+    // set a specific flag to one or more messages
+    this.mark_message = function(flag, uid)
+    {
+        var a_uids = [], r_uids = [], len, n, id,
+            list = this.message_list;
+
+        if (uid)
+            a_uids.push(uid);
+        else if (this.env.uid)
+            a_uids.push(this.env.uid);
+        else if (list)
+            a_uids = list.get_selection();
+
+        if (!list)
+            r_uids = a_uids;
+        else {
+            list.focus();
+            for (n=0, len=a_uids.length; n<len; n++) {
+                id = a_uids[n];
+                if ((flag == 'read' && list.rows[id].unread)
             || (flag == 'unread' && !list.rows[id].unread)
             || (flag == 'delete' && !list.rows[id].deleted)
             || (flag == 'undelete' && list.rows[id].deleted)
             || (flag == 'flagged' && !list.rows[id].flagged)
             || (flag == 'unflagged' && list.rows[id].flagged)
-        ) {
-          r_uids.push(id);
-        }
-      }
-    }
-
-    // nothing to do
-    if (!r_uids.length && !this.select_all_mode)
-      return;
-
-    switch (flag) {
-        case 'read':
-        case 'unread':
-          this.toggle_read_status(flag, r_uids);
-          break;
-        case 'delete':
-        case 'undelete':
-          this.toggle_delete_status(r_uids);
-          break;
-        case 'flagged':
-        case 'unflagged':
-          this.toggle_flagged_status(flag, a_uids);
-          break;
-    }
-  };
-
-  // set class to read/unread
-  this.toggle_read_status = function(flag, a_uids)
-  {
-    var i, len = a_uids.length,
-      post_data = this.selection_post_data({_uid: a_uids, _flag: flag}),
-      lock = this.display_message('markingmessage', 'loading');
-
-    // mark all message rows as read/unread
-    for (i=0; i<len; i++)
-      this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));
-
-    this.http_post('mark', post_data, lock);
-  };
-
-  // set image to flagged or unflagged
-  this.toggle_flagged_status = function(flag, a_uids)
-  {
-    var i, len = a_uids.length,
-      win = this.env.contentframe ? this.get_frame_window(this.env.contentframe) : window,
-      post_data = this.selection_post_data({_uid: a_uids, _flag: flag}),
-      lock = this.display_message('markingmessage', 'loading');
-
-    // mark all message rows as flagged/unflagged
-    for (i=0; i<len; i++)
-      this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));
-
-    if (this.env.action == 'show' || $.inArray(this.preview_id, a_uids) >= 0)
-      $(win.document.body)[flag == 'flagged' ? 'addClass' : 'removeClass']('status-flagged');
-
-    this.http_post('mark', post_data, lock);
-  };
-
-  // mark all message rows as deleted/undeleted
-  this.toggle_delete_status = function(a_uids)
-  {
-    var i, uid, all_deleted = true,
-      len = a_uids.length,
-      rows = this.message_list ? this.message_list.rows : {};
-
-    if (len == 1) {
-      if (!this.message_list || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
-        this.flag_as_deleted(a_uids);
-      else
-        this.flag_as_undeleted(a_uids);
-
-      return true;
-    }
-
-    for (i=0; i<len; i++) {
-      uid = a_uids[i];
-      if (rows[uid] && !rows[uid].deleted) {
-        all_deleted = false;
-        break;
-      }
-    }
-
-    if (all_deleted)
-      this.flag_as_undeleted(a_uids);
-    else
-      this.flag_as_deleted(a_uids);
-
-    return true;
-  };
-
-  this.flag_as_undeleted = function(a_uids)
-  {
-    var i, len = a_uids.length,
-      post_data = this.selection_post_data({_uid: a_uids, _flag: 'undelete'}),
-      lock = this.display_message('markingmessage', 'loading');
-
-    for (i=0; i<len; i++)
-      this.set_message(a_uids[i], 'deleted', false);
-
-    this.http_post('mark', post_data, lock);
-  };
-
-  this.flag_as_deleted = function(a_uids)
-  {
-    var r_uids = [],
-      post_data = this.selection_post_data({_uid: a_uids, _flag: 'delete'}),
-      lock = this.display_message('markingmessage', 'loading'),
-      list = this.message_list,
-      rows = list ? list.rows : {},
-      count = 0,
-      display_next = this.check_display_next();
-
-    for (var i=0, len=a_uids.length; i<len; i++) {
-      uid = a_uids[i];
-      if (rows[uid]) {
-        if (rows[uid].unread)
-          r_uids[r_uids.length] = uid;
-
-        if (this.env.skip_deleted) {
-          count += this.update_thread(uid);
-          list.remove_row(uid, display_next && i == list.get_selection(false).length-1);
-        }
-        else
-          this.set_message(uid, 'deleted', true);
-      }
-    }
-
-    // make sure there are no selected rows
-    if (this.env.skip_deleted && list) {
-      if (!display_next || !list.rowcount)
-        list.clear_selection();
-      if (count < 0)
-        post_data._count = (count*-1);
-      else if (count > 0)
-        // remove threads from the end of the list
-        this.delete_excessive_thread_rows();
-    }
-
-    // set of messages to mark as seen
-    if (r_uids.length)
-      post_data._ruid = this.uids_to_list(r_uids);
-
-    if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
-      post_data._next_uid = this.env.next_uid;
-
-    this.http_post('mark', post_data, lock);
-  };
-
-  // flag as read without mark request (called from backend)
-  // argument should be a coma-separated list of uids
-  this.flag_deleted_as_read = function(uids)
-  {
-    var uid, i, len,
-      rows = this.message_list ? this.message_list.rows : {};
-
-    if (typeof uids == 'string')
-      uids = uids.split(',');
-
-    for (i=0, len=uids.length; i<len; i++) {
-      uid = uids[i];
-      if (rows[uid])
-        this.set_message(uid, 'unread', false);
-    }
-  };
-
-  // Converts array of message UIDs to comma-separated list for use in URL
-  // with select_all mode checking
-  this.uids_to_list = function(uids)
-  {
-    if (this.select_all_mode)
-      return '*';
-
-    // multi-folder list of uids cannot be passed as a string (#6845)
-    if (Array.isArray(uids) && (uids.length == 1 || String(uids[0]).indexOf('-') == -1))
-      uids = uids.join(',');
-
-    return uids;
-  };
-
-  // Sets title of the delete button
-  this.set_button_titles = function()
-  {
-    var label = 'deletemessage';
-
-    if (!this.env.flag_for_deletion
-      && this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
-      && (!this.env.delete_junk || !this.env.junk_mailbox || this.env.mailbox != this.env.junk_mailbox)
-    )
-      label = 'movemessagetotrash';
-
-    this.set_alttext('delete', label);
-  };
-
-  // Initialize input element for list page jump
-  this.init_pagejumper = function(element)
-  {
-    $(element).addClass('rcpagejumper')
-      .on('focus', function(e) {
-        // create and display popup with page selection
-        var i, html = '';
-
-        for (i = 1; i <= ref.env.pagecount; i++)
-          html += '<li>' + i + '</li>';
-
-        html = '<ul class="toolbarmenu menu">' + html + '</ul>';
-
-        if (!ref.pagejump) {
-          ref.pagejump = $('<div id="pagejump-selector" class="popupmenu"></div>')
-            .appendTo(document.body)
-            .on('click', 'li', function() {
-              if (!ref.busy)
-                $(element).val($(this).text()).change();
-            });
-        }
-
-        if (ref.pagejump.data('count') != i)
-          ref.pagejump.html(html);
-
-        ref.pagejump.attr('rel', '#' + this.id).data('count', i);
-
-        // display page selector
-        ref.show_menu('pagejump-selector', true, e);
-      })
-      // keyboard navigation
-      .on('keydown keyup click', function(e) {
-        var current, selector = $('#pagejump-selector'),
-          ul = $('ul', selector),
-          list = $('li', ul),
-          height = ul.height(),
-          p = parseInt(this.value);
-
-        if (e.which != 27 && e.which != 9 && e.which != 13 && !selector.is(':visible'))
-          return ref.show_menu('pagejump-selector', true, e);
-
-        if (e.type == 'keydown') {
-          // arrow-down
-          if (e.which == 40) {
-            if (list.length > p)
-              this.value = (p += 1);
-          }
-          // arrow-up
-          else if (e.which == 38) {
-            if (p > 1 && list.length > p - 1)
-              this.value = (p -= 1);
-          }
-          // enter
-          else if (e.which == 13) {
-            return $(this).change();
-          }
-          // esc, tab
-          else if (e.which == 27 || e.which == 9) {
-            ref.hide_menu('pagejump-selector', e);
-            return $(element).val(ref.env.current_page);
-          }
-        }
-
-        $('li.selected', ul).removeClass('selected');
-
-        if ((current = $(list[p - 1])).length) {
-          current.addClass('selected');
-          $('#pagejump-selector').scrollTop(((ul.height() / list.length) * (p - 1)) - selector.height() / 2);
-        }
-      })
-      .on('change', function(e) {
-        // go to specified page
-        var p = parseInt(this.value);
-        if (p && p != ref.env.current_page && !ref.busy) {
-          ref.hide_menu('pagejump-selector', e);
-          ref.list_page(p);
-        }
-      });
-  };
-
-  // Update page-jumper state on list updates
-  this.update_pagejumper = function()
-  {
-    $('input.rcpagejumper').val(this.env.current_page).prop('disabled', this.env.pagecount < 2);
-  };
-
-  // check for mailvelope API
-  this.check_mailvelope = function(action)
-  {
-    if (window.mailvelope) {
-      this.mailvelope_load(action);
-    }
-    else {
-      $(window).on('mailvelope', function() {
-        ref.mailvelope_load(action);
-      });
-    }
-  };
-
-  // Load Mailvelope functionality (and initialize keyring if needed)
-  this.mailvelope_load = function(action)
-  {
-    var keyring = this.env.mailvelope_main_keyring ? undefined : this.env.user_id,
-      fn = function(kr) {
-        ref.mailvelope_keyring = kr;
-        ref.mailvelope_init(action, kr);
-      };
-
-    mailvelope.getVersion().then(function(v) {
-      mailvelope.VERSION = v;
-      mailvelope.VERSION_MAJOR = Math.floor(parseFloat(v));
-      return mailvelope.getKeyring(keyring);
-    }).then(fn, function(err) {
-      if (keyring) {
-        // attempt to create a new keyring for this app/user
-        mailvelope.createKeyring(keyring).then(fn, function(err) {
-          console.error(err);
-        });
-      } else {
-        console.error(err);
-      }
-    });
-  };
-
-  // Initializes Mailvelope editor or display container
-  this.mailvelope_init = function(action, keyring)
-  {
-    if (!window.mailvelope)
-      return;
-
-    if (action == 'show' || action == 'preview' || action == 'print') {
-      // decrypt text body
-      if (this.env.is_pgp_content) {
-        var data = $(this.env.is_pgp_content).text();
-        ref.mailvelope_display_container(this.env.is_pgp_content, data, keyring);
-      }
-      // load pgp/mime message and pass it to the mailvelope display container
-      else if (this.env.pgp_mime_part) {
-        var msgid = this.display_message('loadingdata', 'loading'),
-          selector = this.env.pgp_mime_container;
-
-        $.ajax({
-          type: 'GET',
-          url: this.url('get', { '_mbox': this.env.mailbox, '_uid': this.env.uid, '_part': this.env.pgp_mime_part }),
-          error: function(o, status, err) {
-            ref.http_error(o, status, err, msgid);
-          },
-          success: function(data) {
-            ref.mailvelope_display_container(selector, data, keyring, msgid);
-          }
-        });
-      }
-    }
-    else if (action == 'compose') {
-      this.env.compose_commands.push('compose-encrypted');
-
-      var sign_supported = mailvelope.VERSION_MAJOR >= 2;
-      var is_html = $('[name="_is_html"]').val() > 0;
-
-      if (sign_supported)
-        this.env.compose_commands.push('compose-encrypted-signed');
-
-      if (this.env.pgp_mime_message) {
-        // fetch PGP/Mime part and open load into Mailvelope editor
-        var lock = this.set_busy(true, this.get_label('loadingdata'));
-
-        $.ajax({
-          type: 'GET',
-          url: this.url('get', this.env.pgp_mime_message),
-          error: function(o, status, err) {
-            ref.http_error(o, status, err, lock);
-            ref.enable_command('compose-encrypted', !is_html);
-            if (sign_supported)
-              ref.enable_command('compose-encrypted-signed', !is_html);
-          },
-          success: function(data) {
-            ref.set_busy(false, null, lock);
-
-            if (is_html) {
-              ref.command('toggle-editor', {html: false, noconvert: true});
-              $('#' + ref.env.composebody).val('');
+                ) {
+                    r_uids.push(id);
+                }
             }
-
-            ref.compose_encrypted({ quotedMail: data });
-            ref.enable_command('compose-encrypted', true);
-            ref.enable_command('compose-encrypted-signed', false);
-          }
-        });
-      }
-      else {
-        // enable encrypted compose toggle
-        this.enable_command('compose-encrypted', !is_html);
-        if (sign_supported)
-          this.enable_command('compose-encrypted-signed', !is_html);
-      }
-
-      // make sure to disable encryption button after toggling editor into HTML mode
-      this.addEventListener('actionafter', function(args) {
-        if (args.ret && args.action == 'toggle-editor') {
-          ref.enable_command('compose-encrypted', !args.props.html);
-        if (sign_supported)
-          ref.enable_command('compose-encrypted-signed', !args.props.html);
-        }
-      });
-    } else if (action == 'edit-identity') {
-      ref.mailvelope_identity_keygen();
-    }
-  };
-
-  // handler for the 'compose-encrypted-signed' command
-  this.compose_encrypted_signed = function(props)
-  {
-    props = props || {};
-    props.signMsg = true;
-    this.compose_encrypted(props);
-  };
-
-  // handler for the 'compose-encrypted' command
-  this.compose_encrypted = function(props)
-  {
-    var options, container = $('#' + this.env.composebody).parent();
-
-    // remove Mailvelope editor if active
-    if (ref.mailvelope_editor) {
-      ref.mailvelope_editor = null;
-      ref.set_button('compose-encrypted', 'act');
-
-      container.removeClass('mailvelope').find('iframe:not([aria-hidden=true])').remove();
-      $('#' + ref.env.composebody).show();
-      $("[name='_pgpmime']").remove();
-
-      // re-enable commands that operate on the compose body
-      ref.enable_command('toggle-editor', 'insert-response', true);
-      ref.enable_command('spellcheck', !!window.googie);
-      ref.enable_command('insert-sig', !!(ref.env.signatures && ref.env.identity && ref.env.signatures[ref.env.identity]));
-
-      ref.triggerEvent('compose-encrypted', { active:false });
-    }
-    // embed Mailvelope editor container
-    else {
-      if (this.spellcheck_state())
-        this.editor.spellcheck_stop();
-
-      if (props.quotedMail) {
-        options = { quotedMail: props.quotedMail, quotedMailIndent: false };
-      }
-      else {
-        options = { predefinedText: $('#' + this.env.composebody).val() };
-      }
-
-      if (props.signMsg) {
-        options.signMsg = props.signMsg;
-      }
-
-      if (this.env.compose_mode == 'reply') {
-        options.quotedMailIndent = true;
-        options.quotedMailHeader = this.env.compose_reply_header;
-      }
-
-      mailvelope.createEditorContainer('#' + container.attr('id'), ref.mailvelope_keyring, options).then(function(editor) {
-        ref.mailvelope_editor = editor;
-        ref.set_button('compose-encrypted', 'sel');
-
-        container.addClass('mailvelope');
-        $('#' + ref.env.composebody).hide();
-
-        // disable commands that operate on the compose body
-        ref.enable_command('spellcheck', 'insert-sig', 'toggle-editor', 'insert-response', false);
-        ref.triggerEvent('compose-encrypted', { active:true });
-
-        if (!$.isEmptyObject(ref.env.attachments)) {
-          // notify user if losing attachments
-          if (ref.env.compose_mode != 'draft'
-            || Object.keys(ref.env.attachments).length != 1
-            || ref.env.attachments[Object.keys(ref.env.attachments)[0]].name != 'encrypted.asc'
-          ) {
-            ref.alert_dialog(ref.get_label('encryptnoattachments'));
-          }
-
-          $.each(ref.env.attachments, function(name, attach) {
-            ref.remove_from_attachment_list(name);
-          });
-        }
-      }, function(err) {
-        console.error(err);
-        console.log(options);
-      });
-    }
-  };
-
-  // callback to replace the message body with the full armored
-  this.mailvelope_submit_messageform = function(draft, saveonly)
-  {
-    // get recipients
-    var recipients = [];
-    $.each(['to', 'cc', 'bcc'], function(i,field) {
-      var pos, rcpt, val = $('[name="_' + field + '"]').val().trim();
-      while (val.length && rcube_check_email(val, true)) {
-        rcpt = RegExp.$2.replace(/^<+/, '').replace(/>+$/, '');
-        recipients.push(rcpt);
-        val = val.substr(val.indexOf(rcpt) + rcpt.length + 1).replace(/^\s*,\s*/, '');
-      }
-    });
-
-    // check if we have keys for all recipients
-    var isvalid = recipients.length > 0;
-    ref.mailvelope_keyring.validKeyForAddress(recipients).then(function(status) {
-      var missing_keys = [];
-      $.each(status, function(k,v) {
-        if (v === false) {
-          isvalid = false;
-          missing_keys.push(k);
-        }
-      });
-
-      // list recipients with missing keys
-      if (!isvalid && missing_keys.length) {
-        // display dialog with missing keys
-        ref.simple_dialog(
-          ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')) +
-            '<p>' + ref.get_label('searchpubkeyservers') + '</p>',
-          'encryptedsendialog',
-          function() {
-            ref.mailvelope_search_pubkeys(missing_keys, function() {
-              return true; // close dialog
-            });
-          },
-          {button: 'search'}
-        );
-        return false;
-      }
-
-      if (!isvalid) {
-        if (!recipients.length) {
-          ref.alert_dialog(ref.get_label('norecipientwarning'), function() {
-            $("[name='_to']").focus();
-          });
-        }
-        return false;
-      }
-
-      // add sender identity to recipients to be able to decrypt our very own message
-      var senders = [], selected_sender = ref.env.identities[$("[name='_from'] option:selected").val()];
-      $.each(ref.env.identities, function(k, sender) {
-        senders.push(sender.email);
-      });
-
-      ref.mailvelope_keyring.validKeyForAddress(senders).then(function(status) {
-        valid_sender = null;
-        $.each(status, function(k,v) {
-          if (v !== false) {
-            valid_sender = k;
-            if (valid_sender == selected_sender) {
-              return false;  // break
-            }
-          }
-        });
-
-        if (!valid_sender) {
-          if (!confirm(ref.get_label('nopubkeyforsender'))) {
-            return false;
-          }
         }
 
-        recipients.push(valid_sender);
+        // nothing to do
+        if (!r_uids.length && !this.select_all_mode)
+            return;
 
-        ref.mailvelope_editor.encrypt(recipients).then(function(armored) {
-          // all checks passed, send message
-          var form = ref.gui_objects.messageform,
-            hidden = $("[name='_pgpmime']", form),
-            msgid = ref.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage');
-
-          form.target = ref.get_save_target(msgid);
-          form._draft.value = draft ? '1' : '';
-          form.action = ref.add_url(form.action, '_unlock', msgid);
-          form.action = ref.add_url(form.action, '_framed', 1);
-
-          if (saveonly) {
-            form.action = ref.add_url(form.action, '_saveonly', 1);
-          }
-
-          // send pgp content via hidden field
-          if (!hidden.length) {
-            hidden = $('<input type="hidden" name="_pgpmime">').appendTo(form);
-          }
-          hidden.val(armored);
-
-          form.submit();
-
-        }, function(err) {
-          console.log(err);
-        });  // mailvelope_editor.encrypt()
-
-      }, function(err) {
-        console.error(err);
-      });  // mailvelope_keyring.validKeyForAddress(senders)
-
-    }, function(err) {
-      console.error(err);
-    });  // mailvelope_keyring.validKeyForAddress(recipients)
-
-    return false;
-  };
-
-  // wrapper for the mailvelope.createDisplayContainer API call
-  this.mailvelope_display_container = function(selector, data, keyring, msgid)
-  {
-    var error_handler = function(error) {
-      // remove mailvelope frame with the error message
-      $(selector + ' > iframe').remove();
-      ref.hide_message(msgid);
-      ref.display_message(error.message, 'error');
+        switch (flag) {
+            case 'read':
+            case 'unread':
+                this.toggle_read_status(flag, r_uids);
+                break;
+            case 'delete':
+            case 'undelete':
+                this.toggle_delete_status(r_uids);
+                break;
+            case 'flagged':
+            case 'unflagged':
+                this.toggle_flagged_status(flag, a_uids);
+                break;
+        }
     };
 
-    mailvelope.createDisplayContainer(selector, data, keyring, { senderAddress: this.env.sender }).then(function(status) {
-      if (status.error && status.error.message) {
-        return error_handler(status.error);
-      }
+    // set class to read/unread
+    this.toggle_read_status = function(flag, a_uids)
+    {
+        var i, len = a_uids.length,
+            post_data = this.selection_post_data({_uid: a_uids, _flag: flag}),
+            lock = this.display_message('markingmessage', 'loading');
 
-      ref.hide_message(msgid);
-      $(selector).children().not('iframe').hide();
-      $(ref.gui_objects.messagebody).addClass('mailvelope');
+        // mark all message rows as read/unread
+        for (i=0; i<len; i++)
+            this.set_message(a_uids[i], 'unread', (flag == 'unread' ? true : false));
 
-      // on success we can remove encrypted part from the attachments list
-      if (ref.env.pgp_mime_part)
-        $('#attach' + ref.env.pgp_mime_part).remove();
+        this.http_post('mark', post_data, lock);
+    };
 
-      setTimeout(function() { $(window).resize(); }, 10);
-    }, error_handler);
-  };
+    // set image to flagged or unflagged
+    this.toggle_flagged_status = function(flag, a_uids)
+    {
+        var i, len = a_uids.length,
+            win = this.env.contentframe ? this.get_frame_window(this.env.contentframe) : window,
+            post_data = this.selection_post_data({_uid: a_uids, _flag: flag}),
+            lock = this.display_message('markingmessage', 'loading');
 
-  // subroutine to query keyservers for public keys
-  this.mailvelope_search_pubkeys = function(emails, resolve, import_handler)
-  {
-    // query with publickey.js
-    var deferred = [],
-      pk = new PublicKey(this.env.keyservers),
-      lock = ref.display_message('', 'loading');
+        // mark all message rows as flagged/unflagged
+        for (i=0; i<len; i++)
+            this.set_message(a_uids[i], 'flagged', (flag == 'flagged' ? true : false));
 
-    $.each(emails, function(i, email) {
-      var d = $.Deferred();
-      pk.search(email, function(results, errorCode) {
-        if (errorCode !== null) {
-          // rejecting would make all fail
-          // d.reject(email);
-          d.resolve([email]);
+        if (this.env.action == 'show' || $.inArray(this.preview_id, a_uids) >= 0)
+            $(win.document.body)[flag == 'flagged' ? 'addClass' : 'removeClass']('status-flagged');
+
+        this.http_post('mark', post_data, lock);
+    };
+
+    // mark all message rows as deleted/undeleted
+    this.toggle_delete_status = function(a_uids)
+    {
+        var i, uid, all_deleted = true,
+            len = a_uids.length,
+            rows = this.message_list ? this.message_list.rows : {};
+
+        if (len == 1) {
+            if (!this.message_list || (rows[a_uids[0]] && !rows[a_uids[0]].deleted))
+                this.flag_as_deleted(a_uids);
+            else
+                this.flag_as_undeleted(a_uids);
+
+            return true;
+        }
+
+        for (i=0; i<len; i++) {
+            uid = a_uids[i];
+            if (rows[uid] && !rows[uid].deleted) {
+                all_deleted = false;
+                break;
+            }
+        }
+
+        if (all_deleted)
+            this.flag_as_undeleted(a_uids);
+        else
+            this.flag_as_deleted(a_uids);
+
+        return true;
+    };
+
+    this.flag_as_undeleted = function(a_uids)
+    {
+        var i, len = a_uids.length,
+            post_data = this.selection_post_data({_uid: a_uids, _flag: 'undelete'}),
+            lock = this.display_message('markingmessage', 'loading');
+
+        for (i=0; i<len; i++)
+            this.set_message(a_uids[i], 'deleted', false);
+
+        this.http_post('mark', post_data, lock);
+    };
+
+    this.flag_as_deleted = function(a_uids)
+    {
+        var r_uids = [],
+            post_data = this.selection_post_data({_uid: a_uids, _flag: 'delete'}),
+            lock = this.display_message('markingmessage', 'loading'),
+            list = this.message_list,
+            rows = list ? list.rows : {},
+            count = 0,
+            display_next = this.check_display_next();
+
+        for (var i=0, len=a_uids.length; i<len; i++) {
+            uid = a_uids[i];
+            if (rows[uid]) {
+                if (rows[uid].unread)
+                    r_uids[r_uids.length] = uid;
+
+                if (this.env.skip_deleted) {
+                    count += this.update_thread(uid);
+                    list.remove_row(uid, display_next && i == list.get_selection(false).length-1);
+                }
+                else
+                    this.set_message(uid, 'deleted', true);
+            }
+        }
+
+        // make sure there are no selected rows
+        if (this.env.skip_deleted && list) {
+            if (!display_next || !list.rowcount)
+                list.clear_selection();
+            if (count < 0)
+                post_data._count = (count*-1);
+            else if (count > 0)
+            // remove threads from the end of the list
+                this.delete_excessive_thread_rows();
+        }
+
+        // set of messages to mark as seen
+        if (r_uids.length)
+            post_data._ruid = this.uids_to_list(r_uids);
+
+        if (this.env.skip_deleted && this.env.display_next && this.env.next_uid)
+            post_data._next_uid = this.env.next_uid;
+
+        this.http_post('mark', post_data, lock);
+    };
+
+    // flag as read without mark request (called from backend)
+    // argument should be a coma-separated list of uids
+    this.flag_deleted_as_read = function(uids)
+    {
+        var uid, i, len,
+            rows = this.message_list ? this.message_list.rows : {};
+
+        if (typeof uids == 'string')
+            uids = uids.split(',');
+
+        for (i=0, len=uids.length; i<len; i++) {
+            uid = uids[i];
+            if (rows[uid])
+                this.set_message(uid, 'unread', false);
+        }
+    };
+
+    // Converts array of message UIDs to comma-separated list for use in URL
+    // with select_all mode checking
+    this.uids_to_list = function(uids)
+    {
+        if (this.select_all_mode)
+            return '*';
+
+        // multi-folder list of uids cannot be passed as a string (#6845)
+        if (Array.isArray(uids) && (uids.length == 1 || String(uids[0]).indexOf('-') == -1))
+            uids = uids.join(',');
+
+        return uids;
+    };
+
+    // Sets title of the delete button
+    this.set_button_titles = function()
+    {
+        var label = 'deletemessage';
+
+        if (!this.env.flag_for_deletion
+      && this.env.trash_mailbox && this.env.mailbox != this.env.trash_mailbox
+      && (!this.env.delete_junk || !this.env.junk_mailbox || this.env.mailbox != this.env.junk_mailbox)
+        )
+            label = 'movemessagetotrash';
+
+        this.set_alttext('delete', label);
+    };
+
+    // Initialize input element for list page jump
+    this.init_pagejumper = function(element)
+    {
+        $(element).addClass('rcpagejumper')
+            .on('focus', function(e) {
+                // create and display popup with page selection
+                var i, html = '';
+
+                for (i = 1; i <= ref.env.pagecount; i++)
+                    html += '<li>' + i + '</li>';
+
+                html = '<ul class="toolbarmenu menu">' + html + '</ul>';
+
+                if (!ref.pagejump) {
+                    ref.pagejump = $('<div id="pagejump-selector" class="popupmenu"></div>')
+                        .appendTo(document.body)
+                        .on('click', 'li', function() {
+                            if (!ref.busy)
+                                $(element).val($(this).text()).change();
+                        });
+                }
+
+                if (ref.pagejump.data('count') != i)
+                    ref.pagejump.html(html);
+
+                ref.pagejump.attr('rel', '#' + this.id).data('count', i);
+
+                // display page selector
+                ref.show_menu('pagejump-selector', true, e);
+            })
+        // keyboard navigation
+            .on('keydown keyup click', function(e) {
+                var current, selector = $('#pagejump-selector'),
+                    ul = $('ul', selector),
+                    list = $('li', ul),
+                    height = ul.height(),
+                    p = parseInt(this.value);
+
+                if (e.which != 27 && e.which != 9 && e.which != 13 && !selector.is(':visible'))
+                    return ref.show_menu('pagejump-selector', true, e);
+
+                if (e.type == 'keydown') {
+                    // arrow-down
+                    if (e.which == 40) {
+                        if (list.length > p)
+                            this.value = (p += 1);
+                    }
+                    // arrow-up
+                    else if (e.which == 38) {
+                        if (p > 1 && list.length > p - 1)
+                            this.value = (p -= 1);
+                    }
+                    // enter
+                    else if (e.which == 13) {
+                        return $(this).change();
+                    }
+                    // esc, tab
+                    else if (e.which == 27 || e.which == 9) {
+                        ref.hide_menu('pagejump-selector', e);
+                        return $(element).val(ref.env.current_page);
+                    }
+                }
+
+                $('li.selected', ul).removeClass('selected');
+
+                if ((current = $(list[p - 1])).length) {
+                    current.addClass('selected');
+                    $('#pagejump-selector').scrollTop(((ul.height() / list.length) * (p - 1)) - selector.height() / 2);
+                }
+            })
+            .on('change', function(e) {
+                // go to specified page
+                var p = parseInt(this.value);
+                if (p && p != ref.env.current_page && !ref.busy) {
+                    ref.hide_menu('pagejump-selector', e);
+                    ref.list_page(p);
+                }
+            });
+    };
+
+    // Update page-jumper state on list updates
+    this.update_pagejumper = function()
+    {
+        $('input.rcpagejumper').val(this.env.current_page).prop('disabled', this.env.pagecount < 2);
+    };
+
+    // check for mailvelope API
+    this.check_mailvelope = function(action)
+    {
+        if (window.mailvelope) {
+            this.mailvelope_load(action);
         }
         else {
-          d.resolve([email].concat(results));
+            $(window).on('mailvelope', function() {
+                ref.mailvelope_load(action);
+            });
         }
-      });
-      deferred.push(d);
-    });
+    };
 
-    $.when.apply($, deferred).then(function() {
-      var missing_keys = [],
-        key_selection = [];
+    // Load Mailvelope functionality (and initialize keyring if needed)
+    this.mailvelope_load = function(action)
+    {
+        var keyring = this.env.mailvelope_main_keyring ? undefined : this.env.user_id,
+            fn = function(kr) {
+                ref.mailvelope_keyring = kr;
+                ref.mailvelope_init(action, kr);
+            };
 
-      // analyze results of all queries
-      $.each(arguments, function(i, result) {
-        var email = result.shift();
-        if (!result.length) {
-          missing_keys.push(email);
-        }
-        else {
-          key_selection = key_selection.concat(result);
-        }
-      });
+        mailvelope.getVersion().then(function(v) {
+            mailvelope.VERSION = v;
+            mailvelope.VERSION_MAJOR = Math.floor(parseFloat(v));
+            return mailvelope.getKeyring(keyring);
+        }).then(fn, function(err) {
+            if (keyring) {
+                // attempt to create a new keyring for this app/user
+                mailvelope.createKeyring(keyring).then(fn, function(err) {
+                    console.error(err);
+                });
+            } else {
+                console.error(err);
+            }
+        });
+    };
 
-      ref.hide_message(lock);
-      resolve(true);
-
-      // show key import dialog
-      if (key_selection.length) {
-        ref.mailvelope_key_import_dialog(key_selection, import_handler);
-      }
-      // some keys could not be found
-      if (missing_keys.length) {
-        ref.display_message(ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')), 'warning');
-      }
-    }).fail(function() {
-      console.error('Pubkey lookup failed with', arguments);
-      ref.hide_message(lock);
-      ref.display_message('pubkeysearcherror', 'error');
-      resolve(false);
-    });
-  };
-
-  // list the given public keys in a dialog with options to import
-  // them into the local Mailvelope keyring
-  this.mailvelope_key_import_dialog = function(candidates, import_handler)
-  {
-    var ul = $('<div>').addClass('listing pgpkeyimport');
-
-    $.each(candidates, function(i, keyrec) {
-      var li = $('<div>').addClass('key');
-
-      if (keyrec.revoked)  li.addClass('revoked');
-      if (keyrec.disabled) li.addClass('disabled');
-      if (keyrec.expired)  li.addClass('expired');
-
-      li.append($('<label>').addClass('keyid').text(ref.get_label('keyid')));
-      li.append($('<a>').text(keyrec.keyid.substr(-8).toUpperCase())
-        .attr({href: keyrec.info, target: '_blank', tabindex: '-1'}));
-
-      li.append($('<label>').addClass('keylen').text(ref.get_label('keylength')));
-      li.append($('<span>').text(keyrec.keylen));
-
-      if (keyrec.expirationdate) {
-        li.append($('<label>').addClass('keyexpired').text(ref.get_label('keyexpired')));
-        li.append($('<span>').text(new Date(keyrec.expirationdate * 1000).toDateString()));
-      }
-
-      if (keyrec.revoked) {
-        li.append($('<span>').addClass('keyrevoked').text(ref.get_label('keyrevoked')));
-      }
-
-      var ul_ = $('<ul>').addClass('uids');
-      $.each(keyrec.uids, function(j, uid) {
-        var li_ = $('<li>').addClass('uid');
-        if (uid.revoked)  li_.addClass('revoked');
-        if (uid.disabled) li_.addClass('disabled');
-        if (uid.expired)  li_.addClass('expired');
-
-        ul_.append(li_.text(uid.uid));
-      });
-
-      li.append(ul_);
-      li.append($('<button>')
-        .attr('rel', keyrec.keyid)
-        .text(ref.get_label('import'))
-        .addClass('button import importkey')
-        .prop('disabled', keyrec.revoked || keyrec.disabled || keyrec.expired));
-
-      ul.append(li);
-    });
-
-    // display dialog with missing keys
-    ref.simple_dialog(
-      $('<div>')
-        .append($('<p>').html(ref.get_label('encryptpubkeysfound')))
-        .append(ul),
-      'importpubkeys',
-      null,
-      {cancel_label: 'close', cancel_button: 'close'}
-    );
-
-    // delegate handler for import button clicks
-    ul.on('click', 'button.importkey', function() {
-      var btn = $(this),
-        keyid = btn.attr('rel'),
-        pk = new PublicKey(ref.env.keyservers),
-        lock = ref.display_message('', 'loading');
-
-        // fetch from keyserver and import to Mailvelope keyring
-        pk.get(keyid, function(armored, errorCode) {
-          ref.hide_message(lock);
-
-          if (errorCode) {
-            ref.display_message('keyservererror', 'error');
+    // Initializes Mailvelope editor or display container
+    this.mailvelope_init = function(action, keyring)
+    {
+        if (!window.mailvelope)
             return;
-          }
 
-          if (import_handler) {
-            import_handler(armored);
-            return;
-          }
+        if (action == 'show' || action == 'preview' || action == 'print') {
+            // decrypt text body
+            if (this.env.is_pgp_content) {
+                var data = $(this.env.is_pgp_content).text();
+                ref.mailvelope_display_container(this.env.is_pgp_content, data, keyring);
+            }
+            // load pgp/mime message and pass it to the mailvelope display container
+            else if (this.env.pgp_mime_part) {
+                var msgid = this.display_message('loadingdata', 'loading'),
+                    selector = this.env.pgp_mime_container;
 
-          // import to keyring
-          ref.mailvelope_keyring.importPublicKey(armored).then(function(status) {
-            if (status === 'REJECTED') {
-              // ref.alert_dialog(ref.get_label('Key import was rejected'));
+                $.ajax({
+                    type: 'GET',
+                    url: this.url('get', { '_mbox': this.env.mailbox, '_uid': this.env.uid, '_part': this.env.pgp_mime_part }),
+                    error: function(o, status, err) {
+                        ref.http_error(o, status, err, msgid);
+                    },
+                    success: function(data) {
+                        ref.mailvelope_display_container(selector, data, keyring, msgid);
+                    }
+                });
+            }
+        }
+        else if (action == 'compose') {
+            this.env.compose_commands.push('compose-encrypted');
+
+            var sign_supported = mailvelope.VERSION_MAJOR >= 2;
+            var is_html = $('[name="_is_html"]').val() > 0;
+
+            if (sign_supported)
+                this.env.compose_commands.push('compose-encrypted-signed');
+
+            if (this.env.pgp_mime_message) {
+                // fetch PGP/Mime part and open load into Mailvelope editor
+                var lock = this.set_busy(true, this.get_label('loadingdata'));
+
+                $.ajax({
+                    type: 'GET',
+                    url: this.url('get', this.env.pgp_mime_message),
+                    error: function(o, status, err) {
+                        ref.http_error(o, status, err, lock);
+                        ref.enable_command('compose-encrypted', !is_html);
+                        if (sign_supported)
+                            ref.enable_command('compose-encrypted-signed', !is_html);
+                    },
+                    success: function(data) {
+                        ref.set_busy(false, null, lock);
+
+                        if (is_html) {
+                            ref.command('toggle-editor', {html: false, noconvert: true});
+                            $('#' + ref.env.composebody).val('');
+                        }
+
+                        ref.compose_encrypted({ quotedMail: data });
+                        ref.enable_command('compose-encrypted', true);
+                        ref.enable_command('compose-encrypted-signed', false);
+                    }
+                });
             }
             else {
-              var $key = keyid.substr(-8).toUpperCase();
-              btn.closest('.key').fadeOut();
-              ref.display_message(ref.get_label('keyimportsuccess').replace('$key', $key), 'confirmation');
+                // enable encrypted compose toggle
+                this.enable_command('compose-encrypted', !is_html);
+                if (sign_supported)
+                    this.enable_command('compose-encrypted-signed', !is_html);
             }
-          }, function(err) {
-            console.log(err);
-          });
-        });
-    });
-  };
 
-  // enable key management for identity
-  this.mailvelope_identity_keygen = function()
-  {
-    var container = $(this.gui_objects.editform).find('.identity-encryption').first();
-    var identity_email = $(this.gui_objects.editform).find('.ff_email').val().trim();
-
-    if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
-      return;
-
-    var key_fingerprint;
-    this.mailvelope_keyring.validKeyForAddress([identity_email])
-      .then(function(keys) {
-        var private_keys = [];
-
-        if (keys && keys[identity_email] && Array.isArray(keys[identity_email].keys)) {
-          var checks = [];
-          for (var j=0; j < keys[identity_email].keys.length; j++) {
-            checks.push((function(key) {
-              return ref.mailvelope_keyring.hasPrivateKey(key.fingerprint)
-                .then(function(found) {
-                  if (found) {
-                    private_keys.push(key);
-                  }
-                });
-            })(keys[identity_email].keys[j]));
-          }
-          return Promise.all(checks)
-            .then(function() {
-              return private_keys;
-            });
-        }
-
-        return private_keys;
-      }).then(function(private_keys) {
-        var content = container.find('.identity-encryption-block').empty();
-        if (private_keys && private_keys.length) {
-          // show private key information
-          $('<p>').text(ref.get_label('encryptionprivkeysinmailvelope').replace('$nr', private_keys.length)).appendTo(content);
-          var ul = $('<ul>').addClass('keylist').appendTo(content);
-          $.each(private_keys, function(i, key) {
-            $('<li>').appendTo(ul)
-              .append($('<strong>').addClass('fingerprint').text(String(key.fingerprint).toUpperCase()))
-              .append($('<span>').addClass('identity').text('<' + identity_email + '> '));
-          });
-        } else {
-          $('<p>').text(ref.get_label('encryptionnoprivkeysinmailvelope')).appendTo(content);
-        }
-
-        // show button to create a new key
-        $('<button>')
-          .attr('type', 'button')
-          .addClass('button create')
-          .text(ref.get_label('encryptioncreatekey'))
-          .appendTo(content)
-          .on('click', function() { ref.mailvelope_show_keygen_container(content, identity_email); });
-        $('<span>').addClass('space').html('&nbsp;').appendTo(content);
-        $('<button>')
-          .attr('type', 'button')
-          .addClass('button settings')
-          .text(ref.get_label('openmailvelopesettings'))
-          .appendTo(content)
-          .on('click', function() { ref.mailvelope_keyring.openSettings(); });
-
-        container.show();
-        ref.triggerEvent('identity-encryption-show', { container: container });
-      })
-      .catch(function(err) {
-        console.error('Mailvelope keyring error', err);
-      })
-  };
-
-  // start pgp key generation using Mailvelope
-  this.mailvelope_show_keygen_container = function(container, identity_email)
-  {
-    var cid = new Date().getTime();
-    var user_id = {email: identity_email, fullName: $(ref.gui_objects.editform).find('.ff_name').val().trim()};
-    var options = {userIds: [user_id], keySize: this.env.mailvelope_keysize};
-
-    $('<div>').attr('id', 'mailvelope-keygen-container-' + cid)
-      .css({height: '245px', marginBottom: '10px'})
-      .appendTo(container.empty());
-
-    this.mailvelope_keyring.createKeyGenContainer('#mailvelope-keygen-container-' + cid, options)
-      .then(function(generator) {
-        if (generator instanceof Error) {
-          throw generator;
-        }
-
-        // append button to start key generation
-        $('<button>')
-          .attr('type', 'button')
-          .addClass('button mainaction generate')
-          .text(ref.get_label('generate'))
-          .appendTo(container)
-          .on('click', function() {
-            var btn = $(this).prop('disabled', true);
-            generator.generate()
-              .then(function(result) {
-                if (typeof result === 'string' && result.indexOf('BEGIN PGP') > 0) {
-                  ref.display_message(ref.get_label('keypaircreatesuccess').replace('$identity', identity_email), 'confirmation');
-                  // reset keygen view
-                  ref.mailvelope_identity_keygen();
+            // make sure to disable encryption button after toggling editor into HTML mode
+            this.addEventListener('actionafter', function(args) {
+                if (args.ret && args.action == 'toggle-editor') {
+                    ref.enable_command('compose-encrypted', !args.props.html);
+                    if (sign_supported)
+                        ref.enable_command('compose-encrypted-signed', !args.props.html);
                 }
-              })
-              .catch(function(err) {
-                debugger;
-                ref.display_message(err.message || 'errortitle', 'error');
-                btn.prop('disabled', false);
             });
-          });
-
-        $('<span>').addClass('space').html('&nbsp;').appendTo(container);
-
-        $('<button>')
-          .attr('type', 'button')
-          .addClass('button cancel')
-          .text(ref.get_label('cancel'))
-          .appendTo(container)
-          .on('click', function() { ref.mailvelope_identity_keygen(); });
-
-        ref.triggerEvent('identity-encryption-update', { container: container });
-      })
-      .catch(function(err) {
-        ref.display_message('errortitle', 'error');
-        // start over
-        ref.mailvelope_identity_keygen();
-      });
-  };
-
-  this.mdn_request_dialog = function(uid, mailbox)
-  {
-    var props = {
-        action: 'mark',
-        data: { _uid: uid, _mbox: mailbox, _flag: 'mdnsent' }
-      },
-      buttons = [
-        {
-          text: this.get_label('send'),
-          'class': 'mainaction send',
-          click: function(e, ui, dialog) {
-            props.action = 'sendmdn';
-            (ref.is_framed() ? parent.$ : $)(dialog || this).dialog('close');
-          }
-        },
-        {
-          text: this.get_label('ignore'),
-          'class': 'cancel',
-          click: function(e, ui, dialog) {
-            (ref.is_framed() ? parent.$ : $)(dialog || this).dialog('close');
-          }
+        } else if (action == 'edit-identity') {
+            ref.mailvelope_identity_keygen();
         }
-      ],
-      mdn_func = function(event, ui) {
-        ref.http_post(props.action, props.data);
-        // from default close function
-        $(this).remove();
-      };
+    };
 
-    if (this.env.mdn_request_save) {
-      buttons.unshift({
-        text: this.get_label('sendalwaysto').replace('$email', this.env.mdn_request_sender.mailto),
-        'class': 'mainaction send',
-        click: function(e, ui, dialog) {
-          props.data._save = ref.env.mdn_request_save;
-          props.data._address = ref.env.mdn_request_sender.string;
-          $(e.target).next().click();
+    // handler for the 'compose-encrypted-signed' command
+    this.compose_encrypted_signed = function(props)
+    {
+        props = props || {};
+        props.signMsg = true;
+        this.compose_encrypted(props);
+    };
+
+    // handler for the 'compose-encrypted' command
+    this.compose_encrypted = function(props)
+    {
+        var options, container = $('#' + this.env.composebody).parent();
+
+        // remove Mailvelope editor if active
+        if (ref.mailvelope_editor) {
+            ref.mailvelope_editor = null;
+            ref.set_button('compose-encrypted', 'act');
+
+            container.removeClass('mailvelope').find('iframe:not([aria-hidden=true])').remove();
+            $('#' + ref.env.composebody).show();
+            $("[name='_pgpmime']").remove();
+
+            // re-enable commands that operate on the compose body
+            ref.enable_command('toggle-editor', 'insert-response', true);
+            ref.enable_command('spellcheck', !!window.googie);
+            ref.enable_command('insert-sig', !!(ref.env.signatures && ref.env.identity && ref.env.signatures[ref.env.identity]));
+
+            ref.triggerEvent('compose-encrypted', { active:false });
         }
-      });
-    }
+        // embed Mailvelope editor container
+        else {
+            if (this.spellcheck_state())
+                this.editor.spellcheck_stop();
 
-    this.show_popup_dialog(this.get_label('mdnrequest'), this.get_label('sendreceipt'), buttons, { close: mdn_func });
-  };
+            if (props.quotedMail) {
+                options = { quotedMail: props.quotedMail, quotedMailIndent: false };
+            }
+            else {
+                options = { predefinedText: $('#' + this.env.composebody).val() };
+            }
+
+            if (props.signMsg) {
+                options.signMsg = props.signMsg;
+            }
+
+            if (this.env.compose_mode == 'reply') {
+                options.quotedMailIndent = true;
+                options.quotedMailHeader = this.env.compose_reply_header;
+            }
+
+            mailvelope.createEditorContainer('#' + container.attr('id'), ref.mailvelope_keyring, options).then(function(editor) {
+                ref.mailvelope_editor = editor;
+                ref.set_button('compose-encrypted', 'sel');
+
+                container.addClass('mailvelope');
+                $('#' + ref.env.composebody).hide();
+
+                // disable commands that operate on the compose body
+                ref.enable_command('spellcheck', 'insert-sig', 'toggle-editor', 'insert-response', false);
+                ref.triggerEvent('compose-encrypted', { active:true });
+
+                if (!$.isEmptyObject(ref.env.attachments)) {
+                    // notify user if losing attachments
+                    if (ref.env.compose_mode != 'draft'
+            || Object.keys(ref.env.attachments).length != 1
+            || ref.env.attachments[Object.keys(ref.env.attachments)[0]].name != 'encrypted.asc'
+                    ) {
+                        ref.alert_dialog(ref.get_label('encryptnoattachments'));
+                    }
+
+                    $.each(ref.env.attachments, function(name, attach) {
+                        ref.remove_from_attachment_list(name);
+                    });
+                }
+            }, function(err) {
+                console.error(err);
+                console.log(options);
+            });
+        }
+    };
+
+    // callback to replace the message body with the full armored
+    this.mailvelope_submit_messageform = function(draft, saveonly)
+    {
+    // get recipients
+        var recipients = [];
+        $.each(['to', 'cc', 'bcc'], function(i, field) {
+            var pos, rcpt, val = $('[name="_' + field + '"]').val().trim();
+            while (val.length && rcube_check_email(val, true)) {
+                rcpt = RegExp.$2.replace(/^<+/, '').replace(/>+$/, '');
+                recipients.push(rcpt);
+                val = val.substr(val.indexOf(rcpt) + rcpt.length + 1).replace(/^\s*,\s*/, '');
+            }
+        });
+
+        // check if we have keys for all recipients
+        var isvalid = recipients.length > 0;
+        ref.mailvelope_keyring.validKeyForAddress(recipients).then(function(status) {
+            var missing_keys = [];
+            $.each(status, function(k, v) {
+                if (v === false) {
+                    isvalid = false;
+                    missing_keys.push(k);
+                }
+            });
+
+            // list recipients with missing keys
+            if (!isvalid && missing_keys.length) {
+                // display dialog with missing keys
+                ref.simple_dialog(
+                    ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')) +
+            '<p>' + ref.get_label('searchpubkeyservers') + '</p>',
+                    'encryptedsendialog',
+                    function() {
+                        ref.mailvelope_search_pubkeys(missing_keys, function() {
+                            return true; // close dialog
+                        });
+                    },
+                    {button: 'search'}
+                );
+                return false;
+            }
+
+            if (!isvalid) {
+                if (!recipients.length) {
+                    ref.alert_dialog(ref.get_label('norecipientwarning'), function() {
+                        $("[name='_to']").focus();
+                    });
+                }
+                return false;
+            }
+
+            // add sender identity to recipients to be able to decrypt our very own message
+            var senders = [], selected_sender = ref.env.identities[$("[name='_from'] option:selected").val()];
+            $.each(ref.env.identities, function(k, sender) {
+                senders.push(sender.email);
+            });
+
+            ref.mailvelope_keyring.validKeyForAddress(senders).then(function(status) {
+                valid_sender = null;
+                $.each(status, function(k, v) {
+                    if (v !== false) {
+                        valid_sender = k;
+                        if (valid_sender == selected_sender) {
+                            return false;  // break
+                        }
+                    }
+                });
+
+                if (!valid_sender) {
+                    if (!confirm(ref.get_label('nopubkeyforsender'))) {
+                        return false;
+                    }
+                }
+
+                recipients.push(valid_sender);
+
+                ref.mailvelope_editor.encrypt(recipients).then(function(armored) {
+                    // all checks passed, send message
+                    var form = ref.gui_objects.messageform,
+                        hidden = $("[name='_pgpmime']", form),
+                        msgid = ref.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage');
+
+                    form.target = ref.get_save_target(msgid);
+                    form._draft.value = draft ? '1' : '';
+                    form.action = ref.add_url(form.action, '_unlock', msgid);
+                    form.action = ref.add_url(form.action, '_framed', 1);
+
+                    if (saveonly) {
+                        form.action = ref.add_url(form.action, '_saveonly', 1);
+                    }
+
+                    // send pgp content via hidden field
+                    if (!hidden.length) {
+                        hidden = $('<input type="hidden" name="_pgpmime">').appendTo(form);
+                    }
+                    hidden.val(armored);
+
+                    form.submit();
+
+                }, function(err) {
+                    console.log(err);
+                });  // mailvelope_editor.encrypt()
+
+            }, function(err) {
+                console.error(err);
+            });  // mailvelope_keyring.validKeyForAddress(senders)
+
+        }, function(err) {
+            console.error(err);
+        });  // mailvelope_keyring.validKeyForAddress(recipients)
+
+        return false;
+    };
+
+    // wrapper for the mailvelope.createDisplayContainer API call
+    this.mailvelope_display_container = function(selector, data, keyring, msgid)
+    {
+        var error_handler = function(error) {
+            // remove mailvelope frame with the error message
+            $(selector + ' > iframe').remove();
+            ref.hide_message(msgid);
+            ref.display_message(error.message, 'error');
+        };
+
+        mailvelope.createDisplayContainer(selector, data, keyring, { senderAddress: this.env.sender }).then(function(status) {
+            if (status.error && status.error.message) {
+                return error_handler(status.error);
+            }
+
+            ref.hide_message(msgid);
+            $(selector).children().not('iframe').hide();
+            $(ref.gui_objects.messagebody).addClass('mailvelope');
+
+            // on success we can remove encrypted part from the attachments list
+            if (ref.env.pgp_mime_part)
+                $('#attach' + ref.env.pgp_mime_part).remove();
+
+            setTimeout(function() { $(window).resize(); }, 10);
+        }, error_handler);
+    };
+
+    // subroutine to query keyservers for public keys
+    this.mailvelope_search_pubkeys = function(emails, resolve, import_handler)
+    {
+    // query with publickey.js
+        var deferred = [],
+            pk = new PublicKey(this.env.keyservers),
+            lock = ref.display_message('', 'loading');
+
+        $.each(emails, function(i, email) {
+            var d = $.Deferred();
+            pk.search(email, function(results, errorCode) {
+                if (errorCode !== null) {
+                    // rejecting would make all fail
+                    // d.reject(email);
+                    d.resolve([email]);
+                }
+                else {
+                    d.resolve([email].concat(results));
+                }
+            });
+            deferred.push(d);
+        });
+
+        $.when.apply($, deferred).then(function() {
+            var missing_keys = [],
+                key_selection = [];
+
+            // analyze results of all queries
+            $.each(arguments, function(i, result) {
+                var email = result.shift();
+                if (!result.length) {
+                    missing_keys.push(email);
+                }
+                else {
+                    key_selection = key_selection.concat(result);
+                }
+            });
+
+            ref.hide_message(lock);
+            resolve(true);
+
+            // show key import dialog
+            if (key_selection.length) {
+                ref.mailvelope_key_import_dialog(key_selection, import_handler);
+            }
+            // some keys could not be found
+            if (missing_keys.length) {
+                ref.display_message(ref.get_label('nopubkeyfor').replace('$email', missing_keys.join(', ')), 'warning');
+            }
+        }).fail(function() {
+            console.error('Pubkey lookup failed with', arguments);
+            ref.hide_message(lock);
+            ref.display_message('pubkeysearcherror', 'error');
+            resolve(false);
+        });
+    };
+
+    // list the given public keys in a dialog with options to import
+    // them into the local Mailvelope keyring
+    this.mailvelope_key_import_dialog = function(candidates, import_handler)
+    {
+        var ul = $('<div>').addClass('listing pgpkeyimport');
+
+        $.each(candidates, function(i, keyrec) {
+            var li = $('<div>').addClass('key');
+
+            if (keyrec.revoked)  li.addClass('revoked');
+            if (keyrec.disabled) li.addClass('disabled');
+            if (keyrec.expired)  li.addClass('expired');
+
+            li.append($('<label>').addClass('keyid').text(ref.get_label('keyid')));
+            li.append($('<a>').text(keyrec.keyid.substr(-8).toUpperCase())
+                .attr({href: keyrec.info, target: '_blank', tabindex: '-1'}));
+
+            li.append($('<label>').addClass('keylen').text(ref.get_label('keylength')));
+            li.append($('<span>').text(keyrec.keylen));
+
+            if (keyrec.expirationdate) {
+                li.append($('<label>').addClass('keyexpired').text(ref.get_label('keyexpired')));
+                li.append($('<span>').text(new Date(keyrec.expirationdate * 1000).toDateString()));
+            }
+
+            if (keyrec.revoked) {
+                li.append($('<span>').addClass('keyrevoked').text(ref.get_label('keyrevoked')));
+            }
+
+            var ul_ = $('<ul>').addClass('uids');
+            $.each(keyrec.uids, function(j, uid) {
+                var li_ = $('<li>').addClass('uid');
+                if (uid.revoked)  li_.addClass('revoked');
+                if (uid.disabled) li_.addClass('disabled');
+                if (uid.expired)  li_.addClass('expired');
+
+                ul_.append(li_.text(uid.uid));
+            });
+
+            li.append(ul_);
+            li.append($('<button>')
+                .attr('rel', keyrec.keyid)
+                .text(ref.get_label('import'))
+                .addClass('button import importkey')
+                .prop('disabled', keyrec.revoked || keyrec.disabled || keyrec.expired));
+
+            ul.append(li);
+        });
+
+        // display dialog with missing keys
+        ref.simple_dialog(
+            $('<div>')
+                .append($('<p>').html(ref.get_label('encryptpubkeysfound')))
+                .append(ul),
+            'importpubkeys',
+            null,
+            {cancel_label: 'close', cancel_button: 'close'}
+        );
+
+        // delegate handler for import button clicks
+        ul.on('click', 'button.importkey', function() {
+            var btn = $(this),
+                keyid = btn.attr('rel'),
+                pk = new PublicKey(ref.env.keyservers),
+                lock = ref.display_message('', 'loading');
+
+            // fetch from keyserver and import to Mailvelope keyring
+            pk.get(keyid, function(armored, errorCode) {
+                ref.hide_message(lock);
+
+                if (errorCode) {
+                    ref.display_message('keyservererror', 'error');
+                    return;
+                }
+
+                if (import_handler) {
+                    import_handler(armored);
+                    return;
+                }
+
+                // import to keyring
+                ref.mailvelope_keyring.importPublicKey(armored).then(function(status) {
+                    if (status === 'REJECTED') {
+                        // ref.alert_dialog(ref.get_label('Key import was rejected'));
+                    }
+                    else {
+                        var $key = keyid.substr(-8).toUpperCase();
+                        btn.closest('.key').fadeOut();
+                        ref.display_message(ref.get_label('keyimportsuccess').replace('$key', $key), 'confirmation');
+                    }
+                }, function(err) {
+                    console.log(err);
+                });
+            });
+        });
+    };
+
+    // enable key management for identity
+    this.mailvelope_identity_keygen = function()
+    {
+        var container = $(this.gui_objects.editform).find('.identity-encryption').first();
+        var identity_email = $(this.gui_objects.editform).find('.ff_email').val().trim();
+
+        if (!container.length || !identity_email || !this.mailvelope_keyring.createKeyGenContainer)
+            return;
+
+        var key_fingerprint;
+        this.mailvelope_keyring.validKeyForAddress([identity_email])
+            .then(function(keys) {
+                var private_keys = [];
+
+                if (keys && keys[identity_email] && Array.isArray(keys[identity_email].keys)) {
+                    var checks = [];
+                    for (var j=0; j < keys[identity_email].keys.length; j++) {
+                        checks.push((function(key) {
+                            return ref.mailvelope_keyring.hasPrivateKey(key.fingerprint)
+                                .then(function(found) {
+                                    if (found) {
+                                        private_keys.push(key);
+                                    }
+                                });
+                        })(keys[identity_email].keys[j]));
+                    }
+                    return Promise.all(checks)
+                        .then(function() {
+                            return private_keys;
+                        });
+                }
+
+                return private_keys;
+            }).then(function(private_keys) {
+                var content = container.find('.identity-encryption-block').empty();
+                if (private_keys && private_keys.length) {
+                    // show private key information
+                    $('<p>').text(ref.get_label('encryptionprivkeysinmailvelope').replace('$nr', private_keys.length)).appendTo(content);
+                    var ul = $('<ul>').addClass('keylist').appendTo(content);
+                    $.each(private_keys, function(i, key) {
+                        $('<li>').appendTo(ul)
+                            .append($('<strong>').addClass('fingerprint').text(String(key.fingerprint).toUpperCase()))
+                            .append($('<span>').addClass('identity').text('<' + identity_email + '> '));
+                    });
+                } else {
+                    $('<p>').text(ref.get_label('encryptionnoprivkeysinmailvelope')).appendTo(content);
+                }
+
+                // show button to create a new key
+                $('<button>')
+                    .attr('type', 'button')
+                    .addClass('button create')
+                    .text(ref.get_label('encryptioncreatekey'))
+                    .appendTo(content)
+                    .on('click', function() { ref.mailvelope_show_keygen_container(content, identity_email); });
+                $('<span>').addClass('space').html('&nbsp;').appendTo(content);
+                $('<button>')
+                    .attr('type', 'button')
+                    .addClass('button settings')
+                    .text(ref.get_label('openmailvelopesettings'))
+                    .appendTo(content)
+                    .on('click', function() { ref.mailvelope_keyring.openSettings(); });
+
+                container.show();
+                ref.triggerEvent('identity-encryption-show', { container: container });
+            })
+            .catch(function(err) {
+                console.error('Mailvelope keyring error', err);
+            });
+    };
+
+    // start pgp key generation using Mailvelope
+    this.mailvelope_show_keygen_container = function(container, identity_email)
+    {
+        var cid = new Date().getTime();
+        var user_id = {email: identity_email, fullName: $(ref.gui_objects.editform).find('.ff_name').val().trim()};
+        var options = {userIds: [user_id], keySize: this.env.mailvelope_keysize};
+
+        $('<div>').attr('id', 'mailvelope-keygen-container-' + cid)
+            .css({height: '245px', marginBottom: '10px'})
+            .appendTo(container.empty());
+
+        this.mailvelope_keyring.createKeyGenContainer('#mailvelope-keygen-container-' + cid, options)
+            .then(function(generator) {
+                if (generator instanceof Error) {
+                    throw generator;
+                }
+
+                // append button to start key generation
+                $('<button>')
+                    .attr('type', 'button')
+                    .addClass('button mainaction generate')
+                    .text(ref.get_label('generate'))
+                    .appendTo(container)
+                    .on('click', function() {
+                        var btn = $(this).prop('disabled', true);
+                        generator.generate()
+                            .then(function(result) {
+                                if (typeof result === 'string' && result.indexOf('BEGIN PGP') > 0) {
+                                    ref.display_message(ref.get_label('keypaircreatesuccess').replace('$identity', identity_email), 'confirmation');
+                                    // reset keygen view
+                                    ref.mailvelope_identity_keygen();
+                                }
+                            })
+                            .catch(function(err) {
+                                debugger;
+                                ref.display_message(err.message || 'errortitle', 'error');
+                                btn.prop('disabled', false);
+                            });
+                    });
+
+                $('<span>').addClass('space').html('&nbsp;').appendTo(container);
+
+                $('<button>')
+                    .attr('type', 'button')
+                    .addClass('button cancel')
+                    .text(ref.get_label('cancel'))
+                    .appendTo(container)
+                    .on('click', function() { ref.mailvelope_identity_keygen(); });
+
+                ref.triggerEvent('identity-encryption-update', { container: container });
+            })
+            .catch(function(err) {
+                ref.display_message('errortitle', 'error');
+                // start over
+                ref.mailvelope_identity_keygen();
+            });
+    };
+
+    this.mdn_request_dialog = function(uid, mailbox)
+    {
+        var props = {
+                action: 'mark',
+                data: { _uid: uid, _mbox: mailbox, _flag: 'mdnsent' }
+            },
+            buttons = [
+                {
+                    text: this.get_label('send'),
+                    'class': 'mainaction send',
+                    click: function(e, ui, dialog) {
+                        props.action = 'sendmdn';
+                        (ref.is_framed() ? parent.$ : $)(dialog || this).dialog('close');
+                    }
+                },
+                {
+                    text: this.get_label('ignore'),
+                    'class': 'cancel',
+                    click: function(e, ui, dialog) {
+                        (ref.is_framed() ? parent.$ : $)(dialog || this).dialog('close');
+                    }
+                }
+            ],
+            mdn_func = function(event, ui) {
+                ref.http_post(props.action, props.data);
+                // from default close function
+                $(this).remove();
+            };
+
+        if (this.env.mdn_request_save) {
+            buttons.unshift({
+                text: this.get_label('sendalwaysto').replace('$email', this.env.mdn_request_sender.mailto),
+                'class': 'mainaction send',
+                click: function(e, ui, dialog) {
+                    props.data._save = ref.env.mdn_request_save;
+                    props.data._address = ref.env.mdn_request_sender.string;
+                    $(e.target).next().click();
+                }
+            });
+        }
+
+        this.show_popup_dialog(this.get_label('mdnrequest'), this.get_label('sendreceipt'), buttons, { close: mdn_func });
+    };
 
 
-  /*********************************************************/
-  /*********       mailbox folders methods         *********/
-  /*********************************************************/
+    /*********************************************************/
+    /*********       mailbox folders methods         *********/
+    /*********************************************************/
 
-  this.expunge_mailbox = function(mbox)
-  {
-    var lock, post_data = {_mbox: mbox};
-
-    // lock interface if it's the active mailbox
-    if (mbox == this.env.mailbox) {
-      lock = this.set_busy(true, 'loading');
-      post_data._reload = 1;
-      if (this.env.search_request)
-        post_data._search = this.env.search_request;
-    }
-
-    // send request to server
-    this.http_post('expunge', post_data, lock);
-  };
-
-  this.purge_mailbox = function(mbox)
-  {
-    this.confirm_dialog(this.get_label('purgefolderconfirm'), 'delete', function() {
+    this.expunge_mailbox = function(mbox)
+    {
         var lock, post_data = {_mbox: mbox};
 
         // lock interface if it's the active mailbox
-        if (mbox == ref.env.mailbox) {
-           lock = ref.set_busy(true, 'loading');
-           post_data._reload = 1;
+        if (mbox == this.env.mailbox) {
+            lock = this.set_busy(true, 'loading');
+            post_data._reload = 1;
+            if (this.env.search_request)
+                post_data._search = this.env.search_request;
         }
 
         // send request to server
-        ref.http_post('purge', post_data, lock);
-      });
-
-    return false;
-  };
-
-  // Mark all messages as read in:
-  //   - selected folder (mode=cur)
-  //   - selected folder and its subfolders (mode=sub)
-  //   - all folders (mode=all)
-  this.mark_all_read = function(mbox, mode)
-  {
-    var state, content, nodes = [],
-      list = this.message_list,
-      folder = mbox || this.env.mailbox,
-      post_data = {_uid: '*', _flag: 'read', _mbox: folder, _folders: mode};
-
-    if (typeof mode != 'string') {
-      state = this.mark_all_read_state(folder);
-      if (!state)
-        return;
-
-      if (state > 1) {
-        // build content of the dialog
-        $.each({cur: 1, sub: 2, all: 4}, function(i, v) {
-          var id = 'readallmode' + i,
-            label = $('<label>').attr('for', id).text(ref.get_label('folders-' + i)),
-            input = $('<input>').attr({type: 'radio', value: i, name: 'mode', id: id, disabled: !(state & v)});
-
-          nodes.push($('<li>').append([input, label]));
-        });
-
-        content = $('<ul class="proplist">').append(nodes);
-        $('input:not([disabled])', content).first().attr('checked', true);
-
-        this.simple_dialog(content, 'markallread',
-          function() {
-            ref.mark_all_read(folder, $('input:checked', content).val());
-            return true;
-          },
-          {button: 'mark', button_class: 'save'}
-        );
-
-        return;
-      }
-
-      post_data._folders = 'cur'; // only current folder has unread messages
-    }
-
-    // mark messages on the list
-    $.each(list ? list.rows : [], function(uid, row) {
-      if (!row.unread)
-        return;
-
-      var mbox = ref.env.messages[uid].mbox;
-      if (mode == 'all' || mbox == ref.env.mailbox
-          || (mode == 'sub' && mbox.startsWith(ref.env.mailbox + ref.env.delimiter))
-      ) {
-        ref.set_message(uid, 'unread', false);
-      }
-    });
-
-    // send the request
-    this.http_post('mark', post_data, this.display_message('markingmessage', 'loading'));
-  };
-
-  // Enable/disable mark-all-read action depending on folders state
-  this.mark_all_read_state = function(mbox)
-  {
-    var state = 0,
-      li = this.treelist.get_item(mbox || this.env.mailbox),
-      folder_item = $(li).is('.unread') ? 1 : 0,
-      subfolder_items = $('li.unread', li).length,
-      all_items = $('li.unread', ref.gui_objects.folderlist).length;
-
-    state += folder_item;
-    state += subfolder_items ? 2 : 0;
-    state += all_items > folder_item + subfolder_items ? 4 : 0;
-
-    this.enable_command('mark-all-read', state > 0);
-
-    return state;
-  };
-
-  // Display "bounce message" dialog
-  this.bounce = function(props, obj, event)
-  {
-    // get message uid and folder
-    var uid = this.get_single_uid(),
-      url = this.url('bounce', {_framed: 1, _uid: uid, _mbox: this.get_message_mailbox(uid)}),
-      dialog = $('<iframe>').attr('src', url),
-      get_form = function() {
-        var rc = $('iframe', dialog)[0].contentWindow.rcmail;
-        return {rc: rc, form: rc.gui_objects.messageform};
-      },
-      post_func = function() {
-        var post = {}, form = get_form();
-
-        $.each($(form.form).serializeArray(), function() { post[this.name] = this.value; });
-
-        post._uid = form.rc.env.uid;
-        post._mbox = form.rc.env.mailbox;
-        delete post._action;
-        delete post._task;
-
-        if (post._to || post._cc || post._bcc) {
-          ref.http_post('bounce', post, ref.set_busy(true, 'sendingmessage'));
-          dialog.dialog('close');
-        }
-      },
-      submit_func = function() {
-        var form = get_form();
-
-        if (typeof form.form != 'object')
-          return false;
-
-        if (!form.rc.check_compose_address_fields(post_func, form.form))
-          return false;
-
-        return post_func();
-      };
-
-    this.hide_menu('forwardmenu', event);
-
-    dialog = this.simple_dialog(dialog, 'bouncemsg', submit_func, {
-      button: 'bounce',
-      width: 400,
-      height: 300
-    });
-
-    return true;
-  };
-
-
-  /*********************************************************/
-  /*********        message compose methods        *********/
-  /*********************************************************/
-
-  this.open_compose_step = function(p)
-  {
-    var url = this.url('mail/compose', p);
-
-    // open new compose window
-    if (this.env.compose_extwin && !this.env.extwin) {
-      this.open_window(url);
-    }
-    else {
-      this.redirect(url);
-      if (this.env.extwin)
-        window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
-    }
-  };
-
-  // init message compose form: set focus and eventhandlers
-  this.init_messageform = function()
-  {
-    if (!this.gui_objects.messageform)
-      return false;
-
-    var elem, pos,
-      input_from = $("[name='_from']"),
-      input_to = $("[name='_to']"),
-      input_subject = $("[name='_subject']"),
-      input_message = $("[name='_message']").get(0),
-      html_mode = $("[name='_is_html']").val() == '1',
-      opener_rc = this.opener();
-
-    // close compose step in opener
-    if (opener_rc && opener_rc.env.action == 'compose') {
-      setTimeout(function() {
-        if (opener.history.length > 1)
-          opener.history.back();
-        else
-          opener_rc.redirect(opener_rc.get_task_url('mail'));
-      }, 100);
-      this.env.opened_extwin = true;
-    }
-
-    if (!html_mode) {
-      // On Back button Chrome will overwrite textarea with old content
-      // causing e.g. the same signature is added twice (#5809)
-      if (input_message.value && input_message.defaultValue !== undefined)
-        input_message.value = input_message.defaultValue;
-
-      pos = this.env.top_posting && this.env.compose_mode ? 0 : input_message.value.length;
-
-      // add signature according to selected identity
-      // if we have HTML editor, signature is added in a callback
-      if (input_from.prop('type') == 'select-one') {
-        // for some reason the caret initially is not at pos=0 in Firefox 51 (#5628)
-        this.set_caret_pos(input_message, 0);
-        this.change_identity(input_from[0]);
-      }
-
-      // set initial cursor position
-      this.set_caret_pos(input_message, pos);
-
-      // scroll to the bottom of the textarea (#1490114)
-      if (pos) {
-        $(input_message).scrollTop(input_message.scrollHeight);
-      }
-    }
-
-    // check for locally stored compose data
-    if (this.env.save_localstorage)
-      this.compose_restore_dialog(0, html_mode)
-
-    if (input_to.val() == '')
-      elem = input_to;
-    else if (input_subject.val() == '')
-      elem = input_subject;
-    else if (input_message)
-      elem = input_message;
-
-    this.env.compose_focus_elem = this.init_messageform_inputs(elem);
-
-    // get summary of all field values
-    this.compose_field_hash(true);
-
-    // start the auto-save timer
-    this.auto_save_start();
-  };
-
-  // init autocomplete events on compose form inputs
-  this.init_messageform_inputs = function(focused)
-  {
-    var i,
-      input_to = $("[name='_to']"),
-      ac_fields = ['cc', 'bcc', 'replyto', 'followupto'];
-
-    // init live search events
-    this.init_address_input_events(input_to);
-    for (i in ac_fields) {
-      this.init_address_input_events($("[name='_"+ac_fields[i]+"']"));
-    }
-
-    if (!focused)
-      focused = input_to;
-
-    // focus first empty element (and return it)
-    return $(focused).focus().get(0);
-  };
-
-  this.compose_restore_dialog = function(j, html_mode)
-  {
-    var i, key, formdata, index = this.local_storage_get_item('compose.index', []);
-
-    var show_next = function(i) {
-      if (++i < index.length)
-        ref.compose_restore_dialog(i, html_mode)
-    }
-
-    for (i = j || 0; i < index.length; i++) {
-      key = index[i];
-      formdata = this.local_storage_get_item('compose.' + key, null, true);
-      if (!formdata) {
-        continue;
-      }
-      // restore saved copy of current compose_id
-      if (formdata.changed && key == this.env.compose_id) {
-        this.restore_compose_form(key, html_mode);
-        break;
-      }
-      // skip records from 'other' drafts
-      if (this.env.draft_id && formdata.draft_id && formdata.draft_id != this.env.draft_id) {
-        continue;
-      }
-      // skip records on reply
-      if (this.env.reply_msgid && formdata.reply_msgid != this.env.reply_msgid) {
-        continue;
-      }
-      // show dialog asking to restore the message
-      if (formdata.changed && formdata.session != this.env.session_id) {
-        this.show_popup_dialog(
-          this.get_label('restoresavedcomposedata')
-            .replace('$date', new Date(formdata.changed).toLocaleString())
-            .replace('$subject', formdata._subject)
-            .replace(/\n/g, '<br/>'),
-          this.get_label('restoremessage'),
-          [{
-            text: this.get_label('restore'),
-            'class': 'mainaction restore',
-            click: function(){
-              ref.restore_compose_form(key, html_mode);
-              ref.remove_compose_data(key);  // remove old copy
-              ref.save_compose_form_local();  // save under current compose_id
-              $(this).dialog('close');
-            }
-          },
-          {
-            text: this.get_label('delete'),
-            'class': 'delete',
-            click: function(){
-              ref.remove_compose_data(key);
-              $(this).dialog('close');
-              show_next(i);
-            }
-          },
-          {
-            text: this.get_label('ignore'),
-            'class': 'cancel',
-            click: function(){
-              $(this).dialog('close');
-              show_next(i);
-            }
-          }]
-        );
-        break;
-      }
-    }
-  }
-
-  this.init_address_input_events = function(obj, props)
-  {
-    // configure parallel autocompletion
-    if (!props && this.env.autocomplete_threads > 0) {
-      props = {
-        threads: this.env.autocomplete_threads,
-        sources: this.env.autocomplete_sources
-      };
-    }
-
-    obj.keydown(function(e) { return ref.ksearch_keydown(e, this, props); })
-      .attr({autocomplete: 'off', 'aria-autocomplete': 'list', 'aria-expanded': 'false', role: 'combobox'});
-
-    var callback = function(e) {
-      if (ref.ksearch_pane && e.target === ref.ksearch_pane.get(0)) {
-        return;
-      }
-      ref.ksearch_hide();
+        this.http_post('expunge', post_data, lock);
     };
 
-    // hide the popup on any click
-    $(document).on('click', callback);
-    // and on scroll (that cannot be jQuery.on())
-    document.addEventListener('scroll', callback, true);
-  };
+    this.purge_mailbox = function(mbox)
+    {
+        this.confirm_dialog(this.get_label('purgefolderconfirm'), 'delete', function() {
+            var lock, post_data = {_mbox: mbox};
 
-  this.submit_messageform = function(draft, saveonly)
-  {
-    var form = this.gui_objects.messageform;
-
-    if (!form)
-      return;
-
-    // the message has been sent but not saved, ask the user what to do
-    if (!saveonly && this.env.is_sent) {
-      return this.simple_dialog(this.get_label('messageissent'), '', // TODO: dialog title
-        function() {
-          ref.submit_messageform(false, true);
-          return true;
-        }
-      );
-    }
-
-    // delegate sending to Mailvelope routine
-    if (this.mailvelope_editor) {
-      return this.mailvelope_submit_messageform(draft, saveonly);
-    }
-
-    // all checks passed, send message
-    var msgid = this.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage'),
-      lang = this.spellcheck_lang(),
-      files = [];
-
-    // send files list
-    $('li', this.gui_objects.attachmentlist).each(function() { files.push(this.id.replace(/^rcmfile/, '')); });
-    $('[name="_attachments"]', form).val(files.join());
-
-    form.target = this.get_save_target(msgid);
-    form._draft.value = draft ? '1' : '';
-    form.action = this.add_url(form.action, '_unlock', msgid);
-    form.action = this.add_url(form.action, '_framed', 1);
-
-    if (lang)
-        form.action = this.add_url(form.action, '_lang', lang);
-    if (saveonly)
-      form.action = this.add_url(form.action, '_saveonly', 1);
-
-    // register timer to notify about connection timeout
-    this.submit_timer = setTimeout(function() {
-      ref.set_busy(false, null, msgid);
-      ref.display_message('requesttimedout', 'error');
-    }, this.env.request_timeout * 1000);
-
-    form.submit();
-  };
-
-  this.compose_recipient_select = function(list)
-  {
-    var id, n, recipients = 0, selection = list.get_selection();
-    for (n=0; n < selection.length; n++) {
-      id = selection[n];
-      if (this.env.contactdata[id])
-        recipients++;
-    }
-    this.enable_command('add-recipient', recipients);
-  };
-
-  this.compose_add_recipient = function(field)
-  {
-    // find last focused field name
-    if (!field) {
-      field = $(this.env.focused_field).filter(':visible');
-      field = field.length ? field.attr('id').replace('_', '') : 'to';
-    }
-
-    var recipients = [], input = $('#_' + field), selection = this.contact_list.get_selection();
-
-    if (this.contact_list && selection.length) {
-      var data, name, n, id;
-      for (n = 0; n < selection.length; n++) {
-        if ((id = selection[n]) && (data = this.env.contactdata[id])) {
-          name = data.name || data
-
-          // group is added, expand it
-          if (id.charAt(0) == 'E' && input.length) {
-            // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
-            name = '\u200b' + name + '\u200b';
-            var gid = id.substr(1);
-            this.group2expand[gid] = {name: name, input: input.get(0)};
-            this.http_request('group-expand', {_source: data.source || this.env.source, _gid: gid}, false);
-          }
-
-          recipients.push(name);
-        }
-      }
-    }
-
-    if (recipients.length && input.length) {
-      var oldval = input.val();
-      if (oldval && !/[,;]\s*$/.test(oldval))
-        oldval += ', ';
-      input.val(oldval + recipients.join(', ') + ', ').change();
-      this.triggerEvent('add-recipient', { field:field, recipients:recipients });
-    }
-
-    return recipients.length;
-  };
-
-  // checks the input fields before sending a message
-  this.check_compose_input = function(cmd)
-  {
-    var key,
-      input_subject = $("[name='_subject']");
-
-    // check if all files has been uploaded
-    for (key in this.env.attachments) {
-      if (typeof this.env.attachments[key] === 'object' && !this.env.attachments[key].complete) {
-        this.alert_dialog(this.get_label('notuploadedwarning'));
-        return false;
-      }
-    }
-
-    // display localized warning for missing subject
-    if (!this.env.nosubject_warned && input_subject.val() == '') {
-      var dialog,
-        prompt_value = $('<input>').attr({type: 'text', size: 40, 'data-submit': 'true'}),
-        myprompt = $('<div class="prompt">')
-          .append($('<p class="message">').text(this.get_label('nosubjectwarning')))
-          .append(prompt_value),
-        save_func = function() {
-          input_subject.val(prompt_value.val());
-          dialog.dialog('close');
-          if (ref.check_compose_input(cmd))
-            ref.command(cmd, { nocheck:true });  // repeat command which triggered this
-        };
-
-      dialog = this.show_popup_dialog(
-        myprompt,
-        this.get_label('nosubjecttitle'),
-        [{
-            text: this.get_label('sendmessage'),
-            'class': 'mainaction send',
-            click: function() { save_func(); }
-          }, {
-            text: this.get_label('cancel'),
-            'class': 'cancel',
-            click: function() {
-              input_subject.focus();
-              dialog.dialog('close');
+            // lock interface if it's the active mailbox
+            if (mbox == ref.env.mailbox) {
+                lock = ref.set_busy(true, 'loading');
+                post_data._reload = 1;
             }
-          }],
-        {dialogClass: 'warning'}
-      );
 
-      this.env.nosubject_warned = true;
-      return false;
-    }
-
-    // check for empty body (only possible if not mailvelope encrypted)
-    if (!this.mailvelope_editor && !this.editor.get_content() && !confirm(this.get_label('nobodywarning'))) {
-      this.editor.focus();
-      return false;
-    }
-
-    if (!this.check_compose_address_fields(cmd))
-      return false;
-
-    // move body from html editor to textarea (just to be sure, #1485860)
-    this.editor.save();
-
-    return true;
-  };
-
-  this.check_compose_address_fields = function(cmd, form)
-  {
-    if (!form)
-      form = window.document;
-
-    // check input fields
-    var key, recipients, dialog,
-      limit = this.env.max_disclosed_recipients,
-      input_to = $("[name='_to']", form),
-      input_cc = $("[name='_cc']", form),
-      input_bcc = $("[name='_bcc']", form),
-      input_from = $("[name='_from']", form),
-      get_recipients = function(fields) {
-        fields = $.map(fields, function(v) {
-          v = v.val().trim();
-          return v.length ? v : null;
+            // send request to server
+            ref.http_post('purge', post_data, lock);
         });
-        return fields.join(',').replace(/^[\s,;]+/, '').replace(/[\s,;]+$/, '');
-      };
 
-    // check sender (if have no identities)
-    if (input_from.prop('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
-      this.alert_dialog(this.get_label('nosenderwarning'), function() {
-        input_from.focus();
-      });
-      return false;
-    }
+        return false;
+    };
 
-    // check for empty recipient
-    if (!rcube_check_email(get_recipients([input_to, input_cc, input_bcc]), true)) {
-      this.alert_dialog(this.get_label('norecipientwarning'), function() {
-        input_to.focus();
-      });
-      return false;
-    }
+    // Mark all messages as read in:
+    //   - selected folder (mode=cur)
+    //   - selected folder and its subfolders (mode=sub)
+    //   - all folders (mode=all)
+    this.mark_all_read = function(mbox, mode)
+    {
+        var state, content, nodes = [],
+            list = this.message_list,
+            folder = mbox || this.env.mailbox,
+            post_data = {_uid: '*', _flag: 'read', _mbox: folder, _folders: mode};
 
-    // check disclosed recipients limit
-    if (limit && !this.env.disclosed_recipients_warned
-      && rcube_check_email(recipients = get_recipients([input_to, input_cc]), true, true) > limit
-    ) {
-      var save_func = function(move_to_bcc) {
-          if (move_to_bcc) {
-            var bcc = input_bcc.val();
-            input_bcc.val((bcc ? (bcc + ', ') : '') + recipients).change();
-            input_to.val('').change();
-            input_cc.val('').change();
-          }
+        if (typeof mode != 'string') {
+            state = this.mark_all_read_state(folder);
+            if (!state)
+                return;
 
-          dialog.dialog('close');
+            if (state > 1) {
+                // build content of the dialog
+                $.each({cur: 1, sub: 2, all: 4}, function(i, v) {
+                    var id = 'readallmode' + i,
+                        label = $('<label>').attr('for', id).text(ref.get_label('folders-' + i)),
+                        input = $('<input>').attr({type: 'radio', value: i, name: 'mode', id: id, disabled: !(state & v)});
 
-          if (typeof cmd == 'function')
-            cmd();
-          else if (cmd)
-            ref.command(cmd, { nocheck:true });  // repeat command which triggered this
+                    nodes.push($('<li>').append([input, label]));
+                });
+
+                content = $('<ul class="proplist">').append(nodes);
+                $('input:not([disabled])', content).first().attr('checked', true);
+
+                this.simple_dialog(content, 'markallread',
+                    function() {
+                        ref.mark_all_read(folder, $('input:checked', content).val());
+                        return true;
+                    },
+                    {button: 'mark', button_class: 'save'}
+                );
+
+                return;
+            }
+
+            post_data._folders = 'cur'; // only current folder has unread messages
+        }
+
+        // mark messages on the list
+        $.each(list ? list.rows : [], function(uid, row) {
+            if (!row.unread)
+                return;
+
+            var mbox = ref.env.messages[uid].mbox;
+            if (mode == 'all' || mbox == ref.env.mailbox
+          || (mode == 'sub' && mbox.startsWith(ref.env.mailbox + ref.env.delimiter))
+            ) {
+                ref.set_message(uid, 'unread', false);
+            }
+        });
+
+        // send the request
+        this.http_post('mark', post_data, this.display_message('markingmessage', 'loading'));
+    };
+
+    // Enable/disable mark-all-read action depending on folders state
+    this.mark_all_read_state = function(mbox)
+    {
+        var state = 0,
+            li = this.treelist.get_item(mbox || this.env.mailbox),
+            folder_item = $(li).is('.unread') ? 1 : 0,
+            subfolder_items = $('li.unread', li).length,
+            all_items = $('li.unread', ref.gui_objects.folderlist).length;
+
+        state += folder_item;
+        state += subfolder_items ? 2 : 0;
+        state += all_items > folder_item + subfolder_items ? 4 : 0;
+
+        this.enable_command('mark-all-read', state > 0);
+
+        return state;
+    };
+
+    // Display "bounce message" dialog
+    this.bounce = function(props, obj, event)
+    {
+    // get message uid and folder
+        var uid = this.get_single_uid(),
+            url = this.url('bounce', {_framed: 1, _uid: uid, _mbox: this.get_message_mailbox(uid)}),
+            dialog = $('<iframe>').attr('src', url),
+            get_form = function() {
+                var rc = $('iframe', dialog)[0].contentWindow.rcmail;
+                return {rc: rc, form: rc.gui_objects.messageform};
+            },
+            post_func = function() {
+                var post = {}, form = get_form();
+
+                $.each($(form.form).serializeArray(), function() { post[this.name] = this.value; });
+
+                post._uid = form.rc.env.uid;
+                post._mbox = form.rc.env.mailbox;
+                delete post._action;
+                delete post._task;
+
+                if (post._to || post._cc || post._bcc) {
+                    ref.http_post('bounce', post, ref.set_busy(true, 'sendingmessage'));
+                    dialog.dialog('close');
+                }
+            },
+            submit_func = function() {
+                var form = get_form();
+
+                if (typeof form.form != 'object')
+                    return false;
+
+                if (!form.rc.check_compose_address_fields(post_func, form.form))
+                    return false;
+
+                return post_func();
+            };
+
+        this.hide_menu('forwardmenu', event);
+
+        dialog = this.simple_dialog(dialog, 'bouncemsg', submit_func, {
+            button: 'bounce',
+            width: 400,
+            height: 300
+        });
+
+        return true;
+    };
+
+
+    /*********************************************************/
+    /*********        message compose methods        *********/
+    /*********************************************************/
+
+    this.open_compose_step = function(p)
+    {
+        var url = this.url('mail/compose', p);
+
+        // open new compose window
+        if (this.env.compose_extwin && !this.env.extwin) {
+            this.open_window(url);
+        }
+        else {
+            this.redirect(url);
+            if (this.env.extwin)
+                window.resizeTo(Math.max(this.env.popup_width, $(window).width()), $(window).height() + 24);
+        }
+    };
+
+    // init message compose form: set focus and eventhandlers
+    this.init_messageform = function()
+    {
+        if (!this.gui_objects.messageform)
+            return false;
+
+        var elem, pos,
+            input_from = $("[name='_from']"),
+            input_to = $("[name='_to']"),
+            input_subject = $("[name='_subject']"),
+            input_message = $("[name='_message']").get(0),
+            html_mode = $("[name='_is_html']").val() == '1',
+            opener_rc = this.opener();
+
+        // close compose step in opener
+        if (opener_rc && opener_rc.env.action == 'compose') {
+            setTimeout(function() {
+                if (opener.history.length > 1)
+                    opener.history.back();
+                else
+                    opener_rc.redirect(opener_rc.get_task_url('mail'));
+            }, 100);
+            this.env.opened_extwin = true;
+        }
+
+        if (!html_mode) {
+            // On Back button Chrome will overwrite textarea with old content
+            // causing e.g. the same signature is added twice (#5809)
+            if (input_message.value && input_message.defaultValue !== undefined)
+                input_message.value = input_message.defaultValue;
+
+            pos = this.env.top_posting && this.env.compose_mode ? 0 : input_message.value.length;
+
+            // add signature according to selected identity
+            // if we have HTML editor, signature is added in a callback
+            if (input_from.prop('type') == 'select-one') {
+                // for some reason the caret initially is not at pos=0 in Firefox 51 (#5628)
+                this.set_caret_pos(input_message, 0);
+                this.change_identity(input_from[0]);
+            }
+
+            // set initial cursor position
+            this.set_caret_pos(input_message, pos);
+
+            // scroll to the bottom of the textarea (#1490114)
+            if (pos) {
+                $(input_message).scrollTop(input_message.scrollHeight);
+            }
+        }
+
+        // check for locally stored compose data
+        if (this.env.save_localstorage)
+            this.compose_restore_dialog(0, html_mode);
+
+        if (input_to.val() == '')
+            elem = input_to;
+        else if (input_subject.val() == '')
+            elem = input_subject;
+        else if (input_message)
+            elem = input_message;
+
+        this.env.compose_focus_elem = this.init_messageform_inputs(elem);
+
+        // get summary of all field values
+        this.compose_field_hash(true);
+
+        // start the auto-save timer
+        this.auto_save_start();
+    };
+
+    // init autocomplete events on compose form inputs
+    this.init_messageform_inputs = function(focused)
+    {
+        var i,
+            input_to = $("[name='_to']"),
+            ac_fields = ['cc', 'bcc', 'replyto', 'followupto'];
+
+        // init live search events
+        this.init_address_input_events(input_to);
+        for (i in ac_fields) {
+            this.init_address_input_events($("[name='_"+ac_fields[i]+"']"));
+        }
+
+        if (!focused)
+            focused = input_to;
+
+        // focus first empty element (and return it)
+        return $(focused).focus().get(0);
+    };
+
+    this.compose_restore_dialog = function(j, html_mode)
+    {
+        var i, key, formdata, index = this.local_storage_get_item('compose.index', []);
+
+        var show_next = function(i) {
+            if (++i < index.length)
+                ref.compose_restore_dialog(i, html_mode);
         };
 
-      dialog = this.show_popup_dialog(
-        this.get_label('disclosedrecipwarning'),
-        this.get_label('disclosedreciptitle'),
-        [{
-            text: this.get_label('sendmessage'),
-            click: function() { save_func(false); },
-            'class': 'mainaction'
-          }, {
-            text: this.get_label('bccinstead'),
-            click: function() { save_func(true); }
-          }, {
-            text: this.get_label('cancel'),
-            click: function() { dialog.dialog('close'); },
-            'class': 'cancel'
-          }],
-        {dialogClass: 'warning'}
-      );
+        for (i = j || 0; i < index.length; i++) {
+            key = index[i];
+            formdata = this.local_storage_get_item('compose.' + key, null, true);
+            if (!formdata) {
+                continue;
+            }
+            // restore saved copy of current compose_id
+            if (formdata.changed && key == this.env.compose_id) {
+                this.restore_compose_form(key, html_mode);
+                break;
+            }
+            // skip records from 'other' drafts
+            if (this.env.draft_id && formdata.draft_id && formdata.draft_id != this.env.draft_id) {
+                continue;
+            }
+            // skip records on reply
+            if (this.env.reply_msgid && formdata.reply_msgid != this.env.reply_msgid) {
+                continue;
+            }
+            // show dialog asking to restore the message
+            if (formdata.changed && formdata.session != this.env.session_id) {
+                this.show_popup_dialog(
+                    this.get_label('restoresavedcomposedata')
+                        .replace('$date', new Date(formdata.changed).toLocaleString())
+                        .replace('$subject', formdata._subject)
+                        .replace(/\n/g, '<br/>'),
+                    this.get_label('restoremessage'),
+                    [{
+                        text: this.get_label('restore'),
+                        'class': 'mainaction restore',
+                        click: function(){
+                            ref.restore_compose_form(key, html_mode);
+                            ref.remove_compose_data(key);  // remove old copy
+                            ref.save_compose_form_local();  // save under current compose_id
+                            $(this).dialog('close');
+                        }
+                    },
+                    {
+                        text: this.get_label('delete'),
+                        'class': 'delete',
+                        click: function(){
+                            ref.remove_compose_data(key);
+                            $(this).dialog('close');
+                            show_next(i);
+                        }
+                    },
+                    {
+                        text: this.get_label('ignore'),
+                        'class': 'cancel',
+                        click: function(){
+                            $(this).dialog('close');
+                            show_next(i);
+                        }
+                    }]
+                );
+                break;
+            }
+        }
+    };
 
-      this.env.disclosed_recipients_warned = true;
-      return false;
-    }
+    this.init_address_input_events = function(obj, props)
+    {
+    // configure parallel autocompletion
+        if (!props && this.env.autocomplete_threads > 0) {
+            props = {
+                threads: this.env.autocomplete_threads,
+                sources: this.env.autocomplete_sources
+            };
+        }
 
-    return true;
-  };
+        obj.keydown(function(e) { return ref.ksearch_keydown(e, this, props); })
+            .attr({autocomplete: 'off', 'aria-autocomplete': 'list', 'aria-expanded': 'false', role: 'combobox'});
 
-  this.toggle_editor = function(props, obj, e)
-  {
+        var callback = function(e) {
+            if (ref.ksearch_pane && e.target === ref.ksearch_pane.get(0)) {
+                return;
+            }
+            ref.ksearch_hide();
+        };
+
+        // hide the popup on any click
+        $(document).on('click', callback);
+        // and on scroll (that cannot be jQuery.on())
+        document.addEventListener('scroll', callback, true);
+    };
+
+    this.submit_messageform = function(draft, saveonly)
+    {
+        var form = this.gui_objects.messageform;
+
+        if (!form)
+            return;
+
+        // the message has been sent but not saved, ask the user what to do
+        if (!saveonly && this.env.is_sent) {
+            return this.simple_dialog(this.get_label('messageissent'), '', // TODO: dialog title
+                function() {
+                    ref.submit_messageform(false, true);
+                    return true;
+                }
+            );
+        }
+
+        // delegate sending to Mailvelope routine
+        if (this.mailvelope_editor) {
+            return this.mailvelope_submit_messageform(draft, saveonly);
+        }
+
+        // all checks passed, send message
+        var msgid = this.set_busy(true, draft || saveonly ? 'savingmessage' : 'sendingmessage'),
+            lang = this.spellcheck_lang(),
+            files = [];
+
+        // send files list
+        $('li', this.gui_objects.attachmentlist).each(function() { files.push(this.id.replace(/^rcmfile/, '')); });
+        $('[name="_attachments"]', form).val(files.join());
+
+        form.target = this.get_save_target(msgid);
+        form._draft.value = draft ? '1' : '';
+        form.action = this.add_url(form.action, '_unlock', msgid);
+        form.action = this.add_url(form.action, '_framed', 1);
+
+        if (lang)
+            form.action = this.add_url(form.action, '_lang', lang);
+        if (saveonly)
+            form.action = this.add_url(form.action, '_saveonly', 1);
+
+        // register timer to notify about connection timeout
+        this.submit_timer = setTimeout(function() {
+            ref.set_busy(false, null, msgid);
+            ref.display_message('requesttimedout', 'error');
+        }, this.env.request_timeout * 1000);
+
+        form.submit();
+    };
+
+    this.compose_recipient_select = function(list)
+    {
+        var id, n, recipients = 0, selection = list.get_selection();
+        for (n=0; n < selection.length; n++) {
+            id = selection[n];
+            if (this.env.contactdata[id])
+                recipients++;
+        }
+        this.enable_command('add-recipient', recipients);
+    };
+
+    this.compose_add_recipient = function(field)
+    {
+    // find last focused field name
+        if (!field) {
+            field = $(this.env.focused_field).filter(':visible');
+            field = field.length ? field.attr('id').replace('_', '') : 'to';
+        }
+
+        var recipients = [], input = $('#_' + field), selection = this.contact_list.get_selection();
+
+        if (this.contact_list && selection.length) {
+            var data, name, n, id;
+            for (n = 0; n < selection.length; n++) {
+                if ((id = selection[n]) && (data = this.env.contactdata[id])) {
+                    name = data.name || data;
+
+                    // group is added, expand it
+                    if (id.charAt(0) == 'E' && input.length) {
+                        // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
+                        name = '\u200b' + name + '\u200b';
+                        var gid = id.substr(1);
+                        this.group2expand[gid] = {name: name, input: input.get(0)};
+                        this.http_request('group-expand', {_source: data.source || this.env.source, _gid: gid}, false);
+                    }
+
+                    recipients.push(name);
+                }
+            }
+        }
+
+        if (recipients.length && input.length) {
+            var oldval = input.val();
+            if (oldval && !/[,;]\s*$/.test(oldval))
+                oldval += ', ';
+            input.val(oldval + recipients.join(', ') + ', ').change();
+            this.triggerEvent('add-recipient', { field:field, recipients:recipients });
+        }
+
+        return recipients.length;
+    };
+
+    // checks the input fields before sending a message
+    this.check_compose_input = function(cmd)
+    {
+        var key,
+            input_subject = $("[name='_subject']");
+
+        // check if all files has been uploaded
+        for (key in this.env.attachments) {
+            if (typeof this.env.attachments[key] === 'object' && !this.env.attachments[key].complete) {
+                this.alert_dialog(this.get_label('notuploadedwarning'));
+                return false;
+            }
+        }
+
+        // display localized warning for missing subject
+        if (!this.env.nosubject_warned && input_subject.val() == '') {
+            var dialog,
+                prompt_value = $('<input>').attr({type: 'text', size: 40, 'data-submit': 'true'}),
+                myprompt = $('<div class="prompt">')
+                    .append($('<p class="message">').text(this.get_label('nosubjectwarning')))
+                    .append(prompt_value),
+                save_func = function() {
+                    input_subject.val(prompt_value.val());
+                    dialog.dialog('close');
+                    if (ref.check_compose_input(cmd))
+                        ref.command(cmd, { nocheck:true });  // repeat command which triggered this
+                };
+
+            dialog = this.show_popup_dialog(
+                myprompt,
+                this.get_label('nosubjecttitle'),
+                [{
+                    text: this.get_label('sendmessage'),
+                    'class': 'mainaction send',
+                    click: function() { save_func(); }
+                }, {
+                    text: this.get_label('cancel'),
+                    'class': 'cancel',
+                    click: function() {
+                        input_subject.focus();
+                        dialog.dialog('close');
+                    }
+                }],
+                {dialogClass: 'warning'}
+            );
+
+            this.env.nosubject_warned = true;
+            return false;
+        }
+
+        // check for empty body (only possible if not mailvelope encrypted)
+        if (!this.mailvelope_editor && !this.editor.get_content() && !confirm(this.get_label('nobodywarning'))) {
+            this.editor.focus();
+            return false;
+        }
+
+        if (!this.check_compose_address_fields(cmd))
+            return false;
+
+        // move body from html editor to textarea (just to be sure, #1485860)
+        this.editor.save();
+
+        return true;
+    };
+
+    this.check_compose_address_fields = function(cmd, form)
+    {
+        if (!form)
+            form = window.document;
+
+        // check input fields
+        var key, recipients, dialog,
+            limit = this.env.max_disclosed_recipients,
+            input_to = $("[name='_to']", form),
+            input_cc = $("[name='_cc']", form),
+            input_bcc = $("[name='_bcc']", form),
+            input_from = $("[name='_from']", form),
+            get_recipients = function(fields) {
+                fields = $.map(fields, function(v) {
+                    v = v.val().trim();
+                    return v.length ? v : null;
+                });
+                return fields.join(',').replace(/^[\s,;]+/, '').replace(/[\s,;]+$/, '');
+            };
+
+        // check sender (if have no identities)
+        if (input_from.prop('type') == 'text' && !rcube_check_email(input_from.val(), true)) {
+            this.alert_dialog(this.get_label('nosenderwarning'), function() {
+                input_from.focus();
+            });
+            return false;
+        }
+
+        // check for empty recipient
+        if (!rcube_check_email(get_recipients([input_to, input_cc, input_bcc]), true)) {
+            this.alert_dialog(this.get_label('norecipientwarning'), function() {
+                input_to.focus();
+            });
+            return false;
+        }
+
+        // check disclosed recipients limit
+        if (limit && !this.env.disclosed_recipients_warned
+      && rcube_check_email(recipients = get_recipients([input_to, input_cc]), true, true) > limit
+        ) {
+            var save_func = function(move_to_bcc) {
+                if (move_to_bcc) {
+                    var bcc = input_bcc.val();
+                    input_bcc.val((bcc ? (bcc + ', ') : '') + recipients).change();
+                    input_to.val('').change();
+                    input_cc.val('').change();
+                }
+
+                dialog.dialog('close');
+
+                if (typeof cmd == 'function')
+                    cmd();
+                else if (cmd)
+                    ref.command(cmd, { nocheck:true });  // repeat command which triggered this
+            };
+
+            dialog = this.show_popup_dialog(
+                this.get_label('disclosedrecipwarning'),
+                this.get_label('disclosedreciptitle'),
+                [{
+                    text: this.get_label('sendmessage'),
+                    click: function() { save_func(false); },
+                    'class': 'mainaction'
+                }, {
+                    text: this.get_label('bccinstead'),
+                    click: function() { save_func(true); }
+                }, {
+                    text: this.get_label('cancel'),
+                    click: function() { dialog.dialog('close'); },
+                    'class': 'cancel'
+                }],
+                {dialogClass: 'warning'}
+            );
+
+            this.env.disclosed_recipients_warned = true;
+            return false;
+        }
+
+        return true;
+    };
+
+    this.toggle_editor = function(props, obj, e)
+    {
     // @todo: this should work also with many editors on page
-    var mode, result = this.editor.toggle(props.html, props.noconvert || false),
-      control = $('#' + this.editor.id).data('control') || $(e ? e.target : []);
+        var mode, result = this.editor.toggle(props.html, props.noconvert || false),
+            control = $('#' + this.editor.id).data('control') || $(e ? e.target : []);
 
-    if (result)
-      mode = props.html ? 'html' : 'plain';
-    else
-      mode = props.html ? 'plain' : 'html';
+        if (result)
+            mode = props.html ? 'html' : 'plain';
+        else
+            mode = props.html ? 'plain' : 'html';
 
-    // update internal format flag
-    $("[name='_is_html']").val(mode == 'html' ? 1 : 0);
+        // update internal format flag
+        $("[name='_is_html']").val(mode == 'html' ? 1 : 0);
 
-    if (control.is('[type=checkbox]'))
-      control.prop('checked', mode == 'html');
-    else
-      control.val(mode);
+        if (control.is('[type=checkbox]'))
+            control.prop('checked', mode == 'html');
+        else
+            control.val(mode);
 
-    return result;
-  };
+        return result;
+    };
 
-  // Inserts a predefined response to the compose editor
-  this.insert_response = function(response)
-  {
-    if (typeof response == 'object') {
-      var replace = {};
-      replace[response.is_html ? 'html' : 'text'] = response.data;
+    // Inserts a predefined response to the compose editor
+    this.insert_response = function(response)
+    {
+        if (typeof response == 'object') {
+            var replace = {};
+            replace[response.is_html ? 'html' : 'text'] = response.data;
 
-      this.editor.replace(replace);
-      this.display_message('responseinserted', 'confirmation');
-    }
-    else {
-      var lock = this.display_message('', 'loading');
-      this.http_get('settings/response-get', {_id: response, _is_html: this.editor.is_html() ? 1 : 0}, lock);
-    }
-  };
+            this.editor.replace(replace);
+            this.display_message('responseinserted', 'confirmation');
+        }
+        else {
+            var lock = this.display_message('', 'loading');
+            this.http_get('settings/response-get', {_id: response, _is_html: this.editor.is_html() ? 1 : 0}, lock);
+        }
+    };
 
-  // updates spellchecker buttons on state change
-  this.spellcheck_state = function()
-  {
-    var active = this.editor.spellcheck_state();
+    // updates spellchecker buttons on state change
+    this.spellcheck_state = function()
+    {
+        var active = this.editor.spellcheck_state();
 
-    $.each(this.buttons.spellcheck || [], function(i, v) {
-      $('#' + v.id)[active ? 'addClass' : 'removeClass']('selected');
-    });
+        $.each(this.buttons.spellcheck || [], function(i, v) {
+            $('#' + v.id)[active ? 'addClass' : 'removeClass']('selected');
+        });
 
-    return active;
-  };
+        return active;
+    };
 
-  // get selected language
-  this.spellcheck_lang = function()
-  {
-    return this.editor.get_language();
-  };
+    // get selected language
+    this.spellcheck_lang = function()
+    {
+        return this.editor.get_language();
+    };
 
-  this.spellcheck_lang_set = function(lang)
-  {
-    this.editor.set_language(lang);
-  };
+    this.spellcheck_lang_set = function(lang)
+    {
+        this.editor.set_language(lang);
+    };
 
-  // resume spellchecking, highlight provided misspellings without new ajax request
-  this.spellcheck_resume = function(data)
-  {
-    this.editor.spellcheck_resume(data);
-  };
+    // resume spellchecking, highlight provided misspellings without new ajax request
+    this.spellcheck_resume = function(data)
+    {
+        this.editor.spellcheck_resume(data);
+    };
 
-  this.set_draft_id = function(id)
-  {
-    if (id && id != this.env.draft_id) {
-      var filter = {task: 'mail', action: ''},
-        rc = this.opener(false, filter) || this.opener(true, filter);
+    this.set_draft_id = function(id)
+    {
+        if (id && id != this.env.draft_id) {
+            var filter = {task: 'mail', action: ''},
+                rc = this.opener(false, filter) || this.opener(true, filter);
 
-      // refresh the drafts folder in the opener window
-      if (rc && rc.env.mailbox == this.env.drafts_mailbox)
-        rc.command('checkmail');
+            // refresh the drafts folder in the opener window
+            if (rc && rc.env.mailbox == this.env.drafts_mailbox)
+                rc.command('checkmail');
 
-      this.env.draft_id = id;
-      $("[name='_draft_saveid']").val(id);
-    }
+            this.env.draft_id = id;
+            $("[name='_draft_saveid']").val(id);
+        }
 
-    // always remove local copy upon saving as draft
-    this.remove_compose_data(this.env.compose_id);
-    this.compose_skip_unsavedcheck = false;
-  };
+        // always remove local copy upon saving as draft
+        this.remove_compose_data(this.env.compose_id);
+        this.compose_skip_unsavedcheck = false;
+    };
 
-  // Create (attach) 'savetarget' iframe before use
-  this.get_save_target = function(unlock)
-  {
+    // Create (attach) 'savetarget' iframe before use
+    this.get_save_target = function(unlock)
+    {
     // Removing the frame on load/error to workaround issues with window history
-    this.dummy_iframe('savetarget', 'javascript:false;')
-      .on('load error', function() {
-        // catch invalid/error response from server and unlock the UI (#7494, #7488, #7522)
-        if (unlock && $(this).contents().find('meta[name="generator"][content="Roundcube"]').length == 0) {
-          ref.iframe_loaded(unlock);
-          ref.display_message('connerror', 'error');
+        this.dummy_iframe('savetarget', 'javascript:false;')
+            .on('load error', function() {
+                // catch invalid/error response from server and unlock the UI (#7494, #7488, #7522)
+                if (unlock && $(this).contents().find('meta[name="generator"][content="Roundcube"]').length == 0) {
+                    ref.iframe_loaded(unlock);
+                    ref.display_message('connerror', 'error');
+                }
+
+                $(this).remove();
+            });
+
+        return 'savetarget';
+    };
+
+    this.auto_save_start = function()
+    {
+        if (this.env.draft_autosave) {
+            this.save_timer = setTimeout(function() {
+                ref.command("savedraft");
+            }, this.env.draft_autosave * 1000);
         }
 
-        $(this).remove();
-      });
+        // save compose form content to local storage every 5 seconds
+        if (!this.local_save_timer && window.localStorage && this.env.save_localstorage) {
+            // track typing activity and only save on changes
+            this.compose_type_activity = this.compose_type_activity_last = 0;
+            $(document).keypress(function(e) { ref.compose_type_activity++; });
 
-    return 'savetarget';
-  };
+            this.local_save_timer = setInterval(function(){
+                if (ref.compose_type_activity > ref.compose_type_activity_last) {
+                    ref.save_compose_form_local();
+                    ref.compose_type_activity_last = ref.compose_type_activity;
+                }
+            }, 5000);
 
-  this.auto_save_start = function()
-  {
-    if (this.env.draft_autosave) {
-      this.save_timer = setTimeout(function() {
-          ref.command("savedraft");
-      }, this.env.draft_autosave * 1000);
-    }
-
-    // save compose form content to local storage every 5 seconds
-    if (!this.local_save_timer && window.localStorage && this.env.save_localstorage) {
-      // track typing activity and only save on changes
-      this.compose_type_activity = this.compose_type_activity_last = 0;
-      $(document).keypress(function(e) { ref.compose_type_activity++; });
-
-      this.local_save_timer = setInterval(function(){
-        if (ref.compose_type_activity > ref.compose_type_activity_last) {
-          ref.save_compose_form_local();
-          ref.compose_type_activity_last = ref.compose_type_activity;
+            $(window).on('unload', function() {
+                // remove copy from local storage if compose screen is left after warning
+                if (!ref.env.server_error)
+                    ref.remove_compose_data(ref.env.compose_id);
+            });
         }
-      }, 5000);
 
-      $(window).on('unload', function() {
-        // remove copy from local storage if compose screen is left after warning
-        if (!ref.env.server_error)
-          ref.remove_compose_data(ref.env.compose_id);
-      });
-    }
-
-    // check for unsaved changes before leaving the compose page
-    if (!window.onbeforeunload) {
-      window.onbeforeunload = function() {
-        if (!ref.compose_skip_unsavedcheck && ref.cmp_hash != ref.compose_field_hash()) {
-          return ref.get_label('notsentwarning');
+        // check for unsaved changes before leaving the compose page
+        if (!window.onbeforeunload) {
+            window.onbeforeunload = function() {
+                if (!ref.compose_skip_unsavedcheck && ref.cmp_hash != ref.compose_field_hash()) {
+                    return ref.get_label('notsentwarning');
+                }
+            };
         }
-      };
-    }
 
-    // Unlock interface now that saving is complete
-    this.busy = false;
-  };
+        // Unlock interface now that saving is complete
+        this.busy = false;
+    };
 
-  this.compose_field_hash = function(save)
-  {
+    this.compose_field_hash = function(save)
+    {
     // check input fields
-    var i, id, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];
+        var i, id, val, str = '', hash_fields = ['to', 'cc', 'bcc', 'subject'];
 
-    for (i=0; i<hash_fields.length; i++)
-      if (val = $('[name="_' + hash_fields[i] + '"]').val())
-        str += val + ':';
+        for (i=0; i<hash_fields.length; i++)
+            if (val = $('[name="_' + hash_fields[i] + '"]').val())
+                str += val + ':';
 
-    str += this.editor.get_content({refresh: false});
+        str += this.editor.get_content({refresh: false});
 
-    for (id in this.env.attachments)
-      str += id;
+        for (id in this.env.attachments)
+            str += id;
 
-    // we can't detect changes in the Mailvelope editor so assume it changed
-    if (this.mailvelope_editor) {
-      str += ';' + new Date().getTime();
-    }
+        // we can't detect changes in the Mailvelope editor so assume it changed
+        if (this.mailvelope_editor) {
+            str += ';' + new Date().getTime();
+        }
 
-    if (save)
-      this.cmp_hash = str;
+        if (save)
+            this.cmp_hash = str;
 
-    return str;
-  };
+        return str;
+    };
 
-  // store the contents of the compose form to localstorage
-  this.save_compose_form_local = function()
-  {
+    // store the contents of the compose form to localstorage
+    this.save_compose_form_local = function()
+    {
     // feature is disabled
-    if (!this.env.save_localstorage)
-      return;
+        if (!this.env.save_localstorage)
+            return;
 
-    var formdata = { session:this.env.session_id, changed:new Date().getTime() },
-      ed, empty = true;
+        var formdata = { session:this.env.session_id, changed:new Date().getTime() },
+            ed, empty = true;
 
-    // get fresh content from editor
-    this.editor.save();
+        // get fresh content from editor
+        this.editor.save();
 
-    if (this.env.draft_id) {
-      formdata.draft_id = this.env.draft_id;
-    }
-    if (this.env.reply_msgid) {
-      formdata.reply_msgid = this.env.reply_msgid;
-    }
-
-    $('input, select, textarea', this.gui_objects.messageform).each(function(i, elem) {
-      switch (elem.tagName.toLowerCase()) {
-        case 'input':
-          if (elem.type == 'button' || elem.type == 'submit' || (elem.type == 'hidden' && elem.name != '_is_html')) {
-            break;
-          }
-          formdata[elem.name] = elem.type != 'checkbox' || elem.checked ? $(elem).val() : '';
-
-          if (formdata[elem.name] != '' && elem.type != 'hidden')
-            empty = false;
-          break;
-
-        case 'select':
-          formdata[elem.name] = $('option:checked', elem).val();
-          break;
-
-        default:
-          formdata[elem.name] = $(elem).val();
-          if (formdata[elem.name] != '')
-            empty = false;
-      }
-    });
-
-    if (!empty) {
-      var index = this.local_storage_get_item('compose.index', []),
-        key = this.env.compose_id;
-
-      if ($.inArray(key, index) < 0) {
-        index.push(key);
-      }
-
-      this.local_storage_set_item('compose.' + key, formdata, true);
-      this.local_storage_set_item('compose.index', index);
-    }
-  };
-
-  // write stored compose data back to form
-  this.restore_compose_form = function(key, html_mode)
-  {
-    var ed, formdata = this.local_storage_get_item('compose.' + key, true);
-
-    if (formdata && typeof formdata == 'object') {
-      $.each(formdata, function(k, value) {
-        if (k[0] == '_') {
-          var elem = $("[name=" + k + "]");
-          if (elem[0] && elem[0].type == 'checkbox') {
-            elem.prop('checked', value != '');
-          }
-          else {
-            elem.val(value).change();
-          }
+        if (this.env.draft_id) {
+            formdata.draft_id = this.env.draft_id;
         }
-      });
-
-      // initialize HTML editor
-      if ((formdata._is_html == '1' && !html_mode) || (formdata._is_html != '1' && html_mode)) {
-        this.command('toggle-editor', {id: this.env.composebody, html: !html_mode, noconvert: true});
-      }
-    }
-  };
-
-  // remove stored compose data from localStorage
-  this.remove_compose_data = function(key)
-  {
-    var index = this.local_storage_get_item('compose.index', []);
-
-    if ($.inArray(key, index) >= 0) {
-      this.local_storage_remove_item('compose.' + key);
-      this.local_storage_set_item('compose.index', $.grep(index, function(val,i) { return val != key; }));
-    }
-  };
-
-  // clear all stored compose data of this user
-  this.clear_compose_data = function()
-  {
-    var i, index = this.local_storage_get_item('compose.index', []);
-
-    for (i=0; i < index.length; i++) {
-      this.local_storage_remove_item('compose.' + index[i]);
-    }
-
-    this.local_storage_remove_item('compose.index');
-  };
-
-  this.change_identity = function(obj, show)
-  {
-    if (!obj || !obj.options)
-      return false;
-
-    var id = $(obj).val(),
-      got_sig = this.env.signatures && this.env.signatures[id],
-      sig = this.env.identity,
-      show_sig = show ? show : this.env.show_sig;
-
-    // enable manual signature insert
-    if (got_sig) {
-      this.enable_command('insert-sig', true);
-      this.env.compose_commands.push('insert-sig');
-      got_sig = true;
-    }
-    else
-      this.enable_command('insert-sig', false);
-
-    // first function execution
-    if (!this.env.identities_initialized) {
-      this.env.identities_initialized = true;
-      if (this.env.show_sig_later)
-        this.env.show_sig = true;
-      if (this.env.opened_extwin)
-        return;
-    }
-
-    // update reply-to/bcc fields with addresses defined in identities
-    $.each(['replyto', 'bcc'], function() {
-      var rx, key = this,
-        old_val = sig && ref.env.identities[sig] ? ref.env.identities[sig][key] : '',
-        new_val = id && ref.env.identities[id] ? ref.env.identities[id][key] : '',
-        input = $('[name="_'+key+'"]'), input_val = input.val();
-
-      // remove old address(es)
-      if (old_val && input_val) {
-        rx = new RegExp('\\s*' + RegExp.escape(old_val) + '\\s*');
-        input_val = input_val.replace(rx, '');
-      }
-
-      // cleanup
-      input_val = String(input_val).replace(/[,;]\s*[,;]/g, ',').replace(/^[\s,;]+/, '');
-
-      // add new address(es)
-      if (new_val && input_val.indexOf(new_val) == -1 && input_val.indexOf(new_val.replace(/"/g, '')) == -1) {
-        if (input_val) {
-          input_val = input_val.replace(/[,;\s]+$/, '') + ', ';
+        if (this.env.reply_msgid) {
+            formdata.reply_msgid = this.env.reply_msgid;
         }
 
-        input_val += new_val + ', ';
-      }
+        $('input, select, textarea', this.gui_objects.messageform).each(function(i, elem) {
+            switch (elem.tagName.toLowerCase()) {
+                case 'input':
+                    if (elem.type == 'button' || elem.type == 'submit' || (elem.type == 'hidden' && elem.name != '_is_html')) {
+                        break;
+                    }
+                    formdata[elem.name] = elem.type != 'checkbox' || elem.checked ? $(elem).val() : '';
 
-      if (old_val || new_val)
-        input.val(input_val).change();
-    });
+                    if (formdata[elem.name] != '' && elem.type != 'hidden')
+                        empty = false;
+                    break;
 
-    if (this.editor)
-      this.editor.change_signature(id, show_sig);
+                case 'select':
+                    formdata[elem.name] = $('option:checked', elem).val();
+                    break;
 
-    if (show && got_sig)
-      this.display_message('siginserted', 'confirmation');
+                default:
+                    formdata[elem.name] = $(elem).val();
+                    if (formdata[elem.name] != '')
+                        empty = false;
+            }
+        });
 
-    this.env.identity = id;
-    this.triggerEvent('change_identity');
+        if (!empty) {
+            var index = this.local_storage_get_item('compose.index', []),
+                key = this.env.compose_id;
 
-    return true;
-  };
+            if ($.inArray(key, index) < 0) {
+                index.push(key);
+            }
 
-  // Open file selection dialog for defined upload form
-  // Works only on click and only with smart-upload forms
-  this.upload_input = function(name)
-  {
-    $('#' + name + ' input[type="file"]').click();
-  };
-
-  // upload (attachment) file
-  this.upload_file = function(form, action, lock)
-  {
-    if (form) {
-      var fname, files = [];
-      $('input', form).each(function() {
-        if (this.files) {
-          fname = this.name;
-          for (var i=0; i < this.files.length; i++)
-            files.push(this.files[i]);
+            this.local_storage_set_item('compose.' + key, formdata, true);
+            this.local_storage_set_item('compose.index', index);
         }
-      });
+    };
 
-      return this.file_upload(files, {_id: this.env.compose_id || ''}, {
-        name: fname,
-        action: action,
-        lock: lock
-      });
-    }
-  };
+    // write stored compose data back to form
+    this.restore_compose_form = function(key, html_mode)
+    {
+        var ed, formdata = this.local_storage_get_item('compose.' + key, true);
 
-  // add file name to attachment list
-  // called from upload page
-  this.add2attachment_list = function(name, att, upload_id)
-  {
-    if (upload_id)
-      this.triggerEvent('fileuploaded', {name: name, attachment: att, id: upload_id});
+        if (formdata && typeof formdata == 'object') {
+            $.each(formdata, function(k, value) {
+                if (k[0] == '_') {
+                    var elem = $("[name=" + k + "]");
+                    if (elem[0] && elem[0].type == 'checkbox') {
+                        elem.prop('checked', value != '');
+                    }
+                    else {
+                        elem.val(value).change();
+                    }
+                }
+            });
 
-    if (upload_id && this.env.attachments[upload_id])
-      delete this.env.attachments[upload_id];
+            // initialize HTML editor
+            if ((formdata._is_html == '1' && !html_mode) || (formdata._is_html != '1' && html_mode)) {
+                this.command('toggle-editor', {id: this.env.composebody, html: !html_mode, noconvert: true});
+            }
+        }
+    };
 
-    this.env.attachments[name] = att;
+    // remove stored compose data from localStorage
+    this.remove_compose_data = function(key)
+    {
+        var index = this.local_storage_get_item('compose.index', []);
 
-    if (!this.gui_objects.attachmentlist)
-      return false;
+        if ($.inArray(key, index) >= 0) {
+            this.local_storage_remove_item('compose.' + key);
+            this.local_storage_set_item('compose.index', $.grep(index, function(val, i) { return val != key; }));
+        }
+    };
 
-    var label, indicator, li = $('<li>');
+    // clear all stored compose data of this user
+    this.clear_compose_data = function()
+    {
+        var i, index = this.local_storage_get_item('compose.index', []);
 
-    if (!att.complete && att.html.indexOf('<') < 0)
-      att.html = '<span class="uploading">' + att.html + '</span>';
+        for (i=0; i < index.length; i++) {
+            this.local_storage_remove_item('compose.' + index[i]);
+        }
 
-    if (!att.complete && this.env.loadingicon)
-      att.html = '<img src="'+this.env.loadingicon+'" class="uploading" />' + att.html;
+        this.local_storage_remove_item('compose.index');
+    };
 
-    if (!att.complete) {
-      label = this.get_label('cancel');
-      att.html = '<a title="'+label+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\');" href="#cancelupload" class="cancelupload">'
+    this.change_identity = function(obj, show)
+    {
+        if (!obj || !obj.options)
+            return false;
+
+        var id = $(obj).val(),
+            got_sig = this.env.signatures && this.env.signatures[id],
+            sig = this.env.identity,
+            show_sig = show ? show : this.env.show_sig;
+
+        // enable manual signature insert
+        if (got_sig) {
+            this.enable_command('insert-sig', true);
+            this.env.compose_commands.push('insert-sig');
+            got_sig = true;
+        }
+        else
+            this.enable_command('insert-sig', false);
+
+        // first function execution
+        if (!this.env.identities_initialized) {
+            this.env.identities_initialized = true;
+            if (this.env.show_sig_later)
+                this.env.show_sig = true;
+            if (this.env.opened_extwin)
+                return;
+        }
+
+        // update reply-to/bcc fields with addresses defined in identities
+        $.each(['replyto', 'bcc'], function() {
+            var rx, key = this,
+                old_val = sig && ref.env.identities[sig] ? ref.env.identities[sig][key] : '',
+                new_val = id && ref.env.identities[id] ? ref.env.identities[id][key] : '',
+                input = $('[name="_'+key+'"]'), input_val = input.val();
+
+            // remove old address(es)
+            if (old_val && input_val) {
+                rx = new RegExp('\\s*' + RegExp.escape(old_val) + '\\s*');
+                input_val = input_val.replace(rx, '');
+            }
+
+            // cleanup
+            input_val = String(input_val).replace(/[,;]\s*[,;]/g, ',').replace(/^[\s,;]+/, '');
+
+            // add new address(es)
+            if (new_val && input_val.indexOf(new_val) == -1 && input_val.indexOf(new_val.replace(/"/g, '')) == -1) {
+                if (input_val) {
+                    input_val = input_val.replace(/[,;\s]+$/, '') + ', ';
+                }
+
+                input_val += new_val + ', ';
+            }
+
+            if (old_val || new_val)
+                input.val(input_val).change();
+        });
+
+        if (this.editor)
+            this.editor.change_signature(id, show_sig);
+
+        if (show && got_sig)
+            this.display_message('siginserted', 'confirmation');
+
+        this.env.identity = id;
+        this.triggerEvent('change_identity');
+
+        return true;
+    };
+
+    // Open file selection dialog for defined upload form
+    // Works only on click and only with smart-upload forms
+    this.upload_input = function(name)
+    {
+        $('#' + name + ' input[type="file"]').click();
+    };
+
+    // upload (attachment) file
+    this.upload_file = function(form, action, lock)
+    {
+        if (form) {
+            var fname, files = [];
+            $('input', form).each(function() {
+                if (this.files) {
+                    fname = this.name;
+                    for (var i=0; i < this.files.length; i++)
+                        files.push(this.files[i]);
+                }
+            });
+
+            return this.file_upload(files, {_id: this.env.compose_id || ''}, {
+                name: fname,
+                action: action,
+                lock: lock
+            });
+        }
+    };
+
+    // add file name to attachment list
+    // called from upload page
+    this.add2attachment_list = function(name, att, upload_id)
+    {
+        if (upload_id)
+            this.triggerEvent('fileuploaded', {name: name, attachment: att, id: upload_id});
+
+        if (upload_id && this.env.attachments[upload_id])
+            delete this.env.attachments[upload_id];
+
+        this.env.attachments[name] = att;
+
+        if (!this.gui_objects.attachmentlist)
+            return false;
+
+        var label, indicator, li = $('<li>');
+
+        if (!att.complete && att.html.indexOf('<') < 0)
+            att.html = '<span class="uploading">' + att.html + '</span>';
+
+        if (!att.complete && this.env.loadingicon)
+            att.html = '<img src="'+this.env.loadingicon+'" class="uploading" />' + att.html;
+
+        if (!att.complete) {
+            label = this.get_label('cancel');
+            att.html = '<a title="'+label+'" onclick="return rcmail.cancel_attachment_upload(\''+name+'\');" href="#cancelupload" class="cancelupload">'
         + (this.env.cancelicon ? '<img src="'+this.env.cancelicon+'" />' : '<span class="inner">' + label + '</span>') + '</a>' + att.html;
-    }
-
-    li.attr('id', name).addClass(att.classname).html(att.html)
-      .find('.attachment-name').on('mouseover', function() { rcube_webmail.long_subject_title_ex(this); });
-
-    // replace indicator's li
-    if (upload_id && (indicator = document.getElementById(upload_id))) {
-      li.replaceAll(indicator);
-    }
-    else { // add new li
-      li.appendTo(this.gui_objects.attachmentlist);
-    }
-
-    // set tabindex attribute
-    var tabindex = $(this.gui_objects.attachmentlist).attr('data-tabindex') || '0';
-    li.find('a').attr('tabindex', tabindex);
-
-    this.triggerEvent('fileappended', {name: name, attachment: att, id: upload_id, item: li});
-
-    return true;
-  };
-
-  this.remove_from_attachment_list = function(name)
-  {
-    delete this.env.attachments[name];
-    $('#'+name).remove();
-  };
-
-  this.remove_attachment = function(name)
-  {
-    if (name && this.env.attachments[name])
-      this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name });
-
-    return false;
-  };
-
-  this.cancel_attachment_upload = function(name)
-  {
-    if (!name || !this.uploads[name])
-      return false;
-
-    this.remove_from_attachment_list(name);
-    this.uploads[name].abort();
-    return false;
-  };
-
-  // rename uploaded attachment (in compose)
-  this.rename_attachment = function(id)
-  {
-    var attachment = this.env.attachments[id];
-
-    if (!attachment)
-      return;
-
-    var input = $('<input>').attr({type: 'text', size: 50}).val(attachment.name),
-      content = $('<label>').text(this.get_label('namex')).append(input);
-
-    this.simple_dialog(content, 'attachmentrename', function() {
-        var name;
-        if ((name = input.val()) && name != attachment.name) {
-          ref.http_post('rename-attachment', {_id: ref.env.compose_id, _file: id, _name: name},
-          ref.set_busy(true, 'loading'));
-          return true;
         }
-      }
-    );
-  };
 
-  // update attachments list with the new name
-  this.rename_attachment_handler = function(id, name)
-  {
-    var attachment = this.env.attachments[id];
+        li.attr('id', name).addClass(att.classname).html(att.html)
+            .find('.attachment-name').on('mouseover', function() { rcube_webmail.long_subject_title_ex(this); });
 
-    if (!attachment || !name)
-      return;
+        // replace indicator's li
+        if (upload_id && (indicator = document.getElementById(upload_id))) {
+            li.replaceAll(indicator);
+        }
+        else { // add new li
+            li.appendTo(this.gui_objects.attachmentlist);
+        }
 
-    attachment.name = name;
+        // set tabindex attribute
+        var tabindex = $(this.gui_objects.attachmentlist).attr('data-tabindex') || '0';
+        li.find('a').attr('tabindex', tabindex);
 
-    $('#' + id + ' .attachment-name').text(name).attr('title', '');
-  };
+        this.triggerEvent('fileappended', {name: name, attachment: att, id: upload_id, item: li});
 
-  // send remote request to add a new contact
-  this.add_contact = function(value, reload, source)
-  {
-    if (value)
-      this.http_post('addcontact', {_address: value, _reload: reload, _source: source});
-  };
+        return true;
+    };
 
-  // send remote request to search mail or contacts
-  this.qsearch = function(value)
-  {
+    this.remove_from_attachment_list = function(name)
+    {
+        delete this.env.attachments[name];
+        $('#'+name).remove();
+    };
+
+    this.remove_attachment = function(name)
+    {
+        if (name && this.env.attachments[name])
+            this.http_post('remove-attachment', { _id:this.env.compose_id, _file:name });
+
+        return false;
+    };
+
+    this.cancel_attachment_upload = function(name)
+    {
+        if (!name || !this.uploads[name])
+            return false;
+
+        this.remove_from_attachment_list(name);
+        this.uploads[name].abort();
+        return false;
+    };
+
+    // rename uploaded attachment (in compose)
+    this.rename_attachment = function(id)
+    {
+        var attachment = this.env.attachments[id];
+
+        if (!attachment)
+            return;
+
+        var input = $('<input>').attr({type: 'text', size: 50}).val(attachment.name),
+            content = $('<label>').text(this.get_label('namex')).append(input);
+
+        this.simple_dialog(content, 'attachmentrename', function() {
+            var name;
+            if ((name = input.val()) && name != attachment.name) {
+                ref.http_post('rename-attachment', {_id: ref.env.compose_id, _file: id, _name: name},
+                    ref.set_busy(true, 'loading'));
+                return true;
+            }
+        }
+        );
+    };
+
+    // update attachments list with the new name
+    this.rename_attachment_handler = function(id, name)
+    {
+        var attachment = this.env.attachments[id];
+
+        if (!attachment || !name)
+            return;
+
+        attachment.name = name;
+
+        $('#' + id + ' .attachment-name').text(name).attr('title', '');
+    };
+
+    // send remote request to add a new contact
+    this.add_contact = function(value, reload, source)
+    {
+        if (value)
+            this.http_post('addcontact', {_address: value, _reload: reload, _source: source});
+    };
+
+    // send remote request to search mail or contacts
+    this.qsearch = function(value)
+    {
     // Note: Some plugins would like to do search without value,
     // so we keep value != '' check to allow that use-case. Which means
     // e.g. that qsearch() with no argument will execute the search.
-    if (value != '' || $(this.gui_objects.qsearchbox).val() || $(this.gui_objects.search_interval).val()) {
-      var r, lock = this.set_busy(true, 'searching'),
-        url = this.search_params(value),
-        action = this.env.action == 'compose' && this.contact_list ? 'search-contacts' : 'search';
+        if (value != '' || $(this.gui_objects.qsearchbox).val() || $(this.gui_objects.search_interval).val()) {
+            var r, lock = this.set_busy(true, 'searching'),
+                url = this.search_params(value),
+                action = this.env.action == 'compose' && this.contact_list ? 'search-contacts' : 'search';
 
-      if (this.message_list)
-        this.clear_message_list();
-      else if (this.contact_list)
-        this.list_contacts_clear();
+            if (this.message_list)
+                this.clear_message_list();
+            else if (this.contact_list)
+                this.list_contacts_clear();
 
-      if (this.env.source)
-        url._source = this.env.source;
-      if (this.env.group)
-        url._gid = this.env.group;
+            if (this.env.source)
+                url._source = this.env.source;
+            if (this.env.group)
+                url._gid = this.env.group;
 
-      // reset vars
-      this.env.current_page = 1;
+            // reset vars
+            this.env.current_page = 1;
 
-      r = this.http_request(action, url, lock);
+            r = this.http_request(action, url, lock);
 
-      this.env.qsearch = {lock: lock, request: r};
-      this.enable_command('set-listmode', this.env.threads && (this.env.search_scope || 'base') == 'base');
+            this.env.qsearch = {lock: lock, request: r};
+            this.enable_command('set-listmode', this.env.threads && (this.env.search_scope || 'base') == 'base');
 
-      return true;
-    }
-
-    return false;
-  };
-
-  this.continue_search = function(request_id)
-  {
-    var lock = this.set_busy(true, 'stillsearching');
-
-    setTimeout(function() {
-      var url = ref.search_params();
-      url._continue = request_id;
-      ref.env.qsearch = { lock: lock, request: ref.http_request('search', url, lock) };
-    }, 100);
-  };
-
-  // build URL params for search
-  this.search_params = function(search, filter)
-  {
-    var n, url = {}, mods_arr = [],
-      mods = this.env.search_mods,
-      scope = this.env.search_scope || 'base',
-      mbox = this.env.mailbox;
-
-    if (!filter && this.gui_objects.search_filter)
-      filter = this.gui_objects.search_filter.value;
-
-    if (!search && this.gui_objects.qsearchbox)
-      search = this.gui_objects.qsearchbox.value;
-
-    if (this.gui_objects.search_interval)
-      url._interval = $(this.gui_objects.search_interval).val();
-
-    if (search) {
-      url._q = search;
-
-      if (mods && this.message_list)
-        mods = mods[mbox] || mods['*'];
-
-      if (mods) {
-        for (n in mods)
-          mods_arr.push(n);
-        url._headers = mods_arr.join(',');
-      }
-    }
-
-    url._layout = this.env.layout;
-    url._filter = filter;
-    url._scope = scope;
-    url._mbox = mbox;
-
-    return url;
-  };
-
-  // reset search filter
-  this.reset_search_filter = function()
-  {
-    this.filter_disabled = true;
-    if (this.gui_objects.search_filter)
-      $(this.gui_objects.search_filter).val('ALL').change();
-    this.filter_disabled = false;
-  };
-
-  // reset quick-search form
-  this.reset_qsearch = function(all)
-  {
-    if (this.gui_objects.qsearchbox)
-      this.gui_objects.qsearchbox.value = '';
-
-    if (this.gui_objects.search_interval)
-      $(this.gui_objects.search_interval).val('');
-
-    if (this.env.qsearch)
-      this.abort_request(this.env.qsearch);
-
-    if (all) {
-      this.env.search_scope = this.env.search_scope || 'base';
-      this.reset_search_filter();
-    }
-
-    this.env.qsearch = null;
-    this.env.search_request = null;
-    this.env.search_id = null;
-    this.select_all_mode = false;
-
-    this.enable_command('set-listmode', this.env.threads);
-  };
-
-  this.set_searchscope = function(scope)
-  {
-    this.env.search_scope = scope;
-  };
-
-  this.set_searchinterval = function(interval)
-  {
-    this.env.search_interval = interval;
-  };
-
-  this.set_searchmods = function(mods)
-  {
-    var mbox = this.env.mailbox,
-      scope = this.env.search_scope || 'base';
-
-    if (!this.env.search_mods)
-      this.env.search_mods = {};
-
-    if (mbox)
-      this.env.search_mods[mbox] = mods;
-  };
-
-  this.is_multifolder_listing = function()
-  {
-    return this.env.multifolder_listing !== undefined ? this.env.multifolder_listing :
-      (this.env.search_request && (this.env.search_scope || 'base') != 'base');
-  };
-
-  // action executed after mail is sent
-  this.sent_successfully = function(type, msg, folders, save_error)
-  {
-    this.display_message(msg, type);
-    this.compose_skip_unsavedcheck = true;
-
-    if (this.env.extwin) {
-      if (!save_error)
-        this.lock_form(this.gui_objects.messageform);
-
-      var filter = {task: 'mail', action: ''},
-        rc = this.opener(false, filter) || this.opener(true, filter);
-
-      if (rc) {
-        rc.display_message(msg, type);
-        // refresh the folder where sent message was saved or replied message comes from
-        if (folders && $.inArray(rc.env.mailbox, folders) >= 0) {
-          rc.command('checkmail');
-        }
-      }
-
-      if (!save_error)
-        setTimeout(function() { window.close(); }, 1000);
-    }
-    else if (!save_error) {
-      // before redirect we need to wait some time for Chrome (#1486177)
-      setTimeout(function() { ref.list_mailbox(); }, 500);
-    }
-
-    if (save_error)
-      this.env.is_sent = true;
-  };
-
-  this.image_rotate = function()
-  {
-    var curr = this.image_style ? (this.image_style.rotate || 0) : 0;
-
-    this.image_style.rotate = curr > 180 ? 0 : curr + 90;
-    this.apply_image_style();
-  };
-
-  this.image_scale = function(prop)
-  {
-    var curr = this.image_style ? (this.image_style.scale || 1) : 1;
-
-    this.image_style.scale = Math.max(0.1, curr + 0.1 * (prop == '-' ? -1 : 1));
-    this.apply_image_style();
-  };
-
-  this.apply_image_style = function()
-  {
-    var style = [],
-      head = $(this.gui_objects.messagepartframe).contents().find('head');
-
-    $('#image-style', head).remove();
-
-    $.each({scale: '', rotate: 'deg'}, function(i, v) {
-      var val = ref.image_style[i];
-      if (val)
-        style.push(i + '(' + val + v + ')');
-    });
-
-    if (style)
-      head.append($('<style id="image-style">').text('img { transform: ' + style.join(' ') + '}'));
-  };
-
-  // Update import dialog state
-  this.import_state_set = function(state)
-  {
-    if (this.import_dialog) {
-      this.import_state = state;
-
-      var button = $(this.import_dialog).parent().find('.ui-dialog-buttonset > button').first();
-
-      if (state != 'error') {
-        // replace Import/Cancel buttons with Close button
-        button.hide();
-        button.next().text(this.gettext('close')).focus();
-      }
-      else {
-        // activate the Import button
-        button.prop('disabled', false);
-      }
-    }
-  };
-
-
-  /*********************************************************/
-  /*********     keyboard live-search methods      *********/
-  /*********************************************************/
-
-  // handler for keyboard events on address-fields
-  this.ksearch_keydown = function(e, obj, props)
-  {
-    if (this.ksearch_timer)
-      clearTimeout(this.ksearch_timer);
-
-    var key = rcube_event.get_keycode(e);
-
-    switch (key) {
-      case 38:  // arrow up
-      case 40:  // arrow down
-        if (!this.ksearch_visible())
-          return;
-
-        var dir = key == 38 ? 1 : 0,
-          highlight = this.ksearch_pane.find('li.selected')[0];
-
-        if (!highlight)
-          highlight = this.ksearch_pane.__ul.firstChild;
-
-        if (highlight)
-          this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);
-
-        return rcube_event.cancel(e);
-
-      case 9:   // tab
-        if (rcube_event.get_modifier(e) == SHIFT_KEY || !this.ksearch_visible()) {
-          this.ksearch_hide();
-          return;
+            return true;
         }
 
-      case 13:  // enter
-        if (!this.ksearch_visible())
-          return false;
-
-        // insert selected address and hide ksearch pane
-        this.insert_recipient(this.ksearch_selected);
-        this.ksearch_hide();
-
-        // Don't cancel on Tab, we want to jump to the next field (#5659)
-        return key == 9 ? null : rcube_event.cancel(e);
-
-      case 27:  // escape
-        this.ksearch_hide();
-        return;
-
-      case 37:  // left
-      case 39:  // right
-        return;
-    }
-
-    // start timer
-    this.ksearch_timer = setTimeout(function() { ref.ksearch_get_results(props); }, 200);
-    this.ksearch_input = obj;
-
-    return true;
-  };
-
-  this.ksearch_visible = function()
-  {
-    return this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value;
-  };
-
-  this.ksearch_select = function(node)
-  {
-    if (this.ksearch_pane && node) {
-      this.ksearch_pane.find('li.selected').removeClass('selected').removeAttr('aria-selected');
-    }
-
-    if (node) {
-      $(node).addClass('selected').attr('aria-selected', 'true');
-      this.ksearch_selected = node._rcm_id;
-      $(this.ksearch_input).attr('aria-activedescendant', 'rcmkSearchItem' + this.ksearch_selected);
-    }
-  };
-
-  this.insert_recipient = function(id)
-  {
-    if (id === null || !this.env.contacts[id] || !this.ksearch_input)
-      return;
-
-    var trigger = false, insert = '', delim = ', ',
-      contact = this.env.contacts[id];
-
-    this.ksearch_destroy();
-
-    // insert all members of a group
-    if (typeof contact === 'object' && contact.type == 'group' && !contact.email && contact.id) {
-      // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
-      var name = '\u200b' + contact.name + '\u200b';
-      insert = name + delim;
-      this.group2expand[contact.id] = {name: name, input: this.ksearch_input};
-      this.http_request('mail/group-expand', {_source: contact.source, _gid: contact.id}, false);
-    }
-    else if (typeof contact === 'object' && contact.name) {
-      insert = contact.name + delim;
-      trigger = true;
-    }
-    else if (typeof contact === 'string') {
-      insert = contact + delim;
-      trigger = true;
-    }
-
-    this.ksearch_input_replace(this.ksearch_value, insert, null, trigger);
-
-    if (trigger) {
-      this.triggerEvent('autocomplete_insert', {
-          field: this.ksearch_input,
-          insert: insert,
-          data: contact,
-          search: this.ksearch_value_last,
-          result_type: 'person'
-      });
-
-      this.ksearch_value_last = null;
-      this.compose_type_activity++;
-    }
-  };
-
-  this.replace_group_recipients = function(id, recipients)
-  {
-    var data = this.group2expand[id];
-
-    if (data) {
-      this.ksearch_input_replace(data.name, recipients, data.input);
-
-      this.triggerEvent('autocomplete_insert', {
-          field: data.input,
-          insert: recipients,
-          data: data,
-          search: this.ksearch_value_last,
-          result_type: 'group'
-      });
-
-      this.ksearch_value_last = null;
-      this.group2expand[id] = null;
-      this.compose_type_activity++;
-    }
-  };
-
-  // address search processor
-  this.ksearch_get_results = function(props)
-  {
-    if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
-      this.ksearch_pane.hide();
-
-    // get string from cursor position back to the last comma or semicolon
-    var q = this.ksearch_input_get(),
-      min = this.env.autocomplete_min_length,
-      data = this.ksearch_data;
-
-    // trim query string
-    q = q.trim();
-
-    // Don't (re-)search if the last results are still active
-    if (q == this.ksearch_value)
-      return;
-
-    this.ksearch_destroy();
-
-    if (q.length && q.length < min) {
-      if (!this.ksearch_info) {
-        this.ksearch_info = this.display_message(this.get_label('autocompletechars').replace('$min', min));
-      }
-      return;
-    }
-
-    var old_value = this.ksearch_value;
-    this.ksearch_value = q;
-    this.ksearch_value_last = q;   // Group expansion clears ksearch_value before calling autocomplete_insert trigger, therefore store it in separate variable for later consumption.
-
-    // ...string is empty
-    if (!q.length)
-      return;
-
-    // ...new search value contains old one and previous search was not finished or its result was empty
-    if (old_value && old_value.length && q.startsWith(old_value) && (!data || data.num <= 0) && this.env.contacts && !this.env.contacts.length)
-      return;
-
-    var sources = props && props.sources ? props.sources : [''];
-    var reqid = this.multi_thread_http_request({
-      items: sources,
-      threads: props && props.threads ? props.threads : 1,
-      action:  props && props.action ? props.action : 'mail/autocomplete',
-      postdata: { _search:q, _source:'%s' },
-      lock: this.display_message('searching', 'loading')
-    });
-
-    this.ksearch_data = { id:reqid, sources:sources.slice(), num:sources.length };
-  };
-
-  this.ksearch_query_results = function(results, search, reqid)
-  {
-    // trigger multi-thread http response callback
-    this.multi_thread_http_response(results, reqid);
-
-    // search stopped in meantime?
-    if (!this.ksearch_value)
-      return;
-
-    // ignore this outdated search response
-    if (this.ksearch_input && search != this.ksearch_value)
-      return;
-
-    // display search results
-    var i, id, len, ul, text, type, init,
-      is_framed = this.is_framed(),
-      value = this.ksearch_value,
-      maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;
-
-    // create results pane if not present
-    if (!this.ksearch_pane) {
-      ul = $('<ul>');
-      this.ksearch_pane = $('<div>')
-        .attr({id: 'rcmKSearchpane', role: 'listbox', 'class': 'select-menu inline'})
-        .css({position: 'absolute', 'z-index': 30000})
-        .append(ul)
-        .appendTo(is_framed ? parent.document.body : document.body);
-
-      this.ksearch_pane.__ul = ul[0];
-      this.triggerEvent('autocomplete_create', {obj: this.ksearch_pane});
-    }
-
-    ul = this.ksearch_pane.__ul;
-
-    // remove all search results or add to existing list if parallel search
-    if (reqid && this.ksearch_pane.data('reqid') == reqid) {
-      maxlen -= ul.childNodes.length;
-    }
-    else {
-      this.ksearch_pane.data('reqid', reqid);
-      init = 1;
-      // reset content
-      ul.innerHTML = '';
-      this.env.contacts = [];
-
-      // Calculate the results pane position and size
-      // Elastic: On small screen we use the width/position of the whole .ac-input element (input's parent)
-      var is_composite_input = $('html').is('.layout-small,.layout-phone') && $(this.ksearch_input).parents('.ac-input').length == 1,
-        input = is_composite_input ? $(this.ksearch_input).parents('.ac-input')[0] : $(this.ksearch_input)[0],
-        pos = $(input).offset();
-
-      // ... consider scroll position
-      pos.left -= $(document.documentElement).scrollLeft();
-      pos.top -= $(document.documentElement).scrollTop();
-
-      // ... consider iframe position
-      if (is_framed) {
-        try {
-          parent.$('iframe').each(function() {
-            if (this.contentWindow == window) {
-              var offset = $(this).offset();
-              pos.left += offset.left;
-              pos.top += offset.top;
-            }
-          });
-        }
-        catch(e) {}
-      }
-
-      var w = $(is_framed ? parent : window).width(),
-        input_width = $(input).outerWidth(),
-        left = w - pos.left > 200 ? pos.left : w - 200,
-        top = (pos.top + input.offsetHeight + 1),
-        width = Math.min(400, w - left);
-
-      this.ksearch_pane.css({
-        left: (is_composite_input ? pos.left : left) + 'px',
-        top: top + 'px',
-        maxWidth: (is_composite_input ? input_width : width) + 'px',
-        minWidth: '200px',
-        width: is_composite_input ? (input_width + 'px') : 'auto',
-        display: 'none'
-      });
-    }
-
-    // add each result line to list
-    if (results && (len = results.length)) {
-      for (i=0; i < len && maxlen > 0; i++) {
-        text = typeof results[i] === 'object' ? (results[i].display || results[i].name) : results[i];
-        type = typeof results[i] === 'object' ? results[i].type : '';
-        id = i + this.env.contacts.length;
-        $('<li>').attr({id: 'rcmkSearchItem' + id, role: 'option'})
-          .html('<i class="icon"></i>' + this.quote_html(text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%')).replace(/##([^%]+)%%/g, '<b>$1</b>'))
-          .addClass(type || '')
-          .appendTo(ul)
-          .mouseover(function() { ref.ksearch_select(this); })
-          .mouseup(function() { ref.ksearch_click(this); })
-          .get(0)._rcm_id = id;
-        maxlen -= 1;
-      }
-    }
-
-    if (ul.childNodes.length) {
-      // set the right aria-* attributes to the input field
-      $(this.ksearch_input)
-        .attr({'aria-haspopup': 'true', 'aria-expanded': 'true', 'aria-owns': 'rcmKSearchpane'});
-
-      this.ksearch_pane.show();
-
-      // select the first
-      if (!this.env.contacts.length) {
-        this.ksearch_select($('li', ul)[0]);
-      }
-    }
-
-    if (len)
-      this.env.contacts = this.env.contacts.concat(results);
-
-    if (this.ksearch_data.id == reqid)
-      this.ksearch_data.num--;
-  };
-
-  // Getter for input value
-  // returns a string from the last comma to current cursor position
-  this.ksearch_input_get = function()
-  {
-    if (!this.ksearch_input)
-      return '';
-
-    var cp = this.get_caret_pos(this.ksearch_input);
-
-    return this.ksearch_input.value.substr(0, cp).split(/[,;]/).pop();
-  };
-
-  // Setter for input value
-  // replaces 'from' string with 'to' and sets cursor position at the end
-  this.ksearch_input_replace = function(from, to, input, trigger)
-  {
-    if (!this.ksearch_input && !input)
-      return;
-
-    if (!input)
-      input = this.ksearch_input;
-
-    var cpos = this.get_caret_pos(input),
-      p = input.value.lastIndexOf(from, cpos),
-      pre = input.value.substring(0, p),
-      end = input.value.substring(p + from.length, input.value.length);
-
-    input.value = pre + to + end;
-
-    // set caret to insert pos
-    this.set_caret_pos(input, cpos + to.length - from.length);
-
-    // run onchange action on the element
-    $(input).trigger('change', [true, trigger]);
-  };
-
-  this.ksearch_click = function(node)
-  {
-    if (this.ksearch_input)
-      this.ksearch_input.focus();
-
-    this.insert_recipient(node._rcm_id);
-    this.ksearch_hide();
-  };
-
-  this.ksearch_blur = function()
-  {
-    if (this.ksearch_timer)
-      clearTimeout(this.ksearch_timer);
-
-    this.ksearch_input = null;
-    this.ksearch_hide();
-  };
-
-  this.ksearch_hide = function()
-  {
-    this.ksearch_selected = null;
-    this.ksearch_value = '';
-
-    if (this.ksearch_pane)
-      this.ksearch_pane.hide();
-
-    $(this.ksearch_input)
-      .attr({'aria-haspopup': 'false', 'aria-expanded': 'false'})
-      .removeAttr('aria-activedescendant')
-      .removeAttr('aria-owns');
-
-    this.ksearch_destroy();
-  };
-
-  // Clears autocomplete data/requests
-  this.ksearch_destroy = function()
-  {
-    if (this.ksearch_data)
-      this.multi_thread_request_abort(this.ksearch_data.id);
-
-    if (this.ksearch_info)
-      this.hide_message(this.ksearch_info);
-
-    if (this.ksearch_msg)
-      this.hide_message(this.ksearch_msg);
-
-    this.ksearch_data = null;
-    this.ksearch_info = null;
-    this.ksearch_msg = null;
-  };
-
-
-  /*********************************************************/
-  /*********         address book methods          *********/
-  /*********************************************************/
-
-  this.contactlist_select = function(list)
-  {
-    if (this.preview_timer)
-      clearTimeout(this.preview_timer);
-
-    var id, targets,
-      groupcount = 0,
-      writable = false,
-      deletable = false,
-      copy_writable = false,
-      selected = list.get_selection().length,
-      source = this.env.source ? this.env.address_sources[this.env.source] : null;
-
-    // we don't have dblclick handler here, so use 50 instead of this.dblclick_time
-    if (this.env.contentframe && !list.multi_selecting && (id = list.get_single_selection()))
-      this.preview_timer = setTimeout(function() { ref.load_contact(id, 'show'); }, this.preview_delay_click);
-    else if (this.env.contentframe)
-      this.show_contentframe(false);
-
-    if (selected) {
-      list.draggable = false;
-
-      // no source = search result, we'll need to detect if any of
-      // selected contacts are in writable addressbook to enable edit/delete
-      // we'll also need to know sources used in selection for copy
-      // and group-addmember operations (drag&drop)
-      this.env.selection_sources = [];
-
-      if (source) {
-        this.env.selection_sources.push(this.env.source);
-      }
-
-      $.each(list.get_selection(), function(i, v) {
-        var book, sid, contact = list.data[v];
-        if (!source) {
-          sid = String(v).replace(/^[^-]+-/, '');
-          book = sid ? ref.env.address_sources[sid] : null;
-
-          if (book) {
-            writable = writable || (!book.readonly && !contact.readonly);
-            deletable = deletable || book.deletable === true;
-            ref.env.selection_sources.push(sid);
-          }
-        }
-        else {
-          writable = writable || (!source.readonly && !contact.readonly);
-          deletable = deletable || source.deletable === true;
-        }
-
-        if (contact._type != 'group')
-          list.draggable = true;
-      });
-
-      this.env.selection_sources = $.unique(this.env.selection_sources);
-
-      if (source && source.groups)
-        $.each(this.env.contactgroups, function() { if (this.source === ref.env.source) groupcount++; });
-
-      targets = $.map(this.env.address_sources, function(v, i) { return v.readonly ? null : i; });
-      copy_writable = $.grep(targets, function(v) { return jQuery.inArray(v, ref.env.selection_sources) < 0; }).length > 0;
-    }
-
-    // if a group is currently selected, and there is at least one contact selected
-    // we can enable the group-remove-selected command
-    this.enable_command('group-assign-selected', groupcount > 0 && writable);
-    this.enable_command('group-remove-selected', this.env.group && writable);
-    this.enable_command('print', 'qrcode', selected == 1);
-    this.enable_command('export-selected', selected > 0);
-    this.enable_command('edit', id && writable);
-    this.enable_command('delete', 'move', writable || deletable);
-    this.enable_command('copy', copy_writable);
-
-    return false;
-  };
-
-  this.list_contacts = function(src, group, page, search)
-  {
-    var win, folder, index = -1, url = {},
-      refresh = src === undefined && group === undefined && page === undefined,
-      target = window;
-
-    if (!src)
-      src = this.env.source;
-
-    if (refresh)
-      group = this.env.group;
-
-    if (src != this.env.source) {
-      page = this.env.current_page = 1;
-      this.reset_qsearch();
-    }
-    else if (!refresh && group != this.env.group)
-      page = this.env.current_page = 1;
-
-    if (this.env.search_id)
-      folder = 'S'+this.env.search_id;
-    else if (!this.env.search_request)
-      folder = group ? 'G'+src+group : src;
-
-    this.env.source = this.env.last_source = src;
-    this.env.group = this.env.last_group = group;
-
-    // truncate groups listing stack
-    $.each(this.env.address_group_stack, function(i, v) {
-      if (ref.env.group == v.id) {
-        index = i;
         return false;
-      }
-    });
-
-    this.env.address_group_stack = index < 0 ? [] : this.env.address_group_stack.slice(0, index);
-
-    // remove cached contact group selector
-    this.destroy_entity_selector('contactgroup-selector');
-
-    // make sure the current group is on top of the stack
-    if (this.env.group) {
-      if (!search) search = {};
-      search.id = this.env.group;
-      this.env.address_group_stack.push(search);
-
-      // mark the first group on the stack as selected in the directory list
-      folder = 'G'+src+this.env.address_group_stack[0].id;
-    }
-    else if (this.gui_objects.addresslist_title) {
-        $(this.gui_objects.addresslist_title).text(this.get_label('contacts'));
-    }
-
-    if (!this.env.search_id)
-      this.select_folder(folder, '', true);
-
-    // load contacts remotely
-    if (this.gui_objects.contactslist) {
-      this.list_contacts_remote(src, group, page);
-      return;
-    }
-
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      target = win;
-      url._framed = 1;
-    }
-
-    if (group)
-      url._gid = group;
-    if (page)
-      url._page = page;
-    if (src)
-      url._source = src;
-
-    // also send search request to get the correct listing
-    if (this.env.search_request)
-      url._search = this.env.search_request;
-
-    this.set_busy(true, 'loading');
-    this.location_href(url, target);
-  };
-
-  // send remote request to load contacts list
-  this.list_contacts_remote = function(src, group, page)
-  {
-    // clear message list first
-    this.list_contacts_clear();
-
-    // send request to server
-    var url = {}, lock = this.set_busy(true, 'loading');
-
-    if (src)
-      url._source = src;
-    if (page)
-      url._page = page;
-    if (group)
-      url._gid = group;
-
-    this.env.source = src;
-    this.env.group = group;
-
-    // also send search request to get the right records
-    if (this.env.search_request)
-      url._search = this.env.search_request;
-
-    this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
-
-    if (this.env.task != 'mail')
-      this.update_state({_source: src, _page: page && page > 1 ? page : null, _gid: group});
-  };
-
-  this.list_contacts_clear = function()
-  {
-    this.contact_list.data = {};
-    this.contact_list.clear(true);
-    this.show_contentframe(false);
-    this.enable_command('delete', 'move', 'copy', 'print', false);
-  };
-
-  this.set_group_prop = function(prop)
-  {
-    if (this.gui_objects.addresslist_title) {
-      var boxtitle = $(this.gui_objects.addresslist_title).html('');  // clear contents
-
-      // add link to pop back to parent group
-      if (this.env.address_group_stack.length > 1
-        || (this.env.address_group_stack.length == 1 && this.env.address_group_stack[0].search_request)
-      ) {
-        var link = $('<a href="#list">...</a>')
-          .attr({title: this.get_label('uponelevel'), 'class': 'poplink'})
-          .click(function() { return ref.command('popgroup', '', this); });
-
-        boxtitle.append(link).append('&nbsp;&raquo;&nbsp;');
-      }
-
-      boxtitle.append($('<span>').text(prop ? prop.name : this.get_label('contacts')));
-    }
-  };
-
-  // load contact record
-  this.load_contact = function(cid, action, framed)
-  {
-    var win, url = {}, target = window,
-      rec = this.contact_list ? this.contact_list.data[cid] : null;
-
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      url._framed = 1;
-      target = win;
-      this.show_contentframe(true);
-
-      // load dummy content, unselect selected row(s)
-      if (!cid)
-        this.contact_list.clear_selection();
-
-      this.enable_command('export-selected', 'print', rec && rec._type != 'group');
-    }
-    else if (framed)
-      return false;
-
-    if (action && (cid || action == 'add') && !this.drag_active) {
-      if (this.env.group)
-        url._gid = this.env.group;
-
-      if (this.env.search_request)
-        url._search = this.env.search_request;
-
-      if (cid)
-        url._cid = this.preview_id = cid;
-
-      url._action = action;
-      url._source = this.env.source;
-
-      this.location_href(url, target, true);
-    }
-
-    return true;
-  };
-
-  // add/delete member to/from the group
-  this.group_member_change = function(what, cid, source, gid)
-  {
-    if (what != 'add')
-      what = 'del';
-
-    var lock = this.display_message(what == 'add' ? 'addingmember' : 'removingmember', 'loading'),
-      post_data = {_cid: cid, _source: source, _gid: gid};
-
-    this.http_post('group-'+what+'members', post_data, lock);
-  };
-
-  this.contacts_drag_menu = function(e, to)
-  {
-    var dest = to.type == 'group' ? to.source : to.id,
-      source = this.env.source;
-
-    if (!this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
-      return true;
-
-    // search result may contain contacts from many sources, but if there is only one...
-    if (source == '' && this.env.selection_sources.length == 1)
-      source = this.env.selection_sources[0];
-
-    if (to.type == 'group' && dest == source) {
-      var cid = this.contact_list.get_selection().join(',');
-      this.group_member_change('add', cid, dest, to.id);
-      return true;
-    }
-    // move action is not possible, "redirect" to copy if menu wasn't requested
-    else if (!this.commands.move && rcube_event.get_modifier(e) != SHIFT_KEY) {
-      this.copy_contacts(to);
-      return true;
-    }
-
-    return this.drag_menu(e, to);
-  };
-
-  // copy contact(s) to the specified target (group or directory)
-  this.copy_contacts = function(to, event, cid)
-  {
-    if (!to) {
-      cid = this.contact_list.get_selection();
-      return this.addressbook_selector(event, function(to, obj) {
-          var to = $(obj).data('source') ? ref.env.contactgroups['G' + $(obj).data('source') + $(obj).data('gid')] : ref.env.address_sources[to];
-          ref.copy_contacts(to, null, cid);
-        });
-    }
-
-    var dest = to.type == 'group' ? to.source : to.id,
-      source = this.env.source,
-      group = this.env.group ? this.env.group : '';
-
-    cid = cid ? cid.join(',') : this.contact_list.get_selection().join(',');
-
-    if (!cid || !this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
-      return;
-
-    // search result may contain contacts from many sources, but if there is only one...
-    if (source == '' && this.env.selection_sources.length == 1)
-      source = this.env.selection_sources[0];
-
-    // target is a group
-    if (to.type == 'group') {
-      if (dest == source)
-        return;
-
-      var lock = this.display_message('copyingcontact', 'loading'),
-        post_data = {_cid: cid, _source: this.env.source, _to: dest, _togid: to.id, _gid: group};
-
-      this.http_post('copy', post_data, lock);
-    }
-    // target is an addressbook
-    else if (to.id != source) {
-      var lock = this.display_message('copyingcontact', 'loading'),
-        post_data = {_cid: cid, _source: this.env.source, _to: to.id, _gid: group};
-
-      this.http_post('copy', post_data, lock);
-    }
-  };
-
-  // move contact(s) to the specified target (group or directory)
-  this.move_contacts = function(to, event, cid)
-  {
-    if (!to) {
-      cid = this.contact_list.get_selection();
-      return this.addressbook_selector(event, function(to, obj) {
-          var to = $(obj).data('source') ? ref.env.contactgroups['G' + $(obj).data('source') + $(obj).data('gid')] : ref.env.address_sources[to];
-          ref.move_contacts(to, null, cid);
-        });
-    }
-
-    var dest = to.type == 'group' ? to.source : to.id,
-      source = this.env.source,
-      group = this.env.group ? this.env.group : '';
-
-    if (!this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
-      return;
-
-    if (!cid)
-      cid = this.contact_list.get_selection();
-
-    // search result may contain contacts from many sources, but if there is only one...
-    if (source == '' && this.env.selection_sources.length == 1)
-      source = this.env.selection_sources[0];
-
-    if (to.type == 'group') {
-      if (dest == source)
-        return;
-
-      this._with_selected_contacts('move', {_to: dest, _togid: to.id, _cid: cid});
-    }
-    // target is an addressbook
-    else if (to.id != source)
-      this._with_selected_contacts('move', {_to: to.id, _cid: cid});
-  };
-
-  // delete contact(s)
-  this.delete_contacts = function()
-  {
-    var undelete = this.env.source && this.env.address_sources[this.env.source].undelete;
-
-    if (undelete) {
-      this._with_selected_contacts('delete', {_cid: this.contact_list.get_selection()});
-    }
-    else {
-      var cid = this.contact_list.get_selection();
-      this.confirm_dialog(this.get_label('deletecontactconfirm'), 'delete', function() {
-        ref._with_selected_contacts('delete', {_cid: cid});
-      });
-    }
-  };
-
-  this._with_selected_contacts = function(action, post_data)
-  {
-    var selection = post_data._cid;
-
-    // exit if no contact specified or if selection is empty
-    if (!selection.length && !this.env.cid)
-      return;
-
-    var n, a_cids = [],
-      label = action == 'delete' ? 'contactdeleting' : 'movingcontact',
-      lock = this.display_message(label, 'loading'),
-      display_next = this.check_display_next();
-
-    if (this.env.cid)
-      a_cids.push(this.env.cid);
-    else {
-      for (n=0; n<selection.length; n++) {
-        id = selection[n];
-        a_cids.push(id);
-        this.contact_list.remove_row(id, display_next && n == selection.length-1);
-      }
-
-      if (!display_next)
-        this.contact_list.clear_selection();
-    }
-
-    if (!post_data)
-      post_data = {};
-
-    post_data._source = this.env.source;
-    post_data._from = this.env.action;
-    post_data._cid = a_cids.join(',');
-
-    if (this.env.group)
-      post_data._gid = this.env.group;
-
-    // also send search request to get the right records from the next page
-    if (this.env.search_request)
-      post_data._search = this.env.search_request;
-
-    // send request to server
-    this.http_post(action, post_data, lock)
-
-    return true;
-  };
-
-  // update a contact record in the list
-  this.update_contact_row = function(cid, cols_arr, newcid, source, data)
-  {
-    var list = this.contact_list;
-
-    cid = this.html_identifier(cid);
-
-    // when in searching mode, concat cid with the source name
-    if (!list.rows[cid]) {
-      cid = cid + '-' + source;
-      if (newcid)
-        newcid = newcid + '-' + source;
-    }
-
-    list.update_row(cid, cols_arr, newcid, true);
-    list.data[cid] = data;
-  };
-
-  // add row to contacts list
-  this.add_contact_row = function(cid, cols, classes, data)
-  {
-    if (!this.gui_objects.contactslist)
-      return false;
-
-    var c, col, list = this.contact_list,
-      row = { cols:[] };
-
-    row.id = 'rcmrow' + this.html_identifier(cid);
-    row.className = 'contact ' + (classes || '');
-
-    if (list.in_selection(cid))
-      row.className += ' selected';
-
-    // add each submitted col
-    for (c in cols) {
-      col = {};
-      col.className = String(c).toLowerCase();
-      col.innerHTML = cols[c];
-      row.cols.push(col);
-    }
-
-    // store data in list member
-    list.data[cid] = data;
-    list.insert_row(row);
-
-    this.enable_command('export', list.rowcount > 0);
-  };
-
-  this.init_contact_form = function()
-  {
-    var col;
-
-    if (this.env.coltypes) {
-      this.set_photo_actions($('#ff_photo').val());
-      for (col in this.env.coltypes)
-        this.init_edit_field(col, null);
-    }
-
-    $('.contactfieldgroup .row a.deletebutton').click(function() {
-      ref.delete_edit_field(this);
-      return false;
-    });
-
-    $('select.addfieldmenu').change(function() {
-      ref.insert_edit_field($(this).val(), $(this).attr('rel'), this);
-      this.selectedIndex = 0;
-    });
-
-    // enable date pickers on date fields
-    if ($.datepicker && this.env.date_format) {
-      $.datepicker.setDefaults({
-        dateFormat: this.env.date_format,
-        changeMonth: true,
-        changeYear: true,
-        yearRange: '-120:+10',
-        showOtherMonths: true,
-        selectOtherMonths: true
-      });
-      $('input.datepicker').datepicker();
-    }
-
-    // Submit search form on Enter
-    if (this.env.action == 'search')
-      $(this.gui_objects.editform).append($('<input type="submit">').hide())
-        .submit(function() { $('input.mainaction').click(); return false; });
-  };
-
-  // group creation dialog
-  this.group_create = function()
-  {
-    var input = $('<input>').attr({type: 'text', 'data-submit': 'true'}),
-      content = $('<label>').text(this.get_label('namex')).append(input),
-      source = this.env.source;
-
-    this.simple_dialog(content, 'newgroup', function() {
-        var name;
-        if (name = input.val()) {
-          ref.http_post('group-create', {_source: source, _name: name},
-            ref.set_busy(true, 'loading'));
-          return true;
-        }
-      });
-  };
-
-  // group rename dialog
-  this.group_rename = function()
-  {
-    if (!this.env.group)
-      return;
-
-    var group_name = this.env.contactgroups['G' + this.env.source + this.env.group].name,
-      input = $('<input>').attr({type: 'text', 'data-submit': 'true'}).val(group_name),
-      content = $('<label>').text(this.get_label('namex')).append(input),
-      source = this.env.source,
-      group = this.env.group;
-
-    this.simple_dialog(content, 'grouprename', function() {
-        var name;
-        if ((name = input.val()) && name != group_name) {
-          ref.http_post('group-rename', {_source: source, _gid: group, _name: name},
-          ref.set_busy(true, 'loading'));
-          return true;
-        }
-      });
-  };
-
-  this.group_delete = function()
-  {
-    if (this.env.group) {
-      var group = this.env.group;
-      this.confirm_dialog(this.get_label('deletegroupconfirm'), 'delete', function() {
-          var lock = ref.set_busy(true, 'groupdeleting');
-          ref.http_post('group-delete', {_source: ref.env.source, _gid: group}, lock);
-        });
-    }
-  };
-
-  // callback from server upon group-delete command
-  this.remove_group_item = function(prop)
-  {
-    var key = 'G' + prop.source + prop.id;
-
-    if (this.treelist.remove(key)) {
-      // make sure there is no cached address book or contact group selectors
-      this.destroy_entity_selector('addressbook-selector');
-      this.destroy_entity_selector('contactgroup-selector');
-
-      this.triggerEvent('group_delete', { source:prop.source, id:prop.id });
-      delete this.env.contactfolders[key];
-      delete this.env.contactgroups[key];
-    }
-
-    if (prop.source == this.env.source && prop.id == this.env.group)
-      this.list_contacts(prop.source, 0);
-  };
-
-  //assign selected contacts to a group
-  this.group_assign_selected = function(props, obj, event)
-  {
-    var cid = ref.contact_list.get_selection();
-    var source = ref.env.source;
-    this.contactgroup_selector(event, function(to) { ref.group_member_change('add', cid, source, to); });
-  };
-
-  //remove selected contacts from current active group
-  this.group_remove_selected = function()
-  {
-    this.http_post('group-delmembers', {_cid: this.contact_list.get_selection(),
-      _source: this.env.source, _gid: this.env.group});
-  };
-
-  //callback after deleting contact(s) from current group
-  this.remove_group_contacts = function(props)
-  {
-    if (this.env.group !== undefined && (this.env.group === props.gid)) {
-      var n, selection = this.contact_list.get_selection(),
-        display_next= this.check_display_next();
-
-      for (n=0; n<selection.length; n++) {
-        id = selection[n];
-        this.contact_list.remove_row(id, display_next && n == selection.length-1);
-      }
-
-      if (!display_next)
-        this.contact_list.clear_selection();
-    }
-  };
-
-  // callback for creating a new contact group
-  this.insert_contact_group = function(prop)
-  {
-    prop.type = 'group';
-
-    var key = 'G'+prop.source+prop.id,
-      link = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.id})
-        .click(function() { return ref.command('listgroup', prop, this); })
-        .text(prop.name);
-
-    this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
-    this.treelist.insert({ id:key, html:link, classes:['contactgroup'] }, prop.source, 'contactgroup');
-
-    // make sure there is no cached address book or contact group selectors
-    this.destroy_entity_selector('addressbook-selector');
-    this.destroy_entity_selector('contactgroup-selector');
-
-    this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key) });
-  };
-
-  // callback for renaming a contact group
-  this.update_contact_group = function(prop)
-  {
-    var key = 'G'+prop.source+prop.id,
-      newnode = {};
-
-    // group ID has changed, replace link node and identifiers
-    if (prop.newid) {
-      var newkey = 'G'+prop.source+prop.newid,
-        newprop = $.extend({}, prop);
-
-      this.env.contactfolders[newkey] = this.env.contactfolders[key];
-      this.env.contactfolders[newkey].id = prop.newid;
-      this.env.group = prop.newid;
-
-      delete this.env.contactfolders[key];
-      delete this.env.contactgroups[key];
-
-      newprop.id = prop.newid;
-      newprop.type = 'group';
-
-      newnode.id = newkey;
-      newnode.html = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.newid})
-        .click(function() { return ref.command('listgroup', newprop, this); })
-        .text(prop.name);
-    }
-    // update displayed group name
-    else {
-      $(this.treelist.get_item(key)).children().first().text(prop.name);
-      this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
-
-      if (prop.source == this.env.source && prop.id == this.env.group)
-        this.set_group_prop(prop);
-    }
-
-    // update list node and re-sort it
-    this.treelist.update(key, newnode, true);
-
-    // make sure there is no cached address book or contact group selectors
-    this.destroy_entity_selector('addressbook-selector');
-    this.destroy_entity_selector('contactgroup-selector');
-
-    this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key), newid:prop.newid });
-  };
-
-  this.update_group_commands = function()
-  {
-    var source = this.env.source != '' ? this.env.address_sources[this.env.source] : null,
-      supported = source && source.groups && !source.readonly;
-
-    this.enable_command('group-create', supported);
-    this.enable_command('group-rename', 'group-delete', supported && this.env.group);
-  };
-
-  this.init_edit_field = function(col, elem)
-  {
-    var label = this.env.coltypes[col].label;
-
-    if (!elem)
-      elem = $('.ff_' + col);
-
-    if (label && !$('label[for="ff_' + col + '"]').length)
-      elem.placeholder(label);
-  };
-
-  this.insert_edit_field = function(col, section, menu)
-  {
-    // just make pre-defined input field visible
-    var elem = $('#ff_' + col);
-    if (elem.length) {
-      $('label[for="ff_' + col + '"]').parent().show();
-      elem.show().focus();
-      $(menu).children('option[value="' + col + '"]').prop('disabled', true);
-    }
-    else {
-      var lastelem = $('.ff_' + col),
-        appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);
-
-      if (!appendcontainer.length) {
-        var sect = $('#contactsection'+section),
-          lastgroup = $('.contactfieldgroup', sect).last();
-        appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
-        if (lastgroup.length)
-          appendcontainer.insertAfter(lastgroup);
-        else
-          sect.prepend(appendcontainer);
-      }
-
-      if (appendcontainer.get(0).nodeName == 'FIELDSET') {
-        var label, input,
-          colprop = this.env.coltypes[col],
-          name_suffix = colprop.limit != 1 ? '[]' : '',
-          compact = $(menu).data('compact') ? true : false,
-          input_id = 'ff_' + col + (colprop.count || 0),
-          row = $('<div>').addClass('row input-group'),
-          cell = $('<div>').addClass('contactfieldcontent ' + colprop.type);
-
-        // Field label
-        if (colprop.subtypes_select) {
-          label = $(colprop.subtypes_select);
-          if (!compact)
-            label = $('<div>').addClass('contactfieldlabel label').append(label);
-          else
-            label.addClass('input-group-prepend');
-        }
-        else {
-          label = $('<label>').addClass('contactfieldlabel label input-group-text')
-            .attr('for', input_id).text(colprop.label);
-
-          if (compact)
-            label = $('<span class="input-group-prepend">').append(label);
-        }
-
-        // Field input
-        if (colprop.type == 'text' || colprop.type == 'date') {
-          input = $('<input>')
-            .addClass('form-control ff_' + col)
-            .attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size, id: input_id});
-
-          this.init_edit_field(col, input);
-
-          if (colprop.type == 'date' && $.datepicker)
-            input.addClass('datepicker').datepicker();
-        }
-        else if (colprop.type == 'textarea') {
-          input = $('<textarea>')
-            .addClass('form-control ff_' + col)
-            .attr({ name: '_' + col + name_suffix, cols: colprop.size, rows: colprop.rows, id: input_id });
-
-          this.init_edit_field(col, input);
-        }
-        else if (colprop.type == 'composite') {
-          var i, childcol, cp, first, templ, cols = [], suffices = [], content = cell;
-
-          row.addClass('composite');
-
-          if (compact)
-            content = $('<div class="content input-group-text">');
-
-          // read template for composite field order
-          if (templ = this.env[col + '_template']) {
-            for (i=0; i < templ.length; i++) {
-              cols.push(templ[i][1]);
-              suffices.push(templ[i][2]);
+    };
+
+    this.continue_search = function(request_id)
+    {
+        var lock = this.set_busy(true, 'stillsearching');
+
+        setTimeout(function() {
+            var url = ref.search_params();
+            url._continue = request_id;
+            ref.env.qsearch = { lock: lock, request: ref.http_request('search', url, lock) };
+        }, 100);
+    };
+
+    // build URL params for search
+    this.search_params = function(search, filter)
+    {
+        var n, url = {}, mods_arr = [],
+            mods = this.env.search_mods,
+            scope = this.env.search_scope || 'base',
+            mbox = this.env.mailbox;
+
+        if (!filter && this.gui_objects.search_filter)
+            filter = this.gui_objects.search_filter.value;
+
+        if (!search && this.gui_objects.qsearchbox)
+            search = this.gui_objects.qsearchbox.value;
+
+        if (this.gui_objects.search_interval)
+            url._interval = $(this.gui_objects.search_interval).val();
+
+        if (search) {
+            url._q = search;
+
+            if (mods && this.message_list)
+                mods = mods[mbox] || mods['*'];
+
+            if (mods) {
+                for (n in mods)
+                    mods_arr.push(n);
+                url._headers = mods_arr.join(',');
             }
-          }
-          else {  // list fields according to appearance in colprop
-            for (childcol in colprop.childs)
-              cols.push(childcol);
-          }
-
-          for (i=0; i < cols.length; i++) {
-            childcol = cols[i];
-            cp = colprop.childs[childcol];
-            input = $('<input>')
-              .addClass('form-control ff_' + childcol)
-              .attr({ type: 'text', name: '_' + childcol + name_suffix, size: cp.size })
-              .appendTo(content);
-
-            if (!compact)
-              content.append(suffices[i] || " ");
-
-            this.init_edit_field(childcol, input);
-            if (!first) first = input;
-          }
-
-          if (compact)
-            input = content;
-          else
-            input = first;  // set focus to the first of this composite fields
-        }
-        else if (colprop.type == 'select') {
-          input = $('<select>')
-            .addClass('custom-select ff_' + col)
-            .attr({ name: '_' + col + name_suffix, id: input_id });
-
-          var options = input.attr('options');
-          options[options.length] = new Option('---', '');
-          if (colprop.options)
-            $.each(colprop.options, function(i, val) { options[options.length] = new Option(val, i); });
         }
 
-        if (input) {
-          var delbutton = $('<a href="#del"></a>')
-            .addClass('contactfieldbutton deletebutton input-group-text icon delete')
-            .attr({title: this.get_label('delete'), rel: col})
-            .html(this.env.delbutton)
-            .click(function() { ref.delete_edit_field(this); return false; });
-
-          row.append(label);
-
-          if (!compact) {
-            if (colprop.type != 'composite')
-              cell.append(input);
-            row.append(cell.append(delbutton));
-          }
-          else {
-            row.append(input).append(delbutton);
-            delbutton.wrap('<span class="input-group-append">');
-          }
-
-          row.appendTo(appendcontainer.show());
-
-          if (input.is('div'))
-            input.find('input').first().focus();
-          else
-            input.first().focus();
-
-          // disable option if limit reached
-          if (!colprop.count) colprop.count = 0;
-          if (++colprop.count == colprop.limit && colprop.limit)
-            $(menu).children('option[value="' + col + '"]').prop('disabled', true);
-
-          this.triggerEvent('insert-edit-field', input);
-        }
-      }
-    }
-  };
-
-  this.delete_edit_field = function(elem)
-  {
-    var col = $(elem).attr('rel'),
-      colprop = this.env.coltypes[col],
-      input_group = $(elem).parents('div.row'),
-      fieldset = $(elem).parents('fieldset.contactfieldgroup'),
-      addmenu = fieldset.parent().find('select.addfieldmenu');
-
-    // just clear input but don't hide the last field
-    if (--colprop.count <= 0 && colprop.visible)
-      input_group.find('input').val('').blur();
-    else {
-      input_group.remove();
-      // hide entire fieldset if no more rows
-      if (!fieldset.children('div.row').length)
-        fieldset.hide();
-    }
-
-    // enable option in add-field selector or insert it if necessary
-    if (addmenu.length) {
-      var option = addmenu.children('option[value="'+col+'"]');
-      if (option.length)
-        option.prop('disabled', false);
-      else
-        option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
-      addmenu.show();
-    }
-  };
-
-  this.upload_contact_photo = function(form)
-  {
-    if (form && form.elements._photo.value) {
-      this.async_upload_form(form, 'upload-photo', function(e) {
-        ref.set_busy(false, null, ref.file_upload_id);
-      });
-
-      // display upload indicator
-      this.file_upload_id = this.set_busy(true, 'uploading');
-    }
-  };
-
-  this.replace_contact_photo = function(id)
-  {
-    var img_src = id == '-del-' ? this.env.photo_placeholder :
-      this.env.comm_path + '&_action=photo&_source=' + this.env.source + '&_cid=' + (this.env.cid || 0) + '&_photo=' + id;
-
-    this.set_photo_actions(id);
-    $(this.gui_objects.contactphoto).children('img').attr('src', img_src);
-  };
-
-  this.photo_upload_end = function()
-  {
-    this.set_busy(false, null, this.file_upload_id);
-    delete this.file_upload_id;
-  };
-
-  this.set_photo_actions = function(id)
-  {
-    var n, buttons = this.buttons['upload-photo'];
-    for (n=0; buttons && n < buttons.length; n++)
-      $('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
-
-    $('#ff_photo').val(id);
-    this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
-    this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-');
-  };
-
-  // load advanced search page
-  this.advanced_search = function()
-  {
-    var dialog = $('<iframe>').attr('src', this.url('search', {_form: 1, _framed: 1})),
-      search_func = function() {
-        var valid = false, form = {_adv: 1};
-
-        $.each($(dialog[0].contentWindow.rcmail.gui_objects.editform).serializeArray(), function() {
-          if (this.name.match(/^_search/) && this.value != '') {
-            form[this.name] = this.value;
-            valid = true;
-          }
-        });
-
-        if (valid) {
-          ref.http_post('search', form, ref.set_busy(true, 'searching'));
-          return true;
-        }
-      };
-
-    this.simple_dialog(dialog, 'advsearch', search_func, {
-      button: 'search',
-      width: 600,
-      height: 500
-    });
-
-    return true;
-  };
-
-  // unselect directory/group
-  this.unselect_directory = function()
-  {
-    this.select_folder('');
-    this.enable_command('search-delete', false);
-  };
-
-  // callback for creating a new saved search record
-  this.insert_saved_search = function(name, id)
-  {
-    var key = 'S'+id,
-      link = $('<a>').attr({href: '#', rel: id})
-        .click(function() { return ref.command('listsearch', id, this); })
-        .html(name),
-      prop = { name:name, id:id };
-
-    this.savedsearchlist.insert({ id:key, html:link, classes:['contactsearch'] }, null, 'contactsearch');
-    this.select_folder(key,'',true);
-    this.enable_command('search-delete', true);
-    this.env.search_id = id;
-
-    this.triggerEvent('abook_search_insert', prop);
-  };
-
-  // creates a dialog for saved search
-  this.search_create = function()
-  {
-    var input = $('<input>').attr('type', 'text'),
-      content = $('<label>').text(this.get_label('namex')).append(input);
-
-    this.simple_dialog(content, 'searchsave',
-      function() {
-        var name;
-        if (name = input.val()) {
-          ref.http_post('search-create', {_search: ref.env.search_request, _name: name},
-            ref.set_busy(true, 'loading'));
-          return true;
-        }
-      }
-    );
-  };
-
-  this.search_delete = function()
-  {
-    if (this.env.search_request) {
-      var lock = this.set_busy(true, 'savedsearchdeleting');
-      this.http_post('search-delete', {_sid: this.env.search_id}, lock);
-    }
-  };
-
-  // callback from server upon search-delete command
-  this.remove_search_item = function(id)
-  {
-    if (this.savedsearchlist.remove('S' + id)) {
-      this.triggerEvent('search_delete', {id: id});
-    }
-
-    this.env.search_id = null;
-    this.env.search_request = null;
-    this.list_contacts_clear();
-    this.reset_qsearch();
-    this.enable_command('search-delete', 'search-create', false);
-  };
-
-  this.listsearch = function(id)
-  {
-    var lock = this.set_busy(true, 'searching');
-
-    if (this.contact_list) {
-      this.list_contacts_clear();
-    }
-
-    this.reset_qsearch();
-
-    if (this.savedsearchlist) {
-      this.treelist.select('');
-      this.savedsearchlist.select('S'+id);
-    }
-    else
-      this.select_folder('S'+id, '', true);
-
-    // reset vars
-    this.env.current_page = 1;
-    this.http_request('search', {_sid: id}, lock);
-  };
-
-  // display a dialog with QR code image
-  this.qrcode = function()
-  {
-    var img = new Image(300, 300);
-
-    img.src = this.url('addressbook/qrcode', {_source: this.env.source, _cid: this.get_single_cid()});
-
-    return this.simple_dialog(img, 'qrcode', null, {
-        button: false,
-        cancel_button: 'close',
-        width: 300,
-        height: 300
-    });
-  };
-
-
-  /*********************************************************/
-  /*********        user settings methods          *********/
-  /*********************************************************/
-
-  // preferences section select and load options frame
-  this.section_select = function(list)
-  {
-    var win, id = list.get_single_selection();
-
-    if (id && (win = this.get_frame_window(this.env.contentframe))) {
-      this.location_href({_action: 'edit-prefs', _section: id, _framed: 1}, win, true);
-    }
-  };
-
-  this.response_select = function(list)
-  {
-    var id = list.get_single_selection();
-
-    this.enable_command('delete', !!id && $.inArray(id, this.env.readonly_responses) < 0);
-
-    if (id) {
-      this.load_response(id, 'edit-response');
-    }
-  };
-
-  // load response record
-  this.load_response = function(id, action)
-  {
-    var win;
-
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      if (id || action == 'add-response') {
-        if (!id)
-          this.responses_list.clear_selection();
-
-        this.location_href({_action: action, _id: id, _framed: 1}, win, true);
-      }
-    }
-  };
-
-  this.identity_select = function(list)
-  {
-    var id = list.get_single_selection();
-
-    this.enable_command('delete', !!id && list.rowcount > 1 && this.env.identities_level < 2);
-
-    if (id) {
-      this.load_identity(id, 'edit-identity');
-    }
-  };
-
-  // load identity record
-  this.load_identity = function(id, action)
-  {
-    var win;
-
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      if (id || action == 'add-identity') {
-        if (!id)
-          this.identity_list.clear_selection();
-
-        this.location_href({_action: action, _iid: id, _framed: 1}, win, true);
-      }
-    }
-  };
-
-  this.delete_identity = function(id)
-  {
-    if (!id && this.identity_list)
-      id = this.identity_list.get_single_selection();
-
-    if (id) {
-      this.confirm_dialog(this.get_label('deleteidentityconfirm'), 'delete', function() {
-          ref.http_post('settings/delete-identity', {_iid: id}, true);
-      });
-    }
-  };
-
-  this.delete_response = function(id)
-  {
-    if (!id && this.responses_list) {
-      id = this.responses_list.get_single_selection();
-    }
-
-    if (id) {
-      this.confirm_dialog(this.get_label('deleteresponseconfirm'), 'delete', function() {
-          ref.http_post('settings/delete-response', {_id: id}, true);
-      });
-    }
-  };
-
-  // Update indetities list (add or update a record)
-  this.update_identity_row = function(id, name, add)
-  {
-    var list = this.identity_list,
-      rid = this.html_identifier(id);
-
-    if (add) {
-      list.insert_row({id: 'rcmrow' + rid, cols: [{className: 'mail', innerHTML: name}]});
-      list.select(rid);
-    }
-    else {
-      list.update_row(rid, [name]);
-    }
-  };
-
-  // Update responses list (add or update a record)
-  this.update_response_row = function(id, name, add)
-  {
-    var list = this.responses_list;
-
-    if (add) {
-      list.insert_row({id: 'rcmrow' + id, cols: [{className: 'name', innerHTML: name}]});
-      list.select(id);
-    }
-    else {
-      list.update_row(id, [name]);
-    }
-  };
-
-  // Remove response record from the responses list
-  this.remove_response = function(id)
-  {
-    if (this.responses_list) {
-      this.responses_list.remove_row(id);
-      this.show_contentframe(false);
-    }
-
-    this.enable_command('delete', false);
-  };
-
-  // Remove identity record from the identities list
-  this.remove_identity = function(id)
-  {
-    var list = this.identity_list,
-      rid = this.html_identifier(id);
-
-    if (list && id) {
-      list.remove_row(rid);
-      this.show_contentframe(false);
-    }
-
-    this.enable_command('delete', false);
-  };
-
-
-  /*********************************************************/
-  /*********        folder manager methods         *********/
-  /*********************************************************/
-
-  this.init_subscription_list = function()
-  {
-    var delim = RegExp.escape(this.env.delimiter);
-
-    this.last_sub_rx = RegExp('['+delim+']?[^'+delim+']+$');
-
-    this.subscription_list = new rcube_treelist_widget(this.gui_objects.subscriptionlist, {
-        selectable: true,
-        tabexit: false,
-        parent_focus: true,
-        id_prefix: 'rcmli',
-        id_encode: this.html_identifier_encode,
-        id_decode: this.html_identifier_decode,
-        searchbox: '#foldersearch'
-    });
-
-    this.subscription_list
-      .addEventListener('select', function(node) { ref.subscription_select(node.id); })
-      .addEventListener('collapse', function(node) { ref.folder_collapsed(node) })
-      .addEventListener('expand', function(node) { ref.folder_collapsed(node) })
-      .addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
-      .draggable({cancel: 'li.mailbox.root,input,div.treetoggle,.custom-control'})
-      .droppable({
-        // @todo: find better way, accept callback is executed for every folder
-        // on the list when dragging starts (and stops), this is slow, but
-        // I didn't find a method to check droptarget on over event
-        accept: function(node) {
-          if (!node.is('.mailbox'))
-            return false;
-
-          var source_folder = ref.folder_id2name(node.attr('id')),
-            dest_folder = ref.folder_id2name(this.id),
-            source = ref.env.subscriptionrows[source_folder],
-            dest = ref.env.subscriptionrows[dest_folder];
-
-          return source && !source[2]
-            && dest_folder != source_folder.replace(ref.last_sub_rx, '')
-            && !dest_folder.startsWith(source_folder + ref.env.delimiter);
-        },
-        drop: function(e, ui) {
-          var source = ref.folder_id2name(ui.draggable.attr('id')),
-            dest = ref.folder_id2name(this.id);
-
-          ref.subscription_move_folder(source, dest);
-        }
-      });
-  };
-
-  this.folder_id2name = function(id)
-  {
-    return id ? ref.html_identifier_decode(id.replace(/^rcmli/, '')) : null;
-  };
-
-  this.subscription_select = function(id)
-  {
-    var folder;
-
-    if (id && id != '*' && (folder = this.env.subscriptionrows[id])) {
-      this.env.mailbox = id;
-      this.show_folder(id);
-      this.enable_command('delete-folder', !folder[2]);
-    }
-    else {
-      this.env.mailbox = null;
-      this.show_contentframe(false);
-      this.enable_command('delete-folder', 'purge', false);
-    }
-  };
-
-  this.subscription_move_folder = function(from, to)
-  {
-    if (from && to !== null && from != to && to != from.replace(this.last_sub_rx, '')) {
-      var path = from.split(this.env.delimiter),
-        basename = path.pop(),
-        newname = to === '' || to === '*' ? basename : to + this.env.delimiter + basename;
-
-      if (newname != from) {
-        this.confirm_dialog(this.get_label('movefolderconfirm'), 'move', function() {
-          ref.http_post('rename-folder', {_folder_oldname: from, _folder_newname: newname},
-            ref.set_busy(true, 'foldermoving'));
-        }, {button_class: 'save move'});
-      }
-    }
-  };
-
-  // tell server to create and subscribe a new mailbox
-  this.create_folder = function()
-  {
-    this.show_folder('', this.env.mailbox);
-  };
-
-  // delete a specific mailbox with all its messages
-  this.delete_folder = function(name)
-  {
-    if (!name)
-      name = this.env.mailbox;
-
-    if (name) {
-      this.confirm_dialog(this.get_label('deletefolderconfirm'), 'delete', function() {
-          ref.http_post('delete-folder', {_mbox: name}, ref.set_busy(true, 'folderdeleting'));
-        });
-    }
-  };
-
-  // Add folder row to the table and initialize it
-  this.add_folder_row = function (id, name, display_name, is_protected, subscribed, class_name, refrow, subfolders)
-  {
-    if (!this.gui_objects.subscriptionlist)
-      return false;
-
-    // reset searching
-    if (this.subscription_list.is_search()) {
-      this.subscription_select();
-      this.subscription_list.reset_search();
-    }
-
-    // disable drag-n-drop temporarily
-    // some skins disable dragging in mobile mode, so we have to check if it is still draggable
-    if (this.subscription_list.is_draggable())
-      this.subscription_list.draggable('destroy').droppable('destroy');
-
-    var row, n, tmp, tmp_name, rowid, collator, pos, p, parent = '',
-      folders = [], list = [], slist = [],
-      list_element = $(this.gui_objects.subscriptionlist);
-      row = refrow ? refrow : $($('li', list_element).get(1)).clone(true);
-
-    if (!row.length) {
-      // Refresh page if we don't have a table row to clone
-      this.goto_url('folders');
-      return false;
-    }
-
-    // set ID, reset css class
-    row.attr({id: 'rcmli' + this.html_identifier_encode(id), 'class': class_name});
-
-    if (!refrow || !refrow.length) {
-      // remove old data, subfolders and toggle
-      $('ul,div.treetoggle', row).remove();
-      row.removeData('filtered');
-    }
-
-    // set folder name
-    $('a', row).first().text(display_name).removeAttr('title');
-
-    // update subscription checkbox
-    $('input[name="_subscribed[]"]', row).first().val(id)
-      .prop({checked: subscribed ? true : false, disabled: is_protected ? true : false});
-
-    // add to folder/row-ID map
-    this.env.subscriptionrows[id] = [name, display_name, false];
-
-    // copy folders data to an array for sorting
-    $.each(this.env.subscriptionrows, function(k, v) { v[3] = k; folders.push(v); });
-
-    try {
-      // use collator if supported (FF29, IE11, Opera15, Chrome24)
-      collator = new Intl.Collator(this.env.locale.replace('_', '-'));
-    }
-    catch (e) {};
-
-    // sort folders
-    folders.sort(function(a, b) {
-      var i, f1, f2,
-        path1 = a[0].split(ref.env.delimiter),
-        path2 = b[0].split(ref.env.delimiter),
-        len = path1.length;
-
-      for (i=0; i<len; i++) {
-        f1 = path1[i];
-        f2 = path2[i];
-
-        if (f1 !== f2) {
-          if (f2 === undefined)
-            return 1;
-          if (collator)
-            return collator.compare(f1, f2);
-          else
-            return f1 < f2 ? -1 : 1;
-        }
-        else if (i == len-1) {
-          return -1
-        }
-      }
-    });
-
-    for (n in folders) {
-      p = folders[n][3];
-      // protected folder
-      if (folders[n][2]) {
-        tmp_name = p + this.env.delimiter;
-        // prefix namespace cannot have subfolders (#1488349)
-        if (tmp_name == this.env.prefix_ns)
-          continue;
-        slist.push(p);
-        tmp = tmp_name;
-      }
-      // protected folder's child
-      else if (tmp && p.startsWith(tmp))
-        slist.push(p);
-      // other
-      else {
-        list.push(p);
-        tmp = null;
-      }
-    }
-
-    // check if subfolder of a protected folder
-    for (n=0; n<slist.length; n++) {
-      if (id.startsWith(slist[n] + this.env.delimiter))
-        rowid = slist[n];
-    }
-
-    // find folder position after sorting
-    for (n=0; !rowid && n<list.length; n++) {
-      if (n && list[n] == id)
-        rowid = list[n-1];
-    }
-
-    // add row to the table
-    if (rowid && (n = this.subscription_list.get_item(rowid, true))) {
-      // find parent folder
-      if (pos = id.lastIndexOf(this.env.delimiter)) {
-        parent = id.substring(0, pos);
-        parent = this.subscription_list.get_item(parent, true);
-
-        // add required tree elements to the parent if not already there
-        if (!$('div.treetoggle', parent).length) {
-          $('<div>&nbsp;</div>').addClass('treetoggle collapsed').appendTo(parent);
-        }
-        if (!$('ul', parent).length) {
-          $('<ul>').css('display', 'none').appendTo(parent);
-        }
-      }
-
-      if (parent && n == parent) {
-        $('ul', parent).first().append(row);
-      }
-      else {
-        while (p = $(n).parent().parent().get(0)) {
-          if (parent && p == parent)
-            break;
-          if (!$(p).is('li.mailbox'))
-            break;
-          n = p;
+        url._layout = this.env.layout;
+        url._filter = filter;
+        url._scope = scope;
+        url._mbox = mbox;
+
+        return url;
+    };
+
+    // reset search filter
+    this.reset_search_filter = function()
+    {
+        this.filter_disabled = true;
+        if (this.gui_objects.search_filter)
+            $(this.gui_objects.search_filter).val('ALL').change();
+        this.filter_disabled = false;
+    };
+
+    // reset quick-search form
+    this.reset_qsearch = function(all)
+    {
+        if (this.gui_objects.qsearchbox)
+            this.gui_objects.qsearchbox.value = '';
+
+        if (this.gui_objects.search_interval)
+            $(this.gui_objects.search_interval).val('');
+
+        if (this.env.qsearch)
+            this.abort_request(this.env.qsearch);
+
+        if (all) {
+            this.env.search_scope = this.env.search_scope || 'base';
+            this.reset_search_filter();
         }
 
-        $(n).after(row);
-      }
-    }
-    else {
-      list_element.append(row);
-    }
-
-    // add subfolders
-    $.extend(this.env.subscriptionrows, subfolders || {});
-
-    // update list widget
-    this.subscription_list.reset(true);
-    this.subscription_select();
-
-    // expand parent
-    if (parent) {
-      this.subscription_list.expand(this.folder_id2name(parent.id));
-    }
-
-    row = row.show().get(0);
-    if (row.scrollIntoView)
-      row.scrollIntoView(false);
-
-    // Let skins to do their magic, e.g. Elastic will fix pretty checkbox
-    if (!refrow)
-      this.triggerEvent('clonerow', {row: row, id: id});
-
-    return row;
-  };
-
-  // replace an existing table row with a new folder line (with subfolders)
-  this.replace_folder_row = function(oldid, id, name, display_name, is_protected, class_name)
-  {
-    if (!this.gui_objects.subscriptionlist) {
-      if (this.is_framed()) {
-        // @FIXME: for some reason this 'parent' variable need to be prefixed with 'window.'
-        return window.parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name);
-      }
-
-      return false;
-    }
-
-    // reset searching
-    if (this.subscription_list.is_search()) {
-      this.subscription_select();
-      this.subscription_list.reset_search();
-    }
-
-    var subfolders = {},
-      row = this.subscription_list.get_item(oldid, true),
-      parent = $(row).parent(),
-      old_folder = this.env.subscriptionrows[oldid],
-      prefix_len_id = oldid.length,
-      prefix_len_name = old_folder[0].length,
-      subscribed = $('input[name="_subscribed[]"]', row).first().prop('checked');
-
-    // no renaming, only update class_name
-    if (oldid == id) {
-      $(row).attr('class', class_name || '');
-      return;
-    }
-
-    // update subfolders
-    $('li', row).each(function() {
-      var fname = ref.folder_id2name(this.id),
-        folder = ref.env.subscriptionrows[fname],
-        newid = id + fname.slice(prefix_len_id);
-
-      this.id = 'rcmli' + ref.html_identifier_encode(newid);
-      $('input[name="_subscribed[]"]', this).first().val(newid);
-      folder[0] = name + folder[0].slice(prefix_len_name);
-
-      subfolders[newid] = folder;
-      delete ref.env.subscriptionrows[fname];
-    });
-
-    // get row off the list
-    row = $(row).detach();
-
-    delete this.env.subscriptionrows[oldid];
-
-    // remove parent list/toggle elements if not needed
-    if (parent.get(0) != this.gui_objects.subscriptionlist && !$('li', parent).length) {
-      $('ul,div.treetoggle', parent.parent()).remove();
-    }
-
-    // move the existing table row
-    this.add_folder_row(id, name, display_name, is_protected, subscribed, class_name, row, subfolders);
-  };
-
-  // remove the table row of a specific mailbox from the table
-  this.remove_folder_row = function(folder)
-  {
-    // reset searching
-    if (this.subscription_list.is_search()) {
-      this.subscription_select();
-      this.subscription_list.reset_search();
-    }
-
-    var list = [], row = this.subscription_list.get_item(folder, true);
-
-    // get subfolders if any
-    $('li', row).each(function() { list.push(ref.folder_id2name(this.id)); });
-
-    // remove folder row (and subfolders)
-    this.subscription_list.remove(folder);
-
-    // update local list variable
-    list.push(folder);
-    $.each(list, function(i, v) { delete ref.env.subscriptionrows[v]; });
-  };
-
-  this.subscribe = function(folder)
-  {
-    this.change_subscription_state(folder, true);
-  };
-
-  this.unsubscribe = function(folder)
-  {
-    this.change_subscription_state(folder, false);
-  };
-
-  this.change_subscription_state = function(folder, state)
-  {
-    if (folder) {
-      var prefix = state ? '' : 'un',
-        lock = this.display_message('folder' + prefix + 'subscribing', 'loading');
-
-      this.http_post(prefix + 'subscribe', {_mbox: folder}, lock);
-
-      // in case this was a list of search results, update also the main list
-      $(this.gui_objects.subscriptionlist).find('input[value="' + folder + '"]').prop('checked', state);
-    }
-  };
-
-
-  // when user select a folder in manager
-  this.show_folder = function(folder, path, force)
-  {
-    var win, target = window,
-      action = folder === '' ? 'add' : 'edit',
-      url = '&_action=' + action + '-folder&_mbox=' + urlencode(folder);
-
-    if (path)
-      url += '&_path='+urlencode(path);
-
-    if (win = this.get_frame_window(this.env.contentframe)) {
-      target = win;
-      url += '&_framed=1';
-    }
-
-    if (String(target.location.href).indexOf(url) >= 0 && !force)
-      this.show_contentframe(true);
-    else
-      this.location_href(this.env.comm_path+url, target, true);
-  };
-
-  // disables subscription checkbox (for protected folder)
-  this.disable_subscription = function(folder)
-  {
-    var row = this.subscription_list.get_item(folder, true);
-    if (row)
-      $('input[name="_subscribed[]"]', row).first().prop('disabled', true);
-  };
-
-  // resets state of subscription checkbox (e.g. on error)
-  this.reset_subscription = function(folder, state)
-  {
-    var row = this.subscription_list.get_item(folder, true);
-    if (row)
-      $('input[name="_subscribed[]"]', row).first().prop('checked', state);
-  };
-
-  this.folder_size = function(folder)
-  {
-    var lock = this.set_busy(true, 'loading');
-    this.http_post('folder-size', {_mbox: folder}, lock);
-  };
-
-  this.folder_size_update = function(size)
-  {
-    $('#folder-size').replaceWith(size);
-  };
-
-  // filter folders by namespace
-  this.folder_filter = function(prefix)
-  {
-    this.subscription_list.reset_search();
-
-    this.subscription_list.container.children('li').each(function() {
-      var i, folder = ref.folder_id2name(this.id);
-      // show all folders
-      if (prefix == '---') {
-      }
-      // got namespace prefix
-      else if (prefix) {
-        if (folder !== prefix) {
-          $(this).data('filtered', true).hide();
-          return
-        }
-      }
-      // no namespace prefix, filter out all other namespaces
-      else {
-        // first get all namespace roots
-        for (i in ref.env.ns_roots) {
-          if (folder === ref.env.ns_roots[i]) {
-            $(this).data('filtered', true).hide();
-            return;
-          }
-        }
-      }
-
-      $(this).removeData('filtered').show();
-    });
-  };
-
-  /*********************************************************/
-  /*********           GUI functionality           *********/
-  /*********************************************************/
-
-  this.init_button = function(cmd, prop)
-  {
-    var elm = document.getElementById(prop.id);
-    if (!elm)
-      return;
-
-    var preload = false;
-    if (prop.type == 'image') {
-      elm = elm.parentNode;
-      preload = true;
-    }
-
-    elm._command = cmd;
-    elm._id = prop.id;
-    if (prop.sel) {
-      elm.onmousedown = function(e) { return ref.button_sel(this._command, this._id); };
-      elm.onmouseup = function(e) { return ref.button_out(this._command, this._id); };
-      if (preload)
-        new Image().src = prop.sel;
-    }
-    if (prop.over) {
-      elm.onmouseover = function(e) { return ref.button_over(this._command, this._id); };
-      elm.onmouseout = function(e) { return ref.button_out(this._command, this._id); };
-      if (preload)
-        new Image().src = prop.over;
-    }
-  };
-
-  // set event handlers on registered buttons
-  this.init_buttons = function()
-  {
-    for (var cmd in this.buttons) {
-      if (typeof cmd !== 'string')
-        continue;
-
-      for (var i=0; i<this.buttons[cmd].length; i++) {
-        this.init_button(cmd, this.buttons[cmd][i]);
-      }
-    }
-  };
-
-  // set button to a specific state
-  this.set_button = function(command, state)
-  {
-    var n, button, obj, a_buttons = this.buttons[command],
-      len = a_buttons ? a_buttons.length : 0;
-
-    for (n=0; n<len; n++) {
-      button = a_buttons[n];
-      obj = document.getElementById(button.id);
-
-      if (!obj || button.status === state)
-        continue;
-
-      // get default/passive setting of the button
-      if (button.type == 'image' && !button.status) {
-        button.pas = obj._original_src ? obj._original_src : obj.src;
-        // respect PNG fix on IE browsers
-        if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
-          button.pas = RegExp.$1;
-      }
-      else if (!button.status)
-        button.pas = String(obj.className);
-
-      button.status = state;
-
-      // set image according to button state
-      if (button.type == 'image' && button[state]) {
-        obj.src = button[state];
-      }
-      // set class name according to button state
-      else if (button[state] !== undefined) {
-        obj.className = button[state];
-      }
-
-      // disable/enable input buttons
-      if (button.type == 'input' || button.type == 'button') {
-        obj.disabled = state == 'pas';
-      }
-      else {
-        $(obj).attr({
-          tabindex: state == 'pas' || state == 'sel' ? '-1' : ($(obj).attr('data-tabindex') || '0'),
-          'aria-disabled': state == 'pas' || state == 'sel' ? 'true' : 'false'
-        });
-      }
-    }
-  };
-
-  // display a specific alttext
-  this.set_alttext = function(command, label)
-  {
-    var n, button, obj, link, label,
-      a_buttons = this.buttons[command],
-      len = a_buttons ? a_buttons.length : 0;
-
-    for (n=0; n<len; n++) {
-      button = a_buttons[n];
-      obj = document.getElementById(button.id);
-      label = this.get_label(label);
-
-      if (obj && button.type == 'image') {
-        obj.setAttribute('alt', label);
-        if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
-          link.setAttribute('title', label);
-      }
-      else if (obj)
-        obj.setAttribute('title', label);
-    }
-  };
-
-  // mouse over button
-  this.button_over = function(command, id)
-  {
-    this.button_event(command, id, 'over');
-  };
-
-  // mouse down on button
-  this.button_sel = function(command, id)
-  {
-    this.button_event(command, id, 'sel');
-  };
-
-  // mouse out of button
-  this.button_out = function(command, id)
-  {
-    this.button_event(command, id, 'act');
-  };
-
-  // event of button
-  this.button_event = function(command, id, event)
-  {
-    var n, button, obj, a_buttons = this.buttons[command],
-      len = a_buttons ? a_buttons.length : 0;
-
-    for (n=0; n<len; n++) {
-      button = a_buttons[n];
-      if (button.id == id && button.status == 'act') {
-        if (button[event] && (obj = document.getElementById(button.id))) {
-          obj[button.type == 'image' ? 'src' : 'className'] = button[event];
-        }
-
-        if (event == 'sel') {
-          this.buttons_sel[id] = command;
-        }
-      }
-    }
-  };
-
-  // write to the document/window title
-  this.set_pagetitle = function(title)
-  {
-    if (title && document.title)
-      document.title = title;
-  };
-
-  // display a system message, list of types in common.css (below #message definition)
-  this.display_message = function(msg, type, timeout, key)
-  {
-    if (msg && msg.length && /^[a-z._]+$/.test(msg))
-      msg = this.get_label(msg);
-
-    // pass command to parent window
-    if (this.is_framed())
-      return parent.rcmail.display_message(msg, type, timeout);
-
-    if (!this.gui_objects.message) {
-      // save message in order to display after page loaded
-      if (type != 'loading')
-        this.pending_message = [msg, type, timeout, key];
-      return 1;
-    }
-
-    if (!type)
-      type = 'notice';
-    else if (type == 'loading') {
-      if (!key)
-        key = 'loading';
-      if (!timeout)
-        timeout = this.env.request_timeout * 1000;
-      if (!msg)
-        msg = this.get_label('loading');
-    }
-
-    if (!key)
-      key = this.html_identifier(msg);
-
-    var date = new Date(),
-      id = type + date.getTime();
-
-    if (!timeout) {
-      switch (type) {
-        case 'error':
-        case 'warning':
-          timeout = this.message_time * 2;
-          break;
-
-        case 'uploading':
-          timeout = 0;
-          break;
-
-        default:
-          timeout = this.message_time;
-      }
-    }
-
-    // The same message is already displayed
-    if (this.messages[key]) {
-      // replace label
-      if (this.messages[key].obj)
-        $('div.content', this.messages[key].obj).html(msg);
-      // store label in stack
-      if (type == 'loading') {
-        this.messages[key].labels.push({'id': id, 'msg': msg});
-      }
-      // add element and set timeout
-      this.messages[key].elements.push(id);
-      setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
-      return id;
-    }
-
-    // create DOM object and display it
-    var obj = $('<div>').addClass(type + ' content').html(msg).data('key', key),
-      cont = $(this.gui_objects.message).append(obj).show();
-
-    this.messages[key] = {'obj': obj, 'elements': [id]};
-
-    if (type == 'loading') {
-      this.messages[key].labels = [{'id': id, 'msg': msg}];
-    }
-    else if (type != 'uploading') {
-      obj.click(function() { return ref.hide_message(obj); })
-        .attr('role', 'alert');
-    }
-
-    this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });
-
-    if (timeout > 0)
-      setTimeout(function() { ref.hide_message(id, type != 'loading'); }, timeout);
-
-    return id;
-  };
-
-  // make a message to disappear
-  this.hide_message = function(obj, fade)
-  {
-    // pass command to parent window
-    if (this.is_framed())
-      return parent.rcmail.hide_message(obj, fade);
-
-    if (!this.gui_objects.message)
-      return;
-
-    var k, n, i, o, m = this.messages;
-
-    // Hide message by object, don't use for 'loading'!
-    if (typeof obj === 'object') {
-      o = $(obj);
-      k = o.data('key');
-      this.hide_message_object(o, fade);
-      if (m[k])
-        delete m[k];
-    }
-    // Hide message by id
-    else {
-      for (k in m) {
-        for (n in m[k].elements) {
-          if (m[k] && m[k].elements[n] == obj) {
-            m[k].elements.splice(n, 1);
-            // hide DOM element if last instance is removed
-            if (!m[k].elements.length) {
-              this.hide_message_object(m[k].obj, fade);
-              delete m[k];
-            }
-            // set pending action label for 'loading' message
-            else if (k == 'loading') {
-              for (i in m[k].labels) {
-                if (m[k].labels[i].id == obj) {
-                  delete m[k].labels[i];
+        this.env.qsearch = null;
+        this.env.search_request = null;
+        this.env.search_id = null;
+        this.select_all_mode = false;
+
+        this.enable_command('set-listmode', this.env.threads);
+    };
+
+    this.set_searchscope = function(scope)
+    {
+        this.env.search_scope = scope;
+    };
+
+    this.set_searchinterval = function(interval)
+    {
+        this.env.search_interval = interval;
+    };
+
+    this.set_searchmods = function(mods)
+    {
+        var mbox = this.env.mailbox,
+            scope = this.env.search_scope || 'base';
+
+        if (!this.env.search_mods)
+            this.env.search_mods = {};
+
+        if (mbox)
+            this.env.search_mods[mbox] = mods;
+    };
+
+    this.is_multifolder_listing = function()
+    {
+        return this.env.multifolder_listing !== undefined ? this.env.multifolder_listing :
+            (this.env.search_request && (this.env.search_scope || 'base') != 'base');
+    };
+
+    // action executed after mail is sent
+    this.sent_successfully = function(type, msg, folders, save_error)
+    {
+        this.display_message(msg, type);
+        this.compose_skip_unsavedcheck = true;
+
+        if (this.env.extwin) {
+            if (!save_error)
+                this.lock_form(this.gui_objects.messageform);
+
+            var filter = {task: 'mail', action: ''},
+                rc = this.opener(false, filter) || this.opener(true, filter);
+
+            if (rc) {
+                rc.display_message(msg, type);
+                // refresh the folder where sent message was saved or replied message comes from
+                if (folders && $.inArray(rc.env.mailbox, folders) >= 0) {
+                    rc.command('checkmail');
                 }
-                else {
-                  o = m[k].labels[i].msg;
-                  $('div.content', m[k].obj).html(o);
-                }
-              }
             }
-          }
+
+            if (!save_error)
+                setTimeout(function() { window.close(); }, 1000);
         }
-      }
-    }
-  };
-
-  // hide message object and remove from the DOM
-  this.hide_message_object = function(o, fade)
-  {
-    if (fade)
-      o.fadeOut(600, function() { $(this).remove(); });
-    else
-      o.hide().remove();
-  };
-
-  // remove all messages immediately
-  this.clear_messages = function()
-  {
-    // pass command to parent window
-    if (this.is_framed())
-      return parent.rcmail.clear_messages();
-
-    var k, n, m = this.messages;
-
-    for (k in m)
-      for (n in m[k].elements)
-        if (m[k].obj)
-          this.hide_message_object(m[k].obj);
-
-    this.messages = {};
-  };
-
-  // display uploading message with progress indicator
-  // data should contain: name, total, current, percent, text
-  this.display_progress = function(data)
-  {
-    if (!data || !data.name)
-      return;
-
-    var msg = this.messages['progress' + data.name];
-
-    if (!data.label)
-      data.label = this.get_label('uploadingmany');
-
-    if (!msg) {
-      if (!data.percent || data.percent < 100)
-        this.display_message(data.label, 'uploading', 0, 'progress' + data.name);
-      return;
-    }
-
-    if (!data.total || data.percent >= 100) {
-      this.hide_message(msg.obj);
-      return;
-    }
-
-    if (data.text)
-      data.label += ' ' + data.text;
-
-    msg.obj.text(data.label);
-  };
-
-  // open a jquery UI dialog with the given content
-  this.show_popup_dialog = function(content, title, buttons, options)
-  {
-    // forward call to parent window
-    if (this.is_framed()) {
-      return parent.rcmail.show_popup_dialog(content, title, buttons, options);
-    }
-
-    var popup = $('<div class="popup">');
-
-    if (typeof content == 'object') {
-      popup.append(content);
-      if ($(content).is('iframe'))
-        popup.addClass('iframe');
-    }
-    else
-      popup.html(content);
-
-    // assign special classes to dialog buttons
-    var i = 0, fn = function(button, classes, idx) {
-        if (typeof button == 'function') {
-          button = {
-            click: button,
-            text: idx,
-            'class': classes
-          };
-        }
-        else {
-          buttons['class'] = classes;
+        else if (!save_error) {
+            // before redirect we need to wait some time for Chrome (#1486177)
+            setTimeout(function() { ref.list_mailbox(); }, 500);
         }
 
-        return button;
-      };
-
-    if (options && options.button_classes)
-      $.each(buttons, function(idx, button) {
-        var cl = options.button_classes[i];
-        if (cl)
-          buttons[idx] = fn(button, cl, idx);
-        i++;
-      });
-
-    options = $.extend({
-        title: title,
-        buttons: buttons,
-        modal: true,
-        resizable: true,
-        width: 500,
-        close: function(event, ui) { $(this).remove(); }
-      }, options || {});
-
-    popup.dialog(options);
-
-    // Remember the jQuery instance (window), useful when closing the dialog
-    popup[0].jqref = $;
-
-    if (options.width)
-      popup.width(options.width);
-    if (options.height)
-      popup.height(options.height);
-
-    var dialog = popup.parent();
-
-    if (!options.noresize) {
-      // resize and center popup
-      var win = $(window), w = win.width(), h = win.height(),
-        width = popup.width(),
-        height = options.height || (popup[0].scrollHeight + 20),
-        titlebar_height = $('.ui-dialog-titlebar', dialog).outerHeight() || 0,
-        buttonpane_height = $('.ui-dialog-buttonpane', dialog).outerHeight() || 0,
-        padding = (parseInt(dialog.css('padding-top')) + parseInt(popup.css('padding-top'))) * 2;
-
-      popup.dialog('option', {
-        height: Math.min(h - 40, height + titlebar_height + buttonpane_height + padding + 2),
-        width: Math.min(w - 20, width + 28)
-      });
-    }
-    else {
-      popup.css('width', 'auto');
-    }
-
-    // Don't propagate keyboard events to the UI below the dialog (#6055)
-    dialog.on('keydown keyup', function(e) { e.stopPropagation(); });
-
-    // Add Enter key handler to the input, click the 'mainaction' button
-    dialog.find('input[data-submit]').on('keydown', function(e) {
-      if (e.which == 13) {
-        dialog.find('.ui-dialog-buttonpane button.mainaction').click();
-      }
-    });
-
-    this.triggerEvent('dialog-open', {obj: popup});
-
-    return popup;
-  };
-
-  // show_popup_dialog() wrapper for simple dialogs with action and Cancel buttons
-  this.simple_dialog = function(content, title, action_func, options)
-  {
-    if (!options)
-      options = {};
-
-    var title = this.get_label(title),
-      save_label = options.button || 'save',
-      save_class = options.button_class || save_label.replace(/^[^\.]+\./i, ''),
-      cancel_label = options.cancel_button || 'cancel',
-      cancel_class = options.cancel_class || cancel_label.replace(/^[^\.]+\./i, ''),
-      close_func = function(e, ui, dialog) {
-        if (!dialog)
-          dialog = this;
-
-        // The dialog might got open in the current window, but also any of its parents (#8627)
-        // We have to use the jQuery object that did invoke the dialog, set in show_popup_dialog()
-        dialog.jqref(dialog).dialog('close');
-        if (options.cancel_func) options.cancel_func(e, ref);
-      },
-      buttons = [{
-        text: this.get_label(cancel_label),
-        'class': cancel_class.replace(/close/i, 'cancel'),
-        click: close_func
-      }];
-
-    if (!action_func)
-      buttons[0]['class'] += ' mainaction';
-    else
-      buttons.unshift({
-        text: this.get_label(save_label),
-        'class': 'mainaction ' + save_class,
-        click: function(e, ui) { if (action_func(e, ref)) close_func(e, ui, this); }
-      });
-
-    return this.show_popup_dialog(content, title, buttons, options);
-  };
-
-  // show_popup_dialog() wrapper for alert() type dialogs
-  this.alert_dialog = function(content, action, options)
-  {
-    options = $.extend(options || {}, {
-        cancel_button: 'ok',
-        cancel_class: 'save',
-        cancel_func: action,
-        noresize: true
-      });
-
-    return this.simple_dialog(content, options.title || 'alerttitle', null, options);
-  };
-
-  // simple_dialog() wrapper for confirm() type dialogs
-  this.confirm_dialog = function(content, button_label, action, options)
-  {
-    var action_func = function(e, ref) { action(e, ref); return true; };
-
-    options = $.extend(options || {}, {
-        button: button_label || 'continue',
-        noresize: true
-      });
-
-    return this.simple_dialog(content, options.title || 'confirmationtitle', action_func, options);
-  };
-
-  // enable/disable buttons for page shifting
-  this.set_page_buttons = function()
-  {
-    this.enable_command('nextpage', 'lastpage', this.env.pagecount > this.env.current_page);
-    this.enable_command('previouspage', 'firstpage', this.env.current_page > 1);
-
-    this.update_pagejumper();
-  };
-
-  // mark a mailbox as selected and set environment variable
-  this.select_folder = function(name, prefix, encode)
-  {
-    if (this.savedsearchlist) {
-      this.savedsearchlist.select('');
-    }
-
-    if (this.treelist) {
-      this.treelist.select(name);
-    }
-    else if (this.gui_objects.folderlist) {
-      $('li.selected', this.gui_objects.folderlist).removeClass('selected');
-      $(this.get_folder_li(name, prefix, encode)).addClass('selected');
-
-      // trigger event hook
-      this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
-    }
-  };
-
-  // adds a class to selected folder
-  this.mark_folder = function(name, class_name, prefix, encode)
-  {
-    $(this.get_folder_li(name, prefix, encode)).addClass(class_name);
-    this.triggerEvent('markfolder', {folder: name, mark: class_name, status: true});
-  };
-
-  // adds a class to selected folder
-  this.unmark_folder = function(name, class_name, prefix, encode)
-  {
-    $(this.get_folder_li(name, prefix, encode)).removeClass(class_name);
-    this.triggerEvent('markfolder', {folder: name, mark: class_name, status: false});
-  };
-
-  // helper method to find a folder list item
-  this.get_folder_li = function(name, prefix, encode)
-  {
-    if (!prefix)
-      prefix = 'rcmli';
-
-    if (this.gui_objects.folderlist) {
-      name = this.html_identifier(name, encode);
-      return document.getElementById(prefix+name);
-    }
-  };
-
-  // for reordering column array (Konqueror workaround)
-  // and for setting some message list global variables
-  this.set_message_coltypes = function(cols, repl, smart_col)
-  {
-    // update list mode columns list
-    this.env.listcols = cols;
-
-    // reset message list cols
-    this.msglist_setup(this.env.layout);
-
-    var list = this.message_list,
-      thead = list ? list.thead : null,
-      repl, cell, col, c, n, len, tr,
-      listcols = this.env.msglist_cols;
-
-    if (!this.env.coltypes)
-      this.env.coltypes = {};
-
-    // replace old column headers
-    if (thead) {
-      if (repl) {
-        thead.innerHTML = '';
-        tr = document.createElement('tr');
-
-        for (n in listcols) {
-          c = listcols[n];
-          cell = document.createElement('th');
-          cell.innerHTML = repl[c].html || '';
-          if (repl[c].id) cell.id = repl[c].id;
-          if (repl[c].className) cell.className = repl[c].className;
-          tr.appendChild(cell);
-        }
-
-        if (list.checkbox_selection)
-          list.insert_checkbox(tr, 'thead');
-
-        thead.appendChild(tr);
-      }
-
-      for (n = 0, len = listcols.length; n < len; n++) {
-        col = listcols[list.checkbox_selection ? n-1 : n];
-        if ((cell = thead.rows[0].cells[n]) && (col == 'from' || col == 'to' || col == 'fromto')) {
-          $(cell).attr('rel', col).find('span,a').text(this.get_label(col == 'fromto' ? smart_col : col));
-        }
-      }
-    }
-
-    this.env.subject_col = null;
-    this.env.flagged_col = null;
-    this.env.status_col = null;
-
-    if (this.env.coltypes.folder)
-      this.env.coltypes.folder.hidden = !(this.env.search_request || this.env.search_id) || this.env.search_scope == 'base';
-
-    if ((n = $.inArray('subject', listcols)) >= 0) {
-      this.env.subject_col = n;
-      if (list)
-        list.subject_col = n;
-    }
-    if ((n = $.inArray('flag', listcols)) >= 0)
-      this.env.flagged_col = n;
-    if ((n = $.inArray('status', listcols)) >= 0)
-      this.env.status_col = n;
-
-    if (list) {
-      list.hide_column('folder', (this.env.coltypes.folder && this.env.coltypes.folder.hidden) || $.inArray('folder', listcols) < 0);
-      list.init_header();
-    }
-  };
-
-  // replace content of row count display
-  this.set_rowcount = function(text, mbox)
-  {
-    // #1487752
-    if (mbox && mbox != this.env.mailbox)
-      return false;
-
-    $(this.gui_objects.countdisplay).html(text);
-
-    // update page navigation buttons
-    this.set_page_buttons();
-  };
-
-  // replace content of mailboxname display
-  this.set_mailboxname = function(content)
-  {
-    if (this.gui_objects.mailboxname && content)
-      this.gui_objects.mailboxname.innerHTML = content;
-  };
-
-  // replace content of quota display
-  this.set_quota = function(content)
-  {
-    if (this.gui_objects.quotadisplay && content && content.type == 'text')
-      $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title || '');
-
-    this.triggerEvent('setquota', content);
-    this.env.quota_content = content;
-  };
-
-  // update trash folder state
-  this.set_trash_count = function(count)
-  {
-    this[(count ? 'un' : '') + 'mark_folder'](this.env.trash_mailbox, 'empty', '', true);
-  };
-
-  // update the mailboxlist
-  this.set_unread_count = function(mbox, count, set_title, mark)
-  {
-    if (!this.gui_objects.mailboxlist)
-      return false;
-
-    this.env.unread_counts[mbox] = count;
-    this.set_unread_count_display(mbox, set_title);
-
-    if (mark)
-      this.mark_folder(mbox, mark, '', true);
-    else if (!count)
-      this.unmark_folder(mbox, 'recent', '', true);
-
-    this.mark_all_read_state();
-  };
-
-  // update the mailbox count display
-  this.set_unread_count_display = function(mbox, set_title)
-  {
-    var reg, link, text_obj, item, mycount, childcount, div;
-
-    if (item = this.get_folder_li(mbox, '', true)) {
-      mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
-      link = $(item).children('a').eq(0);
-      text_obj = link.children('span.unreadcount');
-      if (!text_obj.length && mycount)
-        text_obj = $('<span>').addClass('unreadcount skip-content').appendTo(link);
-      reg = /\s+\([0-9]+\)$/i;
-
-      childcount = 0;
-      if ((div = item.getElementsByTagName('div')[0]) &&
-          div.className.match(/collapsed/)) {
-        // add children's counters
-        for (var k in this.env.unread_counts)
-          if (k.startsWith(mbox + this.env.delimiter))
-            childcount += this.env.unread_counts[k];
-      }
-
-      if (mycount && text_obj.length)
-        text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
-      else if (text_obj.length)
-        text_obj.remove();
-
-      // set parent's display
-      reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
-      if (mbox.match(reg))
-        this.set_unread_count_display(mbox.replace(reg, ''), false);
-
-      // set the right classes
-      if ((mycount+childcount)>0)
-        $(item).addClass('unread');
-      else
-        $(item).removeClass('unread');
-    }
-
-    // set unread count to window title
-    reg = /^\([0-9]+\)\s+/i;
-    if (set_title && document.title) {
-      var new_title = '',
-        doc_title = String(document.title);
-
-      if (mycount && doc_title.match(reg))
-        new_title = doc_title.replace(reg, '('+mycount+') ');
-      else if (mycount)
-        new_title = '('+mycount+') '+doc_title;
-      else
-        new_title = doc_title.replace(reg, '');
-
-      this.set_pagetitle(new_title);
-    }
-  };
-
-  // display fetched raw headers
-  this.set_headers = function(content)
-  {
-    if (this.gui_objects.all_headers_box && content)
-      $(this.gui_objects.all_headers_box).html(content).show();
-  };
-
-  // display all-headers row and fetch raw message headers
-  this.show_headers = function(props, elem)
-  {
-    if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
-      return;
-
-    $(elem).removeClass('show-headers').addClass('hide-headers');
-    $(this.gui_objects.all_headers_row).show();
-    elem.onclick = function() { ref.command('hide-headers', '', elem); };
-
-    // fetch headers only once
-    if (!this.gui_objects.all_headers_box.innerHTML) {
-      this.http_request('headers', {_uid: this.env.uid, _mbox: this.env.mailbox},
-        this.display_message('', 'loading')
-      );
-    }
-  };
-
-  // hide all-headers row
-  this.hide_headers = function(props, elem)
-  {
-    if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
-      return;
-
-    $(elem).removeClass('hide-headers').addClass('show-headers');
-    $(this.gui_objects.all_headers_row).hide();
-    elem.onclick = function() { ref.command('show-headers', '', elem); };
-  };
-
-  // create folder selector popup
-  this.folder_selector = function(event, callback)
-  {
-    this.entity_selector('folder-selector', callback, this.env.mailboxes_list, function(obj, a) {
-      var n = 0, s = 0,
-        delim = ref.env.delimiter,
-        folder = ref.env.mailboxes[obj],
-        id = folder.id,
-        row = $('<li>');
-
-      if (folder.virtual)
-        a.addClass('virtual').attr({'aria-disabled': 'true', tabindex: '-1'});
-      else
-        a.addClass('active').data('id', folder.id);
-
-      if (folder['class'])
-        row.addClass(folder['class']);
-
-      // calculate/set indentation level
-      while ((s = id.indexOf(delim, s)) >= 0) {
-        n++; s++;
-      }
-      a.css('padding-left', n ? (n * 16) + 'px' : 0);
-
-      // add folder name element
-      a.append($('<span>').text(folder.name));
-
-      return row.append(a);
-    }, event);
-  };
-
-  // create addressbook selector popup
-  this.addressbook_selector = function(event, callback)
-  {
-    // build addressbook + groups list
-    var combined_sources = [];
-
-    // check we really need it before processing
-    if (!this.entity_selectors['addressbook-selector']) {
-      $.each(this.env.address_sources, function() {
-        if (!this.readonly) {
-          var source = this;
-          combined_sources.push(source);
-
-          $.each(ref.env.contactgroups, function() {
-            if (source.id === this.source) {
-              combined_sources.push(this);
-            }
-          });
-        }
-      });
-    }
-
-    this.entity_selector('addressbook-selector', callback, combined_sources, function(obj, a) {
-      if (obj.type == 'group') {
-        a.attr('rel', obj.source + ':' + obj.id)
-          .addClass('contactgroup active')
-          .data({source: obj.source, gid: obj.id, id: obj.source + ':' + obj.id})
-          .css('padding-left', '16px');
-      }
-      else {
-        a.addClass('addressbook active').data('id', obj.id);
-      }
-      a.append($('<span>').text(obj.name));
-
-      return $('<li>').append(a);
-    }, event);
-  };
-
-  // create contactgroup selector popup
-  this.contactgroup_selector = function(event, callback)
-  {
-    this.entity_selector('contactgroup-selector', callback, this.env.contactgroups, function(obj, a) {
-      if (ref.env.source === obj.source) {
-        a.addClass('contactgroup active')
-            .data({id: obj.id})
-            .append($('<span>').text(obj.name));
-
-        return $('<li>').append(a);
-      }
-    }, event);
-  };
-
-  // create selector popup (eg for folders or address books), position and display it
-  this.entity_selector = function(name, click_callback, entity_list, list_callback, event)
-  {
-    var container = this.entity_selectors[name];
-
-    if (!container) {
-      var rows = [],
-        container = $('<div>').attr('id', name).addClass('popupmenu'),
-        ul = $('<ul>').addClass('toolbarmenu menu'),
-        link = document.createElement('a');
-
-      link.href = '#';
-      link.className = 'icon';
-
-      // loop over entity list
-      $.each(entity_list, function(i) {
-        var a = $(link.cloneNode(false)).attr('rel', this.id);
-        rows.push(list_callback(this, a, i));
-      });
-
-      ul.append(rows).appendTo(container);
-
-      // temporarily show element to calculate its size
-      container.css({left: '-1000px', top: '-1000px'})
-        .appendTo(document.body).show();
-
-      // set max-height if the list is long
-      if (rows.length > 10)
-        container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9);
-
-      // register delegate event handler for folder item clicks
-      container.on('click', 'a.active', function(e) {
-        container.data('callback')($(this).data('id'), this);
-      });
-
-      this.entity_selectors[name] = container;
-    }
-
-    container.data('callback', click_callback);
-
-    // position menu on the screen
-    this.show_menu(name, true, event);
-  };
-
-  this.destroy_entity_selector = function(name)
-  {
-    $("#" + name).remove();
-    delete this.entity_selectors[name];
-    this.triggerEvent('destroy-entity-selector', { name: name });
-  };
-
-  /***********************************************/
-  /*********    popup menu functions     *********/
-  /***********************************************/
-
-  // Show/hide a specific popup menu
-  this.show_menu = function(prop, show, event)
-  {
-    var name = typeof prop == 'object' ? prop.menu : prop,
-      obj = $('#'+name),
-      ref = event && event.target ? $(event.target) : $(obj.attr('rel') || '#'+name+'link'),
-      keyboard = rcube_event.is_keyboard(event),
-      align = obj.attr('data-align') || '',
-      stack = false;
-
-    // find "real" button element
-    if (ref.get(0).tagName != 'A' && ref.closest('a').length)
-      ref = ref.closest('a');
-
-    if (typeof prop == 'string')
-      prop = { menu:name };
-
-    // let plugins or skins provide the menu element
-    if (!obj.length) {
-      obj = this.triggerEvent('menu-get', { name:name, props:prop, originalEvent:event });
-    }
-
-    if (!obj || !obj.length) {
-      // just delegate the action to subscribers
-      return this.triggerEvent(show === false ? 'menu-close' : 'menu-open', { name:name, props:prop, originalEvent:event });
-    }
-
-    // move element to top for proper absolute positioning
-    obj.appendTo(document.body);
-
-    if (typeof show == 'undefined')
-      show = obj.is(':visible') ? false : true;
-
-    if (show && ref.length) {
-      var win = $(window),
-        pos = ref.offset(),
-        above = align.indexOf('bottom') >= 0;
-
-      stack = ref.attr('role') == 'menuitem' || ref.closest('[role=menuitem]').length > 0;
-
-      ref.offsetWidth = ref.outerWidth();
-      ref.offsetHeight = ref.outerHeight();
-      if (!above && pos.top + ref.offsetHeight + obj.height() > win.height()) {
-        above = true;
-      }
-      if (align.indexOf('right') >= 0) {
-        pos.left = pos.left + ref.outerWidth() - obj.width();
-      }
-      else if (stack) {
-        pos.left = pos.left + ref.offsetWidth - 5;
-        pos.top -= ref.offsetHeight;
-      }
-      if (pos.left + obj.width() > win.width()) {
-        pos.left = win.width() - obj.width() - 12;
-      }
-      pos.top = Math.max(0, pos.top + (above ? -obj.height() : ref.offsetHeight));
-      obj.css({ left:pos.left+'px', top:pos.top+'px' });
-    }
-
-    // add menu to stack
-    if (show) {
-      // truncate stack down to the one containing the ref link
-      for (var i = this.menu_stack.length - 1; stack && i >= 0; i--) {
-        if (!$(ref).parents('#'+this.menu_stack[i]).length && $(event.target).parent().attr('role') != 'menuitem')
-          this.hide_menu(this.menu_stack[i], event);
-      }
-      if (stack && this.menu_stack.length) {
-        obj.data('parent', $.last(this.menu_stack));
-        obj.css('z-index', ($('#'+$.last(this.menu_stack)).css('z-index') || 0) + 1);
-      }
-      else if (!stack && this.menu_stack.length) {
-        this.hide_menu(this.menu_stack[0], event);
-      }
-
-      obj.show().attr('aria-hidden', 'false').data('opener', ref.attr('aria-expanded', 'true').get(0));
-      this.triggerEvent('menu-open', { name:name, obj:obj, props:prop, originalEvent:event });
-      this.menu_stack.push(name);
-
-      this.menu_keyboard_active = show && keyboard;
-      if (this.menu_keyboard_active) {
-        this.focused_menu = name;
-        obj.find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
-      }
-    }
-    else {  // close menu
-      this.hide_menu(name, event);
-    }
-
-    return show;
-  };
-
-  // hide the given popup menu (and its children)
-  this.hide_menu = function(name, event)
-  {
-    if (!this.menu_stack.length) {
-      // delegate to subscribers
-      this.triggerEvent('menu-close', { name:name, props:{ menu:name }, originalEvent:event });
-      return;
-    }
-
-    var obj, keyboard = rcube_event.is_keyboard(event);
-    for (var j=this.menu_stack.length-1; j >= 0; j--) {
-      obj = $('#' + this.menu_stack[j]).hide().attr('aria-hidden', 'true').data('parent', false);
-      this.triggerEvent('menu-close', { name:this.menu_stack[j], obj:obj, props:{ menu:this.menu_stack[j] }, originalEvent:event });
-      if (this.menu_stack[j] == name) {
-        j = -1;  // stop loop
-        if (obj.data('opener')) {
-          $(obj.data('opener')).attr('aria-expanded', 'false');
-          if (keyboard)
-            obj.data('opener').focus();
-        }
-      }
-      this.menu_stack.pop();
-    }
-
-    // focus previous menu in stack
-    if (this.menu_stack.length && keyboard) {
-      this.menu_keyboard_active = true;
-      this.focused_menu = $.last(this.menu_stack);
-      if (!obj || !obj.data('opener'))
-        $('#'+this.focused_menu).find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
-    }
-    else {
-      this.focused_menu = null;
-      this.menu_keyboard_active = false;
-    }
-  };
-
-  // position a menu element on the screen in relation to other object
-  this.element_position = function(element, obj)
-  {
-    var obj = $(obj), win = $(window),
-      width = obj.outerWidth(),
-      height = obj.outerHeight(),
-      menu_pos = obj.data('menu-pos'),
-      win_height = win.height(),
-      elem_height = $(element).height(),
-      elem_width = $(element).width(),
-      pos = obj.offset(),
-      top = pos.top,
-      left = pos.left + width;
-
-    if (menu_pos == 'bottom') {
-      top += height;
-      left -= width;
-    }
-    else
-      left -= 5;
-
-    if (top + elem_height > win_height) {
-      top -= elem_height - height;
-      if (top < 0)
-        top = Math.max(0, (win_height - elem_height) / 2);
-    }
-
-    if (left + elem_width > win.width())
-      left -= elem_width + width;
-
-    element.css({left: left + 'px', top: top + 'px'});
-  };
-
-  // initialize HTML editor
-  this.editor_init = function(config, id)
-  {
-    this.editor = new rcube_text_editor(config || this.env.editor_config, id);
-  };
-
-
-  /********************************************************/
-  /*********  html to text conversion functions   *********/
-  /********************************************************/
-
-  this.html2plain = function(html, func)
-  {
-    return this.format_converter(html, 'html', func);
-  };
-
-  this.plain2html = function(plain, func)
-  {
-    return this.format_converter(plain, 'plain', func);
-  };
-
-  this.format_converter = function(text, format, func)
-  {
-    // warn the user (if converted content is not empty)
-    if (!text
-      || (format == 'html' && !(text.replace(/<[^>]+>|&nbsp;|\xC2\xA0|\s/g, '')).length)
-      || (format != 'html' && !(text.replace(/\xC2\xA0|\s/g, '')).length)
-    ) {
-      // without setTimeout() here, textarea is filled with initial (onload) content
-      if (func)
-        setTimeout(function() { func(''); }, 50);
-      return true;
-    }
-
-    var confirmed = this.env.editor_warned || confirm(this.get_label('editorwarning'));
-
-    this.env.editor_warned = true;
-
-    if (!confirmed)
-      return false;
-
-    var url = '?_task=utils&_action=' + (format == 'html' ? 'html2text' : 'text2html'),
-      lock = this.set_busy(true, 'converting');
-
-    $.ajax({ type: 'POST', url: url, data: text, contentType: 'application/octet-stream',
-      error: function(o, status, err) { ref.http_error(o, status, err, lock); },
-      success: function(data) {
-        ref.set_busy(false, null, lock);
-        if (func) func(data);
-      }
-    });
-
-    return true;
-  };
-
-
-  /********************************************************/
-  /*********        remote request methods        *********/
-  /********************************************************/
-
-  // compose a valid url with the given parameters
-  this.url = function(action, query)
-  {
-    var querystring = typeof query === 'string' ? query : '';
-
-    if (typeof action !== 'string')
-      query = action;
-    else if (!query || typeof query !== 'object')
-      query = {};
-
-    if (action)
-      query._action = action;
-    else if (this.env.action)
-      query._action = this.env.action;
-
-    var url = this.env.comm_path, k, param = {};
-
-    // overwrite task name
-    if (action && action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
-      query._action = RegExp.$2;
-      url = url.replace(/\_task=[a-z0-9_-]+/, '_task=' + RegExp.$1);
-    }
-
-    // force _framed=0
-    if (query._framed === 0) {
-      url = url.replace('&_framed=1', '');
-      query._framed = null;
-    }
-
-    // remove undefined values
-    for (k in query) {
-      if (query[k] !== undefined && query[k] !== null)
-        param[k] = query[k];
-    }
-
-    if (param = $.param(param))
-      url += (url.indexOf('?') > -1 ? '&' : '?') + param;
-
-    if (querystring)
-      url += (url.indexOf('?') > -1 ? '&' : '?') + querystring;
-
-    return url;
-  };
-
-  this.redirect = function(url, lock)
-  {
-    if (lock !== false)
-      this.set_busy(true, 'loading');
-
-    if (this.is_framed()) {
-      url = url.replace(/&_framed=1/, '');
-      parent.rcmail.redirect(url, lock);
-    }
-    else {
-      if (this.env.extwin) {
-        if (typeof url == 'string')
-          url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
-        else
-          url._extwin = 1;
-      }
-      this.location_href(url, window);
-    }
-  };
-
-  this.goto_url = function(action, query, lock, secure)
-  {
-    var url = this.url(action, query)
-    if (secure) url = this.secure_url(url);
-    this.redirect(url, lock);
-  };
-
-  this.location_href = function(url, target, frame)
-  {
-    if (frame)
-      this.lock_frame(target);
-
-    if (typeof url == 'object')
-      url = this.env.comm_path + '&' + $.param(url);
-
-    // simulate real link click to force IE to send referer header
-    if (bw.ie && target == window)
-      $('<a>').attr('href', url).appendTo(document.body).get(0).click();
-    else
-      target.location.href = url;
-
-    // reset keep-alive interval
-    this.start_keepalive();
-  };
-
-  // update browser location to remember current view
-  this.update_state = function(query)
-  {
-    if (window.history.replaceState)
-      try {
-        // This may throw security exception in Firefox (#5400)
-        window.history.replaceState({}, document.title, rcmail.url('', query));
-      }
-      catch(e) { /* ignore */ };
-  };
-
-  // send a http request to the server
-  this.http_request = function(action, data, lock, type)
-  {
-    if (type != 'POST')
-      type = 'GET';
-
-    if (typeof data !== 'object')
-      data = rcube_parse_query(data);
-
-    data._remote = 1;
-    data._unlock = lock ? lock : 0;
-
-    // trigger plugin hook
-    var result = this.triggerEvent('request' + action, data);
-
-    // abort if one of the handlers returned false
-    if (result === false) {
-      if (data._unlock)
-        this.set_busy(false, null, data._unlock);
-      return false;
-    }
-    else if (result && result.getResponseHeader) {
-      return result;
-    }
-    else if (result !== undefined) {
-      data = result;
-      if (data._action) {
-        action = data._action;
-        delete data._action;
-      }
-    }
-
-    var url = this.url(action);
-
-    // reset keep-alive interval
-    this.start_keepalive();
-
-    // send request
-    return $.ajax({
-      type: type, url: url, data: data, dataType: 'json',
-      success: function(data) { ref.http_response(data); },
-      error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
-    });
-  };
-
-  // send a http GET request to the server
-  this.http_get = this.http_request;
-
-  // send a http POST request to the server
-  this.http_post = function(action, data, lock)
-  {
-    return this.http_request(action, data, lock, 'POST');
-  };
-
-  // aborts ajax request
-  this.abort_request = function(r)
-  {
-    if (r.request)
-      r.request.abort();
-    if (r.lock)
-      this.set_busy(false, null, r.lock);
-  };
-
-  // handle HTTP response
-  this.http_response = function(response)
-  {
-    if (!response)
-      return;
-
-    if (response.unlock)
-      this.set_busy(false, null, response.unlock);
-
-    this.triggerEvent('responsebefore', {response: response});
-    this.triggerEvent('responsebefore'+response.action, {response: response});
-
-    // set env vars
-    if (response.env)
-      this.set_env(response.env);
-
-    var i;
-
-    // we have labels to add
-    if (typeof response.texts === 'object') {
-      for (i in response.texts)
-        if (typeof response.texts[i] === 'string')
-          this.add_label(i, response.texts[i]);
-    }
-
-    // if we get javascript code from server -> execute it
-    if (response.exec) {
-      eval(response.exec);
-    }
-
-    // execute callback functions of plugins
-    if (response.callbacks && response.callbacks.length) {
-      for (i=0; i < response.callbacks.length; i++)
-        this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
-    }
-
-    // process the response data according to the sent action
-    switch (response.action) {
-      case 'mark':
-        // Mark the message as Seen also in the opener/parent
-        if ((this.env.action == 'show' || this.env.action == 'preview') && this.env.last_flag == 'SEEN')
-          this.set_unread_message(this.env.uid, this.env.mailbox);
-        break;
-
-      case 'delete':
-        if (this.task == 'addressbook') {
-          var sid, uid = this.contact_list.get_selection(), writable = false;
-
-          if (uid && this.contact_list.rows[uid]) {
-            // search results, get source ID from record ID
-            if (this.env.source == '') {
-              sid = String(uid).replace(/^[^-]+-/, '');
-              writable = sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly;
+        if (save_error)
+            this.env.is_sent = true;
+    };
+
+    this.image_rotate = function()
+    {
+        var curr = this.image_style ? (this.image_style.rotate || 0) : 0;
+
+        this.image_style.rotate = curr > 180 ? 0 : curr + 90;
+        this.apply_image_style();
+    };
+
+    this.image_scale = function(prop)
+    {
+        var curr = this.image_style ? (this.image_style.scale || 1) : 1;
+
+        this.image_style.scale = Math.max(0.1, curr + 0.1 * (prop == '-' ? -1 : 1));
+        this.apply_image_style();
+    };
+
+    this.apply_image_style = function()
+    {
+        var style = [],
+            head = $(this.gui_objects.messagepartframe).contents().find('head');
+
+        $('#image-style', head).remove();
+
+        $.each({scale: '', rotate: 'deg'}, function(i, v) {
+            var val = ref.image_style[i];
+            if (val)
+                style.push(i + '(' + val + v + ')');
+        });
+
+        if (style)
+            head.append($('<style id="image-style">').text('img { transform: ' + style.join(' ') + '}'));
+    };
+
+    // Update import dialog state
+    this.import_state_set = function(state)
+    {
+        if (this.import_dialog) {
+            this.import_state = state;
+
+            var button = $(this.import_dialog).parent().find('.ui-dialog-buttonset > button').first();
+
+            if (state != 'error') {
+                // replace Import/Cancel buttons with Close button
+                button.hide();
+                button.next().text(this.gettext('close')).focus();
             }
             else {
-              writable = !this.env.address_sources[this.env.source].readonly;
+                // activate the Import button
+                button.prop('disabled', false);
             }
-          }
-          this.enable_command('delete', 'edit', writable);
-          this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
-          this.enable_command('export-selected', 'print', false);
+        }
+    };
+
+
+    /*********************************************************/
+    /*********     keyboard live-search methods      *********/
+    /*********************************************************/
+
+    // handler for keyboard events on address-fields
+    this.ksearch_keydown = function(e, obj, props)
+    {
+        if (this.ksearch_timer)
+            clearTimeout(this.ksearch_timer);
+
+        var key = rcube_event.get_keycode(e);
+
+        switch (key) {
+            case 38:  // arrow up
+            case 40:  // arrow down
+                if (!this.ksearch_visible())
+                    return;
+
+                var dir = key == 38 ? 1 : 0,
+                    highlight = this.ksearch_pane.find('li.selected')[0];
+
+                if (!highlight)
+                    highlight = this.ksearch_pane.__ul.firstChild;
+
+                if (highlight)
+                    this.ksearch_select(dir ? highlight.previousSibling : highlight.nextSibling);
+
+                return rcube_event.cancel(e);
+
+            case 9:   // tab
+                if (rcube_event.get_modifier(e) == SHIFT_KEY || !this.ksearch_visible()) {
+                    this.ksearch_hide();
+                    return;
+                }
+
+            case 13:  // enter
+                if (!this.ksearch_visible())
+                    return false;
+
+                // insert selected address and hide ksearch pane
+                this.insert_recipient(this.ksearch_selected);
+                this.ksearch_hide();
+
+                // Don't cancel on Tab, we want to jump to the next field (#5659)
+                return key == 9 ? null : rcube_event.cancel(e);
+
+            case 27:  // escape
+                this.ksearch_hide();
+                return;
+
+            case 37:  // left
+            case 39:  // right
+                return;
         }
 
-      case 'move':
-        if (this.env.action == 'show') {
-          // re-enable commands on move/delete error
-          this.enable_command(this.env.message_commands, true);
-          if (!this.env.list_post)
-            this.enable_command('reply-list', false);
-        }
-        else if (this.task == 'addressbook') {
-          this.triggerEvent('listupdate', { list:this.contact_list, folder:this.env.source, rowcount:this.contact_list.rowcount });
+        // start timer
+        this.ksearch_timer = setTimeout(function() { ref.ksearch_get_results(props); }, 200);
+        this.ksearch_input = obj;
+
+        return true;
+    };
+
+    this.ksearch_visible = function()
+    {
+        return this.ksearch_selected !== null && this.ksearch_selected !== undefined && this.ksearch_value;
+    };
+
+    this.ksearch_select = function(node)
+    {
+        if (this.ksearch_pane && node) {
+            this.ksearch_pane.find('li.selected').removeClass('selected').removeAttr('aria-selected');
         }
 
-      case 'purge':
-      case 'expunge':
-        if (this.task == 'mail') {
-          if (!this.env.exists) {
-            // clear preview pane content
-            if (this.env.contentframe)
-              this.show_contentframe(false);
-            // disable commands useless when mailbox is empty
-            this.enable_command(this.env.message_commands, 'purge', 'expunge',
-              'select-all', 'select-none', 'expand-all', 'expand-unread', 'collapse-all', false);
-          }
-          if (this.message_list)
-            this.triggerEvent('listupdate', { list:this.message_list, folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+        if (node) {
+            $(node).addClass('selected').attr('aria-selected', 'true');
+            this.ksearch_selected = node._rcm_id;
+            $(this.ksearch_input).attr('aria-activedescendant', 'rcmkSearchItem' + this.ksearch_selected);
         }
-        break;
+    };
 
-      case 'refresh':
-      case 'check-recent':
-        // update message flags
-        $.each(this.env.recent_flags || {}, function(uid, flags) {
-          ref.set_message(uid, 'deleted', flags.deleted);
-          ref.set_message(uid, 'replied', flags.answered);
-          ref.set_message(uid, 'unread', !flags.seen);
-          ref.set_message(uid, 'forwarded', flags.forwarded);
-          ref.set_message(uid, 'flagged', flags.flagged);
+    this.insert_recipient = function(id)
+    {
+        if (id === null || !this.env.contacts[id] || !this.ksearch_input)
+            return;
+
+        var trigger = false, insert = '', delim = ', ',
+            contact = this.env.contacts[id];
+
+        this.ksearch_destroy();
+
+        // insert all members of a group
+        if (typeof contact === 'object' && contact.type == 'group' && !contact.email && contact.id) {
+            // We wrap the group name with invisible markers to prevent from problems with group expanding (#7569)
+            var name = '\u200b' + contact.name + '\u200b';
+            insert = name + delim;
+            this.group2expand[contact.id] = {name: name, input: this.ksearch_input};
+            this.http_request('mail/group-expand', {_source: contact.source, _gid: contact.id}, false);
+        }
+        else if (typeof contact === 'object' && contact.name) {
+            insert = contact.name + delim;
+            trigger = true;
+        }
+        else if (typeof contact === 'string') {
+            insert = contact + delim;
+            trigger = true;
+        }
+
+        this.ksearch_input_replace(this.ksearch_value, insert, null, trigger);
+
+        if (trigger) {
+            this.triggerEvent('autocomplete_insert', {
+                field: this.ksearch_input,
+                insert: insert,
+                data: contact,
+                search: this.ksearch_value_last,
+                result_type: 'person'
+            });
+
+            this.ksearch_value_last = null;
+            this.compose_type_activity++;
+        }
+    };
+
+    this.replace_group_recipients = function(id, recipients)
+    {
+        var data = this.group2expand[id];
+
+        if (data) {
+            this.ksearch_input_replace(data.name, recipients, data.input);
+
+            this.triggerEvent('autocomplete_insert', {
+                field: data.input,
+                insert: recipients,
+                data: data,
+                search: this.ksearch_value_last,
+                result_type: 'group'
+            });
+
+            this.ksearch_value_last = null;
+            this.group2expand[id] = null;
+            this.compose_type_activity++;
+        }
+    };
+
+    // address search processor
+    this.ksearch_get_results = function(props)
+    {
+        if (this.ksearch_pane && this.ksearch_pane.is(":visible"))
+            this.ksearch_pane.hide();
+
+        // get string from cursor position back to the last comma or semicolon
+        var q = this.ksearch_input_get(),
+            min = this.env.autocomplete_min_length,
+            data = this.ksearch_data;
+
+        // trim query string
+        q = q.trim();
+
+        // Don't (re-)search if the last results are still active
+        if (q == this.ksearch_value)
+            return;
+
+        this.ksearch_destroy();
+
+        if (q.length && q.length < min) {
+            if (!this.ksearch_info) {
+                this.ksearch_info = this.display_message(this.get_label('autocompletechars').replace('$min', min));
+            }
+            return;
+        }
+
+        var old_value = this.ksearch_value;
+        this.ksearch_value = q;
+        this.ksearch_value_last = q;   // Group expansion clears ksearch_value before calling autocomplete_insert trigger, therefore store it in separate variable for later consumption.
+
+        // ...string is empty
+        if (!q.length)
+            return;
+
+        // ...new search value contains old one and previous search was not finished or its result was empty
+        if (old_value && old_value.length && q.startsWith(old_value) && (!data || data.num <= 0) && this.env.contacts && !this.env.contacts.length)
+            return;
+
+        var sources = props && props.sources ? props.sources : [''];
+        var reqid = this.multi_thread_http_request({
+            items: sources,
+            threads: props && props.threads ? props.threads : 1,
+            action:  props && props.action ? props.action : 'mail/autocomplete',
+            postdata: { _search:q, _source:'%s' },
+            lock: this.display_message('searching', 'loading')
         });
-        delete this.env.recent_flags;
 
-      case 'getunread':
-      case 'search':
-        this.env.qsearch = null;
-      case 'list':
-        if (this.task == 'mail') {
-          var is_multifolder = this.is_multifolder_listing(),
-            list = this.message_list,
-            uid = this.env.list_uid;
+        this.ksearch_data = { id:reqid, sources:sources.slice(), num:sources.length };
+    };
 
-          this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
-          this.enable_command('expunge', 'purge', this.env.exists && !is_multifolder);
-          this.enable_command('import-messages', !is_multifolder);
-          this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
+    this.ksearch_query_results = function(results, search, reqid)
+    {
+    // trigger multi-thread http response callback
+        this.multi_thread_http_response(results, reqid);
 
-          if (list) {
-            if (response.action == 'list' || response.action == 'search') {
-              // highlight message row when we're back from message page
-              if (uid) {
-                if (uid === 'FIRST') {
-                  uid = list.get_first_row();
+        // search stopped in meantime?
+        if (!this.ksearch_value)
+            return;
+
+        // ignore this outdated search response
+        if (this.ksearch_input && search != this.ksearch_value)
+            return;
+
+        // display search results
+        var i, id, len, ul, text, type, init,
+            is_framed = this.is_framed(),
+            value = this.ksearch_value,
+            maxlen = this.env.autocomplete_max ? this.env.autocomplete_max : 15;
+
+        // create results pane if not present
+        if (!this.ksearch_pane) {
+            ul = $('<ul>');
+            this.ksearch_pane = $('<div>')
+                .attr({id: 'rcmKSearchpane', role: 'listbox', 'class': 'select-menu inline'})
+                .css({position: 'absolute', 'z-index': 30000})
+                .append(ul)
+                .appendTo(is_framed ? parent.document.body : document.body);
+
+            this.ksearch_pane.__ul = ul[0];
+            this.triggerEvent('autocomplete_create', {obj: this.ksearch_pane});
+        }
+
+        ul = this.ksearch_pane.__ul;
+
+        // remove all search results or add to existing list if parallel search
+        if (reqid && this.ksearch_pane.data('reqid') == reqid) {
+            maxlen -= ul.childNodes.length;
+        }
+        else {
+            this.ksearch_pane.data('reqid', reqid);
+            init = 1;
+            // reset content
+            ul.innerHTML = '';
+            this.env.contacts = [];
+
+            // Calculate the results pane position and size
+            // Elastic: On small screen we use the width/position of the whole .ac-input element (input's parent)
+            var is_composite_input = $('html').is('.layout-small,.layout-phone') && $(this.ksearch_input).parents('.ac-input').length == 1,
+                input = is_composite_input ? $(this.ksearch_input).parents('.ac-input')[0] : $(this.ksearch_input)[0],
+                pos = $(input).offset();
+
+            // ... consider scroll position
+            pos.left -= $(document.documentElement).scrollLeft();
+            pos.top -= $(document.documentElement).scrollTop();
+
+            // ... consider iframe position
+            if (is_framed) {
+                try {
+                    parent.$('iframe').each(function() {
+                        if (this.contentWindow == window) {
+                            var offset = $(this).offset();
+                            pos.left += offset.left;
+                            pos.top += offset.top;
+                        }
+                    });
                 }
-                else if (uid === 'LAST') {
-                  uid = list.get_last_row();
-                }
-                else if (!list.rows[uid]) {
-                  uid += '-' + this.env.mailbox;
-                }
-
-                if (uid && list.rows[uid]) {
-                  list.select(uid);
-                }
-
-                delete this.env.list_uid;
-              }
-
-              this.enable_command('set-listmode', this.env.threads && !is_multifolder);
-              if (list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
-                list.focus();
-
-              // trigger 'select' so all dependent actions update its state
-              // e.g. plugins use this event to activate buttons (#1490647)
-              list.triggerEvent('select');
+                catch(e) {}
             }
 
-            if (response.action != 'getunread')
-              this.triggerEvent('listupdate', { list:list, folder:this.env.mailbox, rowcount:list.rowcount });
-          }
+            var w = $(is_framed ? parent : window).width(),
+                input_width = $(input).outerWidth(),
+                left = w - pos.left > 200 ? pos.left : w - 200,
+                top = (pos.top + input.offsetHeight + 1),
+                width = Math.min(400, w - left);
+
+            this.ksearch_pane.css({
+                left: (is_composite_input ? pos.left : left) + 'px',
+                top: top + 'px',
+                maxWidth: (is_composite_input ? input_width : width) + 'px',
+                minWidth: '200px',
+                width: is_composite_input ? (input_width + 'px') : 'auto',
+                display: 'none'
+            });
         }
-        else if (this.task == 'addressbook') {
-          var list = this.contact_list,
-            uid = this.env.list_uid;
 
-          this.enable_command('export', 'select-all', 'select-none', (list && list.rowcount > 0));
+        // add each result line to list
+        if (results && (len = results.length)) {
+            for (i=0; i < len && maxlen > 0; i++) {
+                text = typeof results[i] === 'object' ? (results[i].display || results[i].name) : results[i];
+                type = typeof results[i] === 'object' ? results[i].type : '';
+                id = i + this.env.contacts.length;
+                $('<li>').attr({id: 'rcmkSearchItem' + id, role: 'option'})
+                    .html('<i class="icon"></i>' + this.quote_html(text.replace(new RegExp('('+RegExp.escape(value)+')', 'ig'), '##$1%%')).replace(/##([^%]+)%%/g, '<b>$1</b>'))
+                    .addClass(type || '')
+                    .appendTo(ul)
+                    .mouseover(function() { ref.ksearch_select(this); })
+                    .mouseup(function() { ref.ksearch_click(this); })
+                    .get(0)._rcm_id = id;
+                maxlen -= 1;
+            }
+        }
 
-          if (response.action == 'list' || response.action == 'search') {
-            this.enable_command('search-create', this.env.source == '');
-            this.enable_command('search-delete', this.env.search_id);
-            this.update_group_commands();
+        if (ul.childNodes.length) {
+            // set the right aria-* attributes to the input field
+            $(this.ksearch_input)
+                .attr({'aria-haspopup': 'true', 'aria-expanded': 'true', 'aria-owns': 'rcmKSearchpane'});
 
-            if (list && uid) {
-              if (uid === 'FIRST') {
-                uid = list.get_first_row();
-              }
-              else if (uid === 'LAST') {
-                uid = list.get_last_row();
-              }
+            this.ksearch_pane.show();
 
-              if (uid && list.rows[uid]) {
-                list.select(uid);
-              }
+            // select the first
+            if (!this.env.contacts.length) {
+                this.ksearch_select($('li', ul)[0]);
+            }
+        }
 
-              delete this.env.list_uid;
+        if (len)
+            this.env.contacts = this.env.contacts.concat(results);
 
-              // trigger 'select' so all dependent actions update its state
-              list.triggerEvent('select');
+        if (this.ksearch_data.id == reqid)
+            this.ksearch_data.num--;
+    };
+
+    // Getter for input value
+    // returns a string from the last comma to current cursor position
+    this.ksearch_input_get = function()
+    {
+        if (!this.ksearch_input)
+            return '';
+
+        var cp = this.get_caret_pos(this.ksearch_input);
+
+        return this.ksearch_input.value.substr(0, cp).split(/[,;]/).pop();
+    };
+
+    // Setter for input value
+    // replaces 'from' string with 'to' and sets cursor position at the end
+    this.ksearch_input_replace = function(from, to, input, trigger)
+    {
+        if (!this.ksearch_input && !input)
+            return;
+
+        if (!input)
+            input = this.ksearch_input;
+
+        var cpos = this.get_caret_pos(input),
+            p = input.value.lastIndexOf(from, cpos),
+            pre = input.value.substring(0, p),
+            end = input.value.substring(p + from.length, input.value.length);
+
+        input.value = pre + to + end;
+
+        // set caret to insert pos
+        this.set_caret_pos(input, cpos + to.length - from.length);
+
+        // run onchange action on the element
+        $(input).trigger('change', [true, trigger]);
+    };
+
+    this.ksearch_click = function(node)
+    {
+        if (this.ksearch_input)
+            this.ksearch_input.focus();
+
+        this.insert_recipient(node._rcm_id);
+        this.ksearch_hide();
+    };
+
+    this.ksearch_blur = function()
+    {
+        if (this.ksearch_timer)
+            clearTimeout(this.ksearch_timer);
+
+        this.ksearch_input = null;
+        this.ksearch_hide();
+    };
+
+    this.ksearch_hide = function()
+    {
+        this.ksearch_selected = null;
+        this.ksearch_value = '';
+
+        if (this.ksearch_pane)
+            this.ksearch_pane.hide();
+
+        $(this.ksearch_input)
+            .attr({'aria-haspopup': 'false', 'aria-expanded': 'false'})
+            .removeAttr('aria-activedescendant')
+            .removeAttr('aria-owns');
+
+        this.ksearch_destroy();
+    };
+
+    // Clears autocomplete data/requests
+    this.ksearch_destroy = function()
+    {
+        if (this.ksearch_data)
+            this.multi_thread_request_abort(this.ksearch_data.id);
+
+        if (this.ksearch_info)
+            this.hide_message(this.ksearch_info);
+
+        if (this.ksearch_msg)
+            this.hide_message(this.ksearch_msg);
+
+        this.ksearch_data = null;
+        this.ksearch_info = null;
+        this.ksearch_msg = null;
+    };
+
+
+    /*********************************************************/
+    /*********         address book methods          *********/
+    /*********************************************************/
+
+    this.contactlist_select = function(list)
+    {
+        if (this.preview_timer)
+            clearTimeout(this.preview_timer);
+
+        var id, targets,
+            groupcount = 0,
+            writable = false,
+            deletable = false,
+            copy_writable = false,
+            selected = list.get_selection().length,
+            source = this.env.source ? this.env.address_sources[this.env.source] : null;
+
+        // we don't have dblclick handler here, so use 50 instead of this.dblclick_time
+        if (this.env.contentframe && !list.multi_selecting && (id = list.get_single_selection()))
+            this.preview_timer = setTimeout(function() { ref.load_contact(id, 'show'); }, this.preview_delay_click);
+        else if (this.env.contentframe)
+            this.show_contentframe(false);
+
+        if (selected) {
+            list.draggable = false;
+
+            // no source = search result, we'll need to detect if any of
+            // selected contacts are in writable addressbook to enable edit/delete
+            // we'll also need to know sources used in selection for copy
+            // and group-addmember operations (drag&drop)
+            this.env.selection_sources = [];
+
+            if (source) {
+                this.env.selection_sources.push(this.env.source);
             }
 
-            if (list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
-              list.focus();
+            $.each(list.get_selection(), function(i, v) {
+                var book, sid, contact = list.data[v];
+                if (!source) {
+                    sid = String(v).replace(/^[^-]+-/, '');
+                    book = sid ? ref.env.address_sources[sid] : null;
 
-            this.triggerEvent('listupdate', { list:list, folder:this.env.source, rowcount:list.rowcount });
-          }
+                    if (book) {
+                        writable = writable || (!book.readonly && !contact.readonly);
+                        deletable = deletable || book.deletable === true;
+                        ref.env.selection_sources.push(sid);
+                    }
+                }
+                else {
+                    writable = writable || (!source.readonly && !contact.readonly);
+                    deletable = deletable || source.deletable === true;
+                }
+
+                if (contact._type != 'group')
+                    list.draggable = true;
+            });
+
+            this.env.selection_sources = $.unique(this.env.selection_sources);
+
+            if (source && source.groups)
+                $.each(this.env.contactgroups, function() { if (this.source === ref.env.source) groupcount++; });
+
+            targets = $.map(this.env.address_sources, function(v, i) { return v.readonly ? null : i; });
+            copy_writable = $.grep(targets, function(v) { return jQuery.inArray(v, ref.env.selection_sources) < 0; }).length > 0;
         }
-        break;
 
-      case 'list-contacts':
-      case 'search-contacts':
+        // if a group is currently selected, and there is at least one contact selected
+        // we can enable the group-remove-selected command
+        this.enable_command('group-assign-selected', groupcount > 0 && writable);
+        this.enable_command('group-remove-selected', this.env.group && writable);
+        this.enable_command('print', 'qrcode', selected == 1);
+        this.enable_command('export-selected', selected > 0);
+        this.enable_command('edit', id && writable);
+        this.enable_command('delete', 'move', writable || deletable);
+        this.enable_command('copy', copy_writable);
+
+        return false;
+    };
+
+    this.list_contacts = function(src, group, page, search)
+    {
+        var win, folder, index = -1, url = {},
+            refresh = src === undefined && group === undefined && page === undefined,
+            target = window;
+
+        if (!src)
+            src = this.env.source;
+
+        if (refresh)
+            group = this.env.group;
+
+        if (src != this.env.source) {
+            page = this.env.current_page = 1;
+            this.reset_qsearch();
+        }
+        else if (!refresh && group != this.env.group)
+            page = this.env.current_page = 1;
+
+        if (this.env.search_id)
+            folder = 'S'+this.env.search_id;
+        else if (!this.env.search_request)
+            folder = group ? 'G'+src+group : src;
+
+        this.env.source = this.env.last_source = src;
+        this.env.group = this.env.last_group = group;
+
+        // truncate groups listing stack
+        $.each(this.env.address_group_stack, function(i, v) {
+            if (ref.env.group == v.id) {
+                index = i;
+                return false;
+            }
+        });
+
+        this.env.address_group_stack = index < 0 ? [] : this.env.address_group_stack.slice(0, index);
+
+        // remove cached contact group selector
+        this.destroy_entity_selector('contactgroup-selector');
+
+        // make sure the current group is on top of the stack
+        if (this.env.group) {
+            if (!search) search = {};
+            search.id = this.env.group;
+            this.env.address_group_stack.push(search);
+
+            // mark the first group on the stack as selected in the directory list
+            folder = 'G'+src+this.env.address_group_stack[0].id;
+        }
+        else if (this.gui_objects.addresslist_title) {
+            $(this.gui_objects.addresslist_title).text(this.get_label('contacts'));
+        }
+
+        if (!this.env.search_id)
+            this.select_folder(folder, '', true);
+
+        // load contacts remotely
+        if (this.gui_objects.contactslist) {
+            this.list_contacts_remote(src, group, page);
+            return;
+        }
+
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            target = win;
+            url._framed = 1;
+        }
+
+        if (group)
+            url._gid = group;
+        if (page)
+            url._page = page;
+        if (src)
+            url._source = src;
+
+        // also send search request to get the correct listing
+        if (this.env.search_request)
+            url._search = this.env.search_request;
+
+        this.set_busy(true, 'loading');
+        this.location_href(url, target);
+    };
+
+    // send remote request to load contacts list
+    this.list_contacts_remote = function(src, group, page)
+    {
+    // clear message list first
+        this.list_contacts_clear();
+
+        // send request to server
+        var url = {}, lock = this.set_busy(true, 'loading');
+
+        if (src)
+            url._source = src;
+        if (page)
+            url._page = page;
+        if (group)
+            url._gid = group;
+
+        this.env.source = src;
+        this.env.group = group;
+
+        // also send search request to get the right records
+        if (this.env.search_request)
+            url._search = this.env.search_request;
+
+        this.http_request(this.env.task == 'mail' ? 'list-contacts' : 'list', url, lock);
+
+        if (this.env.task != 'mail')
+            this.update_state({_source: src, _page: page && page > 1 ? page : null, _gid: group});
+    };
+
+    this.list_contacts_clear = function()
+    {
+        this.contact_list.data = {};
+        this.contact_list.clear(true);
+        this.show_contentframe(false);
+        this.enable_command('delete', 'move', 'copy', 'print', false);
+    };
+
+    this.set_group_prop = function(prop)
+    {
+        if (this.gui_objects.addresslist_title) {
+            var boxtitle = $(this.gui_objects.addresslist_title).html('');  // clear contents
+
+            // add link to pop back to parent group
+            if (this.env.address_group_stack.length > 1
+        || (this.env.address_group_stack.length == 1 && this.env.address_group_stack[0].search_request)
+            ) {
+                var link = $('<a href="#list">...</a>')
+                    .attr({title: this.get_label('uponelevel'), 'class': 'poplink'})
+                    .click(function() { return ref.command('popgroup', '', this); });
+
+                boxtitle.append(link).append('&nbsp;&raquo;&nbsp;');
+            }
+
+            boxtitle.append($('<span>').text(prop ? prop.name : this.get_label('contacts')));
+        }
+    };
+
+    // load contact record
+    this.load_contact = function(cid, action, framed)
+    {
+        var win, url = {}, target = window,
+            rec = this.contact_list ? this.contact_list.data[cid] : null;
+
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            url._framed = 1;
+            target = win;
+            this.show_contentframe(true);
+
+            // load dummy content, unselect selected row(s)
+            if (!cid)
+                this.contact_list.clear_selection();
+
+            this.enable_command('export-selected', 'print', rec && rec._type != 'group');
+        }
+        else if (framed)
+            return false;
+
+        if (action && (cid || action == 'add') && !this.drag_active) {
+            if (this.env.group)
+                url._gid = this.env.group;
+
+            if (this.env.search_request)
+                url._search = this.env.search_request;
+
+            if (cid)
+                url._cid = this.preview_id = cid;
+
+            url._action = action;
+            url._source = this.env.source;
+
+            this.location_href(url, target, true);
+        }
+
+        return true;
+    };
+
+    // add/delete member to/from the group
+    this.group_member_change = function(what, cid, source, gid)
+    {
+        if (what != 'add')
+            what = 'del';
+
+        var lock = this.display_message(what == 'add' ? 'addingmember' : 'removingmember', 'loading'),
+            post_data = {_cid: cid, _source: source, _gid: gid};
+
+        this.http_post('group-'+what+'members', post_data, lock);
+    };
+
+    this.contacts_drag_menu = function(e, to)
+    {
+        var dest = to.type == 'group' ? to.source : to.id,
+            source = this.env.source;
+
+        if (!this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
+            return true;
+
+        // search result may contain contacts from many sources, but if there is only one...
+        if (source == '' && this.env.selection_sources.length == 1)
+            source = this.env.selection_sources[0];
+
+        if (to.type == 'group' && dest == source) {
+            var cid = this.contact_list.get_selection().join(',');
+            this.group_member_change('add', cid, dest, to.id);
+            return true;
+        }
+        // move action is not possible, "redirect" to copy if menu wasn't requested
+        else if (!this.commands.move && rcube_event.get_modifier(e) != SHIFT_KEY) {
+            this.copy_contacts(to);
+            return true;
+        }
+
+        return this.drag_menu(e, to);
+    };
+
+    // copy contact(s) to the specified target (group or directory)
+    this.copy_contacts = function(to, event, cid)
+    {
+        if (!to) {
+            cid = this.contact_list.get_selection();
+            return this.addressbook_selector(event, function(to, obj) {
+                var to = $(obj).data('source') ? ref.env.contactgroups['G' + $(obj).data('source') + $(obj).data('gid')] : ref.env.address_sources[to];
+                ref.copy_contacts(to, null, cid);
+            });
+        }
+
+        var dest = to.type == 'group' ? to.source : to.id,
+            source = this.env.source,
+            group = this.env.group ? this.env.group : '';
+
+        cid = cid ? cid.join(',') : this.contact_list.get_selection().join(',');
+
+        if (!cid || !this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
+            return;
+
+        // search result may contain contacts from many sources, but if there is only one...
+        if (source == '' && this.env.selection_sources.length == 1)
+            source = this.env.selection_sources[0];
+
+        // target is a group
+        if (to.type == 'group') {
+            if (dest == source)
+                return;
+
+            var lock = this.display_message('copyingcontact', 'loading'),
+                post_data = {_cid: cid, _source: this.env.source, _to: dest, _togid: to.id, _gid: group};
+
+            this.http_post('copy', post_data, lock);
+        }
+        // target is an addressbook
+        else if (to.id != source) {
+            var lock = this.display_message('copyingcontact', 'loading'),
+                post_data = {_cid: cid, _source: this.env.source, _to: to.id, _gid: group};
+
+            this.http_post('copy', post_data, lock);
+        }
+    };
+
+    // move contact(s) to the specified target (group or directory)
+    this.move_contacts = function(to, event, cid)
+    {
+        if (!to) {
+            cid = this.contact_list.get_selection();
+            return this.addressbook_selector(event, function(to, obj) {
+                var to = $(obj).data('source') ? ref.env.contactgroups['G' + $(obj).data('source') + $(obj).data('gid')] : ref.env.address_sources[to];
+                ref.move_contacts(to, null, cid);
+            });
+        }
+
+        var dest = to.type == 'group' ? to.source : to.id,
+            source = this.env.source,
+            group = this.env.group ? this.env.group : '';
+
+        if (!this.env.address_sources[dest] || this.env.address_sources[dest].readonly)
+            return;
+
+        if (!cid)
+            cid = this.contact_list.get_selection();
+
+        // search result may contain contacts from many sources, but if there is only one...
+        if (source == '' && this.env.selection_sources.length == 1)
+            source = this.env.selection_sources[0];
+
+        if (to.type == 'group') {
+            if (dest == source)
+                return;
+
+            this._with_selected_contacts('move', {_to: dest, _togid: to.id, _cid: cid});
+        }
+        // target is an addressbook
+        else if (to.id != source)
+            this._with_selected_contacts('move', {_to: to.id, _cid: cid});
+    };
+
+    // delete contact(s)
+    this.delete_contacts = function()
+    {
+        var undelete = this.env.source && this.env.address_sources[this.env.source].undelete;
+
+        if (undelete) {
+            this._with_selected_contacts('delete', {_cid: this.contact_list.get_selection()});
+        }
+        else {
+            var cid = this.contact_list.get_selection();
+            this.confirm_dialog(this.get_label('deletecontactconfirm'), 'delete', function() {
+                ref._with_selected_contacts('delete', {_cid: cid});
+            });
+        }
+    };
+
+    this._with_selected_contacts = function(action, post_data)
+    {
+        var selection = post_data._cid;
+
+        // exit if no contact specified or if selection is empty
+        if (!selection.length && !this.env.cid)
+            return;
+
+        var n, a_cids = [],
+            label = action == 'delete' ? 'contactdeleting' : 'movingcontact',
+            lock = this.display_message(label, 'loading'),
+            display_next = this.check_display_next();
+
+        if (this.env.cid)
+            a_cids.push(this.env.cid);
+        else {
+            for (n=0; n<selection.length; n++) {
+                id = selection[n];
+                a_cids.push(id);
+                this.contact_list.remove_row(id, display_next && n == selection.length-1);
+            }
+
+            if (!display_next)
+                this.contact_list.clear_selection();
+        }
+
+        if (!post_data)
+            post_data = {};
+
+        post_data._source = this.env.source;
+        post_data._from = this.env.action;
+        post_data._cid = a_cids.join(',');
+
+        if (this.env.group)
+            post_data._gid = this.env.group;
+
+        // also send search request to get the right records from the next page
+        if (this.env.search_request)
+            post_data._search = this.env.search_request;
+
+        // send request to server
+        this.http_post(action, post_data, lock);
+
+        return true;
+    };
+
+    // update a contact record in the list
+    this.update_contact_row = function(cid, cols_arr, newcid, source, data)
+    {
+        var list = this.contact_list;
+
+        cid = this.html_identifier(cid);
+
+        // when in searching mode, concat cid with the source name
+        if (!list.rows[cid]) {
+            cid = cid + '-' + source;
+            if (newcid)
+                newcid = newcid + '-' + source;
+        }
+
+        list.update_row(cid, cols_arr, newcid, true);
+        list.data[cid] = data;
+    };
+
+    // add row to contacts list
+    this.add_contact_row = function(cid, cols, classes, data)
+    {
+        if (!this.gui_objects.contactslist)
+            return false;
+
+        var c, col, list = this.contact_list,
+            row = { cols:[] };
+
+        row.id = 'rcmrow' + this.html_identifier(cid);
+        row.className = 'contact ' + (classes || '');
+
+        if (list.in_selection(cid))
+            row.className += ' selected';
+
+        // add each submitted col
+        for (c in cols) {
+            col = {};
+            col.className = String(c).toLowerCase();
+            col.innerHTML = cols[c];
+            row.cols.push(col);
+        }
+
+        // store data in list member
+        list.data[cid] = data;
+        list.insert_row(row);
+
+        this.enable_command('export', list.rowcount > 0);
+    };
+
+    this.init_contact_form = function()
+    {
+        var col;
+
+        if (this.env.coltypes) {
+            this.set_photo_actions($('#ff_photo').val());
+            for (col in this.env.coltypes)
+                this.init_edit_field(col, null);
+        }
+
+        $('.contactfieldgroup .row a.deletebutton').click(function() {
+            ref.delete_edit_field(this);
+            return false;
+        });
+
+        $('select.addfieldmenu').change(function() {
+            ref.insert_edit_field($(this).val(), $(this).attr('rel'), this);
+            this.selectedIndex = 0;
+        });
+
+        // enable date pickers on date fields
+        if ($.datepicker && this.env.date_format) {
+            $.datepicker.setDefaults({
+                dateFormat: this.env.date_format,
+                changeMonth: true,
+                changeYear: true,
+                yearRange: '-120:+10',
+                showOtherMonths: true,
+                selectOtherMonths: true
+            });
+            $('input.datepicker').datepicker();
+        }
+
+        // Submit search form on Enter
+        if (this.env.action == 'search')
+            $(this.gui_objects.editform).append($('<input type="submit">').hide())
+                .submit(function() { $('input.mainaction').click(); return false; });
+    };
+
+    // group creation dialog
+    this.group_create = function()
+    {
+        var input = $('<input>').attr({type: 'text', 'data-submit': 'true'}),
+            content = $('<label>').text(this.get_label('namex')).append(input),
+            source = this.env.source;
+
+        this.simple_dialog(content, 'newgroup', function() {
+            var name;
+            if (name = input.val()) {
+                ref.http_post('group-create', {_source: source, _name: name},
+                    ref.set_busy(true, 'loading'));
+                return true;
+            }
+        });
+    };
+
+    // group rename dialog
+    this.group_rename = function()
+    {
+        if (!this.env.group)
+            return;
+
+        var group_name = this.env.contactgroups['G' + this.env.source + this.env.group].name,
+            input = $('<input>').attr({type: 'text', 'data-submit': 'true'}).val(group_name),
+            content = $('<label>').text(this.get_label('namex')).append(input),
+            source = this.env.source,
+            group = this.env.group;
+
+        this.simple_dialog(content, 'grouprename', function() {
+            var name;
+            if ((name = input.val()) && name != group_name) {
+                ref.http_post('group-rename', {_source: source, _gid: group, _name: name},
+                    ref.set_busy(true, 'loading'));
+                return true;
+            }
+        });
+    };
+
+    this.group_delete = function()
+    {
+        if (this.env.group) {
+            var group = this.env.group;
+            this.confirm_dialog(this.get_label('deletegroupconfirm'), 'delete', function() {
+                var lock = ref.set_busy(true, 'groupdeleting');
+                ref.http_post('group-delete', {_source: ref.env.source, _gid: group}, lock);
+            });
+        }
+    };
+
+    // callback from server upon group-delete command
+    this.remove_group_item = function(prop)
+    {
+        var key = 'G' + prop.source + prop.id;
+
+        if (this.treelist.remove(key)) {
+            // make sure there is no cached address book or contact group selectors
+            this.destroy_entity_selector('addressbook-selector');
+            this.destroy_entity_selector('contactgroup-selector');
+
+            this.triggerEvent('group_delete', { source:prop.source, id:prop.id });
+            delete this.env.contactfolders[key];
+            delete this.env.contactgroups[key];
+        }
+
+        if (prop.source == this.env.source && prop.id == this.env.group)
+            this.list_contacts(prop.source, 0);
+    };
+
+    //assign selected contacts to a group
+    this.group_assign_selected = function(props, obj, event)
+    {
+        var cid = ref.contact_list.get_selection();
+        var source = ref.env.source;
+        this.contactgroup_selector(event, function(to) { ref.group_member_change('add', cid, source, to); });
+    };
+
+    //remove selected contacts from current active group
+    this.group_remove_selected = function()
+    {
+        this.http_post('group-delmembers', {_cid: this.contact_list.get_selection(),
+            _source: this.env.source, _gid: this.env.group});
+    };
+
+    //callback after deleting contact(s) from current group
+    this.remove_group_contacts = function(props)
+    {
+        if (this.env.group !== undefined && (this.env.group === props.gid)) {
+            var n, selection = this.contact_list.get_selection(),
+                display_next= this.check_display_next();
+
+            for (n=0; n<selection.length; n++) {
+                id = selection[n];
+                this.contact_list.remove_row(id, display_next && n == selection.length-1);
+            }
+
+            if (!display_next)
+                this.contact_list.clear_selection();
+        }
+    };
+
+    // callback for creating a new contact group
+    this.insert_contact_group = function(prop)
+    {
+        prop.type = 'group';
+
+        var key = 'G'+prop.source+prop.id,
+            link = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.id})
+                .click(function() { return ref.command('listgroup', prop, this); })
+                .text(prop.name);
+
+        this.env.contactfolders[key] = this.env.contactgroups[key] = prop;
+        this.treelist.insert({ id:key, html:link, classes:['contactgroup'] }, prop.source, 'contactgroup');
+
+        // make sure there is no cached address book or contact group selectors
+        this.destroy_entity_selector('addressbook-selector');
+        this.destroy_entity_selector('contactgroup-selector');
+
+        this.triggerEvent('group_insert', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key) });
+    };
+
+    // callback for renaming a contact group
+    this.update_contact_group = function(prop)
+    {
+        var key = 'G'+prop.source+prop.id,
+            newnode = {};
+
+        // group ID has changed, replace link node and identifiers
+        if (prop.newid) {
+            var newkey = 'G'+prop.source+prop.newid,
+                newprop = $.extend({}, prop);
+
+            this.env.contactfolders[newkey] = this.env.contactfolders[key];
+            this.env.contactfolders[newkey].id = prop.newid;
+            this.env.group = prop.newid;
+
+            delete this.env.contactfolders[key];
+            delete this.env.contactgroups[key];
+
+            newprop.id = prop.newid;
+            newprop.type = 'group';
+
+            newnode.id = newkey;
+            newnode.html = $('<a>').attr({href: '#', rel: prop.source + ':' + prop.newid})
+                .click(function() { return ref.command('listgroup', newprop, this); })
+                .text(prop.name);
+        }
+        // update displayed group name
+        else {
+            $(this.treelist.get_item(key)).children().first().text(prop.name);
+            this.env.contactfolders[key].name = this.env.contactgroups[key].name = prop.name;
+
+            if (prop.source == this.env.source && prop.id == this.env.group)
+                this.set_group_prop(prop);
+        }
+
+        // update list node and re-sort it
+        this.treelist.update(key, newnode, true);
+
+        // make sure there is no cached address book or contact group selectors
+        this.destroy_entity_selector('addressbook-selector');
+        this.destroy_entity_selector('contactgroup-selector');
+
+        this.triggerEvent('group_update', { id:prop.id, source:prop.source, name:prop.name, li:this.treelist.get_item(key), newid:prop.newid });
+    };
+
+    this.update_group_commands = function()
+    {
+        var source = this.env.source != '' ? this.env.address_sources[this.env.source] : null,
+            supported = source && source.groups && !source.readonly;
+
+        this.enable_command('group-create', supported);
+        this.enable_command('group-rename', 'group-delete', supported && this.env.group);
+    };
+
+    this.init_edit_field = function(col, elem)
+    {
+        var label = this.env.coltypes[col].label;
+
+        if (!elem)
+            elem = $('.ff_' + col);
+
+        if (label && !$('label[for="ff_' + col + '"]').length)
+            elem.placeholder(label);
+    };
+
+    this.insert_edit_field = function(col, section, menu)
+    {
+    // just make pre-defined input field visible
+        var elem = $('#ff_' + col);
+        if (elem.length) {
+            $('label[for="ff_' + col + '"]').parent().show();
+            elem.show().focus();
+            $(menu).children('option[value="' + col + '"]').prop('disabled', true);
+        }
+        else {
+            var lastelem = $('.ff_' + col),
+                appendcontainer = $('#contactsection'+section+' .contactcontroller'+col);
+
+            if (!appendcontainer.length) {
+                var sect = $('#contactsection'+section),
+                    lastgroup = $('.contactfieldgroup', sect).last();
+                appendcontainer = $('<fieldset>').addClass('contactfieldgroup contactcontroller'+col);
+                if (lastgroup.length)
+                    appendcontainer.insertAfter(lastgroup);
+                else
+                    sect.prepend(appendcontainer);
+            }
+
+            if (appendcontainer.get(0).nodeName == 'FIELDSET') {
+                var label, input,
+                    colprop = this.env.coltypes[col],
+                    name_suffix = colprop.limit != 1 ? '[]' : '',
+                    compact = $(menu).data('compact') ? true : false,
+                    input_id = 'ff_' + col + (colprop.count || 0),
+                    row = $('<div>').addClass('row input-group'),
+                    cell = $('<div>').addClass('contactfieldcontent ' + colprop.type);
+
+                // Field label
+                if (colprop.subtypes_select) {
+                    label = $(colprop.subtypes_select);
+                    if (!compact)
+                        label = $('<div>').addClass('contactfieldlabel label').append(label);
+                    else
+                        label.addClass('input-group-prepend');
+                }
+                else {
+                    label = $('<label>').addClass('contactfieldlabel label input-group-text')
+                        .attr('for', input_id).text(colprop.label);
+
+                    if (compact)
+                        label = $('<span class="input-group-prepend">').append(label);
+                }
+
+                // Field input
+                if (colprop.type == 'text' || colprop.type == 'date') {
+                    input = $('<input>')
+                        .addClass('form-control ff_' + col)
+                        .attr({type: 'text', name: '_'+col+name_suffix, size: colprop.size, id: input_id});
+
+                    this.init_edit_field(col, input);
+
+                    if (colprop.type == 'date' && $.datepicker)
+                        input.addClass('datepicker').datepicker();
+                }
+                else if (colprop.type == 'textarea') {
+                    input = $('<textarea>')
+                        .addClass('form-control ff_' + col)
+                        .attr({ name: '_' + col + name_suffix, cols: colprop.size, rows: colprop.rows, id: input_id });
+
+                    this.init_edit_field(col, input);
+                }
+                else if (colprop.type == 'composite') {
+                    var i, childcol, cp, first, templ, cols = [], suffices = [], content = cell;
+
+                    row.addClass('composite');
+
+                    if (compact)
+                        content = $('<div class="content input-group-text">');
+
+                    // read template for composite field order
+                    if (templ = this.env[col + '_template']) {
+                        for (i=0; i < templ.length; i++) {
+                            cols.push(templ[i][1]);
+                            suffices.push(templ[i][2]);
+                        }
+                    }
+                    else {  // list fields according to appearance in colprop
+                        for (childcol in colprop.childs)
+                            cols.push(childcol);
+                    }
+
+                    for (i=0; i < cols.length; i++) {
+                        childcol = cols[i];
+                        cp = colprop.childs[childcol];
+                        input = $('<input>')
+                            .addClass('form-control ff_' + childcol)
+                            .attr({ type: 'text', name: '_' + childcol + name_suffix, size: cp.size })
+                            .appendTo(content);
+
+                        if (!compact)
+                            content.append(suffices[i] || " ");
+
+                        this.init_edit_field(childcol, input);
+                        if (!first) first = input;
+                    }
+
+                    if (compact)
+                        input = content;
+                    else
+                        input = first;  // set focus to the first of this composite fields
+                }
+                else if (colprop.type == 'select') {
+                    input = $('<select>')
+                        .addClass('custom-select ff_' + col)
+                        .attr({ name: '_' + col + name_suffix, id: input_id });
+
+                    var options = input.attr('options');
+                    options[options.length] = new Option('---', '');
+                    if (colprop.options)
+                        $.each(colprop.options, function(i, val) { options[options.length] = new Option(val, i); });
+                }
+
+                if (input) {
+                    var delbutton = $('<a href="#del"></a>')
+                        .addClass('contactfieldbutton deletebutton input-group-text icon delete')
+                        .attr({title: this.get_label('delete'), rel: col})
+                        .html(this.env.delbutton)
+                        .click(function() { ref.delete_edit_field(this); return false; });
+
+                    row.append(label);
+
+                    if (!compact) {
+                        if (colprop.type != 'composite')
+                            cell.append(input);
+                        row.append(cell.append(delbutton));
+                    }
+                    else {
+                        row.append(input).append(delbutton);
+                        delbutton.wrap('<span class="input-group-append">');
+                    }
+
+                    row.appendTo(appendcontainer.show());
+
+                    if (input.is('div'))
+                        input.find('input').first().focus();
+                    else
+                        input.first().focus();
+
+                    // disable option if limit reached
+                    if (!colprop.count) colprop.count = 0;
+                    if (++colprop.count == colprop.limit && colprop.limit)
+                        $(menu).children('option[value="' + col + '"]').prop('disabled', true);
+
+                    this.triggerEvent('insert-edit-field', input);
+                }
+            }
+        }
+    };
+
+    this.delete_edit_field = function(elem)
+    {
+        var col = $(elem).attr('rel'),
+            colprop = this.env.coltypes[col],
+            input_group = $(elem).parents('div.row'),
+            fieldset = $(elem).parents('fieldset.contactfieldgroup'),
+            addmenu = fieldset.parent().find('select.addfieldmenu');
+
+        // just clear input but don't hide the last field
+        if (--colprop.count <= 0 && colprop.visible)
+            input_group.find('input').val('').blur();
+        else {
+            input_group.remove();
+            // hide entire fieldset if no more rows
+            if (!fieldset.children('div.row').length)
+                fieldset.hide();
+        }
+
+        // enable option in add-field selector or insert it if necessary
+        if (addmenu.length) {
+            var option = addmenu.children('option[value="'+col+'"]');
+            if (option.length)
+                option.prop('disabled', false);
+            else
+                option = $('<option>').attr('value', col).html(colprop.label).appendTo(addmenu);
+            addmenu.show();
+        }
+    };
+
+    this.upload_contact_photo = function(form)
+    {
+        if (form && form.elements._photo.value) {
+            this.async_upload_form(form, 'upload-photo', function(e) {
+                ref.set_busy(false, null, ref.file_upload_id);
+            });
+
+            // display upload indicator
+            this.file_upload_id = this.set_busy(true, 'uploading');
+        }
+    };
+
+    this.replace_contact_photo = function(id)
+    {
+        var img_src = id == '-del-' ? this.env.photo_placeholder :
+            this.env.comm_path + '&_action=photo&_source=' + this.env.source + '&_cid=' + (this.env.cid || 0) + '&_photo=' + id;
+
+        this.set_photo_actions(id);
+        $(this.gui_objects.contactphoto).children('img').attr('src', img_src);
+    };
+
+    this.photo_upload_end = function()
+    {
+        this.set_busy(false, null, this.file_upload_id);
+        delete this.file_upload_id;
+    };
+
+    this.set_photo_actions = function(id)
+    {
+        var n, buttons = this.buttons['upload-photo'];
+        for (n=0; buttons && n < buttons.length; n++)
+            $('a#'+buttons[n].id).html(this.get_label(id == '-del-' ? 'addphoto' : 'replacephoto'));
+
+        $('#ff_photo').val(id);
+        this.enable_command('upload-photo', this.env.coltypes.photo ? true : false);
+        this.enable_command('delete-photo', this.env.coltypes.photo && id != '-del-');
+    };
+
+    // load advanced search page
+    this.advanced_search = function()
+    {
+        var dialog = $('<iframe>').attr('src', this.url('search', {_form: 1, _framed: 1})),
+            search_func = function() {
+                var valid = false, form = {_adv: 1};
+
+                $.each($(dialog[0].contentWindow.rcmail.gui_objects.editform).serializeArray(), function() {
+                    if (this.name.match(/^_search/) && this.value != '') {
+                        form[this.name] = this.value;
+                        valid = true;
+                    }
+                });
+
+                if (valid) {
+                    ref.http_post('search', form, ref.set_busy(true, 'searching'));
+                    return true;
+                }
+            };
+
+        this.simple_dialog(dialog, 'advsearch', search_func, {
+            button: 'search',
+            width: 600,
+            height: 500
+        });
+
+        return true;
+    };
+
+    // unselect directory/group
+    this.unselect_directory = function()
+    {
+        this.select_folder('');
+        this.enable_command('search-delete', false);
+    };
+
+    // callback for creating a new saved search record
+    this.insert_saved_search = function(name, id)
+    {
+        var key = 'S'+id,
+            link = $('<a>').attr({href: '#', rel: id})
+                .click(function() { return ref.command('listsearch', id, this); })
+                .html(name),
+            prop = { name:name, id:id };
+
+        this.savedsearchlist.insert({ id:key, html:link, classes:['contactsearch'] }, null, 'contactsearch');
+        this.select_folder(key, '', true);
+        this.enable_command('search-delete', true);
+        this.env.search_id = id;
+
+        this.triggerEvent('abook_search_insert', prop);
+    };
+
+    // creates a dialog for saved search
+    this.search_create = function()
+    {
+        var input = $('<input>').attr('type', 'text'),
+            content = $('<label>').text(this.get_label('namex')).append(input);
+
+        this.simple_dialog(content, 'searchsave',
+            function() {
+                var name;
+                if (name = input.val()) {
+                    ref.http_post('search-create', {_search: ref.env.search_request, _name: name},
+                        ref.set_busy(true, 'loading'));
+                    return true;
+                }
+            }
+        );
+    };
+
+    this.search_delete = function()
+    {
+        if (this.env.search_request) {
+            var lock = this.set_busy(true, 'savedsearchdeleting');
+            this.http_post('search-delete', {_sid: this.env.search_id}, lock);
+        }
+    };
+
+    // callback from server upon search-delete command
+    this.remove_search_item = function(id)
+    {
+        if (this.savedsearchlist.remove('S' + id)) {
+            this.triggerEvent('search_delete', {id: id});
+        }
+
+        this.env.search_id = null;
+        this.env.search_request = null;
+        this.list_contacts_clear();
+        this.reset_qsearch();
+        this.enable_command('search-delete', 'search-create', false);
+    };
+
+    this.listsearch = function(id)
+    {
+        var lock = this.set_busy(true, 'searching');
+
         if (this.contact_list) {
-          if (this.contact_list.rowcount > 0)
-            this.contact_list.focus();
-          this.triggerEvent('listupdate', { list:this.contact_list, rowcount:this.contact_list.rowcount });
+            this.list_contacts_clear();
         }
-        break;
-    }
 
-    if (response.unlock)
-      this.hide_message(response.unlock);
+        this.reset_qsearch();
 
-    this.triggerEvent('responseafter', {response: response});
-    this.triggerEvent('responseafter'+response.action, {response: response});
+        if (this.savedsearchlist) {
+            this.treelist.select('');
+            this.savedsearchlist.select('S'+id);
+        }
+        else
+            this.select_folder('S'+id, '', true);
 
-    // reset keep-alive interval
-    this.start_keepalive();
-  };
+        // reset vars
+        this.env.current_page = 1;
+        this.http_request('search', {_sid: id}, lock);
+    };
 
-  // handle HTTP request errors
-  this.http_error = function(request, status, err, lock, action)
-  {
-    var errmsg = request.statusText;
+    // display a dialog with QR code image
+    this.qrcode = function()
+    {
+        var img = new Image(300, 300);
 
-    this.set_busy(false, null, lock);
-    request.abort();
+        img.src = this.url('addressbook/qrcode', {_source: this.env.source, _cid: this.get_single_cid()});
 
-    // don't display error message on page unload (#1488547)
-    if (this.unload)
-      return;
+        return this.simple_dialog(img, 'qrcode', null, {
+            button: false,
+            cancel_button: 'close',
+            width: 300,
+            height: 300
+        });
+    };
 
-    if (request.status && errmsg)
-      this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
-    else if (status == 'timeout')
-      this.display_message('requesttimedout', 'error');
-    else if (request.status == 0 && status != 'abort')
-      this.display_message('connerror', 'error');
 
-    // redirect to url specified in location header if not empty
-    var location_url = request.getResponseHeader("Location");
-    if (location_url && this.env.action != 'compose')  // don't redirect on compose screen, contents might get lost (#1488926)
-      this.redirect(location_url);
+    /*********************************************************/
+    /*********        user settings methods          *********/
+    /*********************************************************/
 
-    // 403 Forbidden response (CSRF prevention) - reload the page.
-    // In case there's a new valid session it will be used, otherwise
-    // login form will be presented (#1488960).
-    if (request.status == 403) {
-      (this.is_framed() ? parent : window).location.reload();
-      return;
-    }
+    // preferences section select and load options frame
+    this.section_select = function(list)
+    {
+        var win, id = list.get_single_selection();
 
-    // re-send keep-alive requests after 30 seconds
-    if (action == 'keep-alive')
-      setTimeout(function() { ref.keep_alive(); ref.start_keepalive(); }, 30000);
-  };
+        if (id && (win = this.get_frame_window(this.env.contentframe))) {
+            this.location_href({_action: 'edit-prefs', _section: id, _framed: 1}, win, true);
+        }
+    };
 
-  // handler for session errors detected on the server
-  this.session_error = function(redirect_url)
-  {
-    this.env.server_error = 401;
+    this.response_select = function(list)
+    {
+        var id = list.get_single_selection();
 
-    // save message in local storage and do not redirect
-    if (this.env.action == 'compose') {
-      this.save_compose_form_local();
-      this.compose_skip_unsavedcheck = true;
-      // stop keep-alive and refresh processes
-      this.env.session_lifetime = 0;
-      if (this._keepalive)
-        clearInterval(this._keepalive);
-      if (this._refresh)
-        clearInterval(this._refresh);
-    }
-    else if (redirect_url) {
-      setTimeout(function() { ref.redirect(redirect_url, true); }, 2000);
-    }
-  };
+        this.enable_command('delete', !!id && $.inArray(id, this.env.readonly_responses) < 0);
 
-  // callback when an iframe finished loading
-  this.iframe_loaded = function(unlock)
-  {
-    if (!unlock)
-      unlock = this.env.frame_lock;
+        if (id) {
+            this.load_response(id, 'edit-response');
+        }
+    };
 
-    this.set_busy(false, null, unlock);
+    // load response record
+    this.load_response = function(id, action)
+    {
+        var win;
 
-    if (this.submit_timer)
-      clearTimeout(this.submit_timer);
-  };
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            if (id || action == 'add-response') {
+                if (!id)
+                    this.responses_list.clear_selection();
 
-  /**
+                this.location_href({_action: action, _id: id, _framed: 1}, win, true);
+            }
+        }
+    };
+
+    this.identity_select = function(list)
+    {
+        var id = list.get_single_selection();
+
+        this.enable_command('delete', !!id && list.rowcount > 1 && this.env.identities_level < 2);
+
+        if (id) {
+            this.load_identity(id, 'edit-identity');
+        }
+    };
+
+    // load identity record
+    this.load_identity = function(id, action)
+    {
+        var win;
+
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            if (id || action == 'add-identity') {
+                if (!id)
+                    this.identity_list.clear_selection();
+
+                this.location_href({_action: action, _iid: id, _framed: 1}, win, true);
+            }
+        }
+    };
+
+    this.delete_identity = function(id)
+    {
+        if (!id && this.identity_list)
+            id = this.identity_list.get_single_selection();
+
+        if (id) {
+            this.confirm_dialog(this.get_label('deleteidentityconfirm'), 'delete', function() {
+                ref.http_post('settings/delete-identity', {_iid: id}, true);
+            });
+        }
+    };
+
+    this.delete_response = function(id)
+    {
+        if (!id && this.responses_list) {
+            id = this.responses_list.get_single_selection();
+        }
+
+        if (id) {
+            this.confirm_dialog(this.get_label('deleteresponseconfirm'), 'delete', function() {
+                ref.http_post('settings/delete-response', {_id: id}, true);
+            });
+        }
+    };
+
+    // Update indetities list (add or update a record)
+    this.update_identity_row = function(id, name, add)
+    {
+        var list = this.identity_list,
+            rid = this.html_identifier(id);
+
+        if (add) {
+            list.insert_row({id: 'rcmrow' + rid, cols: [{className: 'mail', innerHTML: name}]});
+            list.select(rid);
+        }
+        else {
+            list.update_row(rid, [name]);
+        }
+    };
+
+    // Update responses list (add or update a record)
+    this.update_response_row = function(id, name, add)
+    {
+        var list = this.responses_list;
+
+        if (add) {
+            list.insert_row({id: 'rcmrow' + id, cols: [{className: 'name', innerHTML: name}]});
+            list.select(id);
+        }
+        else {
+            list.update_row(id, [name]);
+        }
+    };
+
+    // Remove response record from the responses list
+    this.remove_response = function(id)
+    {
+        if (this.responses_list) {
+            this.responses_list.remove_row(id);
+            this.show_contentframe(false);
+        }
+
+        this.enable_command('delete', false);
+    };
+
+    // Remove identity record from the identities list
+    this.remove_identity = function(id)
+    {
+        var list = this.identity_list,
+            rid = this.html_identifier(id);
+
+        if (list && id) {
+            list.remove_row(rid);
+            this.show_contentframe(false);
+        }
+
+        this.enable_command('delete', false);
+    };
+
+
+    /*********************************************************/
+    /*********        folder manager methods         *********/
+    /*********************************************************/
+
+    this.init_subscription_list = function()
+    {
+        var delim = RegExp.escape(this.env.delimiter);
+
+        this.last_sub_rx = RegExp('['+delim+']?[^'+delim+']+$');
+
+        this.subscription_list = new rcube_treelist_widget(this.gui_objects.subscriptionlist, {
+            selectable: true,
+            tabexit: false,
+            parent_focus: true,
+            id_prefix: 'rcmli',
+            id_encode: this.html_identifier_encode,
+            id_decode: this.html_identifier_decode,
+            searchbox: '#foldersearch'
+        });
+
+        this.subscription_list
+            .addEventListener('select', function(node) { ref.subscription_select(node.id); })
+            .addEventListener('collapse', function(node) { ref.folder_collapsed(node); })
+            .addEventListener('expand', function(node) { ref.folder_collapsed(node); })
+            .addEventListener('search', function(p) { if (p.query) ref.subscription_select(); })
+            .draggable({cancel: 'li.mailbox.root,input,div.treetoggle,.custom-control'})
+            .droppable({
+                // @todo: find better way, accept callback is executed for every folder
+                // on the list when dragging starts (and stops), this is slow, but
+                // I didn't find a method to check droptarget on over event
+                accept: function(node) {
+                    if (!node.is('.mailbox'))
+                        return false;
+
+                    var source_folder = ref.folder_id2name(node.attr('id')),
+                        dest_folder = ref.folder_id2name(this.id),
+                        source = ref.env.subscriptionrows[source_folder],
+                        dest = ref.env.subscriptionrows[dest_folder];
+
+                    return source && !source[2]
+            && dest_folder != source_folder.replace(ref.last_sub_rx, '')
+            && !dest_folder.startsWith(source_folder + ref.env.delimiter);
+                },
+                drop: function(e, ui) {
+                    var source = ref.folder_id2name(ui.draggable.attr('id')),
+                        dest = ref.folder_id2name(this.id);
+
+                    ref.subscription_move_folder(source, dest);
+                }
+            });
+    };
+
+    this.folder_id2name = function(id)
+    {
+        return id ? ref.html_identifier_decode(id.replace(/^rcmli/, '')) : null;
+    };
+
+    this.subscription_select = function(id)
+    {
+        var folder;
+
+        if (id && id != '*' && (folder = this.env.subscriptionrows[id])) {
+            this.env.mailbox = id;
+            this.show_folder(id);
+            this.enable_command('delete-folder', !folder[2]);
+        }
+        else {
+            this.env.mailbox = null;
+            this.show_contentframe(false);
+            this.enable_command('delete-folder', 'purge', false);
+        }
+    };
+
+    this.subscription_move_folder = function(from, to)
+    {
+        if (from && to !== null && from != to && to != from.replace(this.last_sub_rx, '')) {
+            var path = from.split(this.env.delimiter),
+                basename = path.pop(),
+                newname = to === '' || to === '*' ? basename : to + this.env.delimiter + basename;
+
+            if (newname != from) {
+                this.confirm_dialog(this.get_label('movefolderconfirm'), 'move', function() {
+                    ref.http_post('rename-folder', {_folder_oldname: from, _folder_newname: newname},
+                        ref.set_busy(true, 'foldermoving'));
+                }, {button_class: 'save move'});
+            }
+        }
+    };
+
+    // tell server to create and subscribe a new mailbox
+    this.create_folder = function()
+    {
+        this.show_folder('', this.env.mailbox);
+    };
+
+    // delete a specific mailbox with all its messages
+    this.delete_folder = function(name)
+    {
+        if (!name)
+            name = this.env.mailbox;
+
+        if (name) {
+            this.confirm_dialog(this.get_label('deletefolderconfirm'), 'delete', function() {
+                ref.http_post('delete-folder', {_mbox: name}, ref.set_busy(true, 'folderdeleting'));
+            });
+        }
+    };
+
+    // Add folder row to the table and initialize it
+    this.add_folder_row = function (id, name, display_name, is_protected, subscribed, class_name, refrow, subfolders)
+    {
+        if (!this.gui_objects.subscriptionlist)
+            return false;
+
+        // reset searching
+        if (this.subscription_list.is_search()) {
+            this.subscription_select();
+            this.subscription_list.reset_search();
+        }
+
+        // disable drag-n-drop temporarily
+        // some skins disable dragging in mobile mode, so we have to check if it is still draggable
+        if (this.subscription_list.is_draggable())
+            this.subscription_list.draggable('destroy').droppable('destroy');
+
+        var row, n, tmp, tmp_name, rowid, collator, pos, p, parent = '',
+            folders = [], list = [], slist = [],
+            list_element = $(this.gui_objects.subscriptionlist);
+        row = refrow ? refrow : $($('li', list_element).get(1)).clone(true);
+
+        if (!row.length) {
+            // Refresh page if we don't have a table row to clone
+            this.goto_url('folders');
+            return false;
+        }
+
+        // set ID, reset css class
+        row.attr({id: 'rcmli' + this.html_identifier_encode(id), 'class': class_name});
+
+        if (!refrow || !refrow.length) {
+            // remove old data, subfolders and toggle
+            $('ul,div.treetoggle', row).remove();
+            row.removeData('filtered');
+        }
+
+        // set folder name
+        $('a', row).first().text(display_name).removeAttr('title');
+
+        // update subscription checkbox
+        $('input[name="_subscribed[]"]', row).first().val(id)
+            .prop({checked: subscribed ? true : false, disabled: is_protected ? true : false});
+
+        // add to folder/row-ID map
+        this.env.subscriptionrows[id] = [name, display_name, false];
+
+        // copy folders data to an array for sorting
+        $.each(this.env.subscriptionrows, function(k, v) { v[3] = k; folders.push(v); });
+
+        try {
+            // use collator if supported (FF29, IE11, Opera15, Chrome24)
+            collator = new Intl.Collator(this.env.locale.replace('_', '-'));
+        }
+        catch (e) {};
+
+        // sort folders
+        folders.sort(function(a, b) {
+            var i, f1, f2,
+                path1 = a[0].split(ref.env.delimiter),
+                path2 = b[0].split(ref.env.delimiter),
+                len = path1.length;
+
+            for (i=0; i<len; i++) {
+                f1 = path1[i];
+                f2 = path2[i];
+
+                if (f1 !== f2) {
+                    if (f2 === undefined)
+                        return 1;
+                    if (collator)
+                        return collator.compare(f1, f2);
+                    else
+                        return f1 < f2 ? -1 : 1;
+                }
+                else if (i == len-1) {
+                    return -1;
+                }
+            }
+        });
+
+        for (n in folders) {
+            p = folders[n][3];
+            // protected folder
+            if (folders[n][2]) {
+                tmp_name = p + this.env.delimiter;
+                // prefix namespace cannot have subfolders (#1488349)
+                if (tmp_name == this.env.prefix_ns)
+                    continue;
+                slist.push(p);
+                tmp = tmp_name;
+            }
+            // protected folder's child
+            else if (tmp && p.startsWith(tmp))
+                slist.push(p);
+            // other
+            else {
+                list.push(p);
+                tmp = null;
+            }
+        }
+
+        // check if subfolder of a protected folder
+        for (n=0; n<slist.length; n++) {
+            if (id.startsWith(slist[n] + this.env.delimiter))
+                rowid = slist[n];
+        }
+
+        // find folder position after sorting
+        for (n=0; !rowid && n<list.length; n++) {
+            if (n && list[n] == id)
+                rowid = list[n-1];
+        }
+
+        // add row to the table
+        if (rowid && (n = this.subscription_list.get_item(rowid, true))) {
+            // find parent folder
+            if (pos = id.lastIndexOf(this.env.delimiter)) {
+                parent = id.substring(0, pos);
+                parent = this.subscription_list.get_item(parent, true);
+
+                // add required tree elements to the parent if not already there
+                if (!$('div.treetoggle', parent).length) {
+                    $('<div>&nbsp;</div>').addClass('treetoggle collapsed').appendTo(parent);
+                }
+                if (!$('ul', parent).length) {
+                    $('<ul>').css('display', 'none').appendTo(parent);
+                }
+            }
+
+            if (parent && n == parent) {
+                $('ul', parent).first().append(row);
+            }
+            else {
+                while (p = $(n).parent().parent().get(0)) {
+                    if (parent && p == parent)
+                        break;
+                    if (!$(p).is('li.mailbox'))
+                        break;
+                    n = p;
+                }
+
+                $(n).after(row);
+            }
+        }
+        else {
+            list_element.append(row);
+        }
+
+        // add subfolders
+        $.extend(this.env.subscriptionrows, subfolders || {});
+
+        // update list widget
+        this.subscription_list.reset(true);
+        this.subscription_select();
+
+        // expand parent
+        if (parent) {
+            this.subscription_list.expand(this.folder_id2name(parent.id));
+        }
+
+        row = row.show().get(0);
+        if (row.scrollIntoView)
+            row.scrollIntoView(false);
+
+        // Let skins to do their magic, e.g. Elastic will fix pretty checkbox
+        if (!refrow)
+            this.triggerEvent('clonerow', {row: row, id: id});
+
+        return row;
+    };
+
+    // replace an existing table row with a new folder line (with subfolders)
+    this.replace_folder_row = function(oldid, id, name, display_name, is_protected, class_name)
+    {
+        if (!this.gui_objects.subscriptionlist) {
+            if (this.is_framed()) {
+                // @FIXME: for some reason this 'parent' variable need to be prefixed with 'window.'
+                return window.parent.rcmail.replace_folder_row(oldid, id, name, display_name, is_protected, class_name);
+            }
+
+            return false;
+        }
+
+        // reset searching
+        if (this.subscription_list.is_search()) {
+            this.subscription_select();
+            this.subscription_list.reset_search();
+        }
+
+        var subfolders = {},
+            row = this.subscription_list.get_item(oldid, true),
+            parent = $(row).parent(),
+            old_folder = this.env.subscriptionrows[oldid],
+            prefix_len_id = oldid.length,
+            prefix_len_name = old_folder[0].length,
+            subscribed = $('input[name="_subscribed[]"]', row).first().prop('checked');
+
+        // no renaming, only update class_name
+        if (oldid == id) {
+            $(row).attr('class', class_name || '');
+            return;
+        }
+
+        // update subfolders
+        $('li', row).each(function() {
+            var fname = ref.folder_id2name(this.id),
+                folder = ref.env.subscriptionrows[fname],
+                newid = id + fname.slice(prefix_len_id);
+
+            this.id = 'rcmli' + ref.html_identifier_encode(newid);
+            $('input[name="_subscribed[]"]', this).first().val(newid);
+            folder[0] = name + folder[0].slice(prefix_len_name);
+
+            subfolders[newid] = folder;
+            delete ref.env.subscriptionrows[fname];
+        });
+
+        // get row off the list
+        row = $(row).detach();
+
+        delete this.env.subscriptionrows[oldid];
+
+        // remove parent list/toggle elements if not needed
+        if (parent.get(0) != this.gui_objects.subscriptionlist && !$('li', parent).length) {
+            $('ul,div.treetoggle', parent.parent()).remove();
+        }
+
+        // move the existing table row
+        this.add_folder_row(id, name, display_name, is_protected, subscribed, class_name, row, subfolders);
+    };
+
+    // remove the table row of a specific mailbox from the table
+    this.remove_folder_row = function(folder)
+    {
+    // reset searching
+        if (this.subscription_list.is_search()) {
+            this.subscription_select();
+            this.subscription_list.reset_search();
+        }
+
+        var list = [], row = this.subscription_list.get_item(folder, true);
+
+        // get subfolders if any
+        $('li', row).each(function() { list.push(ref.folder_id2name(this.id)); });
+
+        // remove folder row (and subfolders)
+        this.subscription_list.remove(folder);
+
+        // update local list variable
+        list.push(folder);
+        $.each(list, function(i, v) { delete ref.env.subscriptionrows[v]; });
+    };
+
+    this.subscribe = function(folder)
+    {
+        this.change_subscription_state(folder, true);
+    };
+
+    this.unsubscribe = function(folder)
+    {
+        this.change_subscription_state(folder, false);
+    };
+
+    this.change_subscription_state = function(folder, state)
+    {
+        if (folder) {
+            var prefix = state ? '' : 'un',
+                lock = this.display_message('folder' + prefix + 'subscribing', 'loading');
+
+            this.http_post(prefix + 'subscribe', {_mbox: folder}, lock);
+
+            // in case this was a list of search results, update also the main list
+            $(this.gui_objects.subscriptionlist).find('input[value="' + folder + '"]').prop('checked', state);
+        }
+    };
+
+
+    // when user select a folder in manager
+    this.show_folder = function(folder, path, force)
+    {
+        var win, target = window,
+            action = folder === '' ? 'add' : 'edit',
+            url = '&_action=' + action + '-folder&_mbox=' + urlencode(folder);
+
+        if (path)
+            url += '&_path='+urlencode(path);
+
+        if (win = this.get_frame_window(this.env.contentframe)) {
+            target = win;
+            url += '&_framed=1';
+        }
+
+        if (String(target.location.href).indexOf(url) >= 0 && !force)
+            this.show_contentframe(true);
+        else
+            this.location_href(this.env.comm_path+url, target, true);
+    };
+
+    // disables subscription checkbox (for protected folder)
+    this.disable_subscription = function(folder)
+    {
+        var row = this.subscription_list.get_item(folder, true);
+        if (row)
+            $('input[name="_subscribed[]"]', row).first().prop('disabled', true);
+    };
+
+    // resets state of subscription checkbox (e.g. on error)
+    this.reset_subscription = function(folder, state)
+    {
+        var row = this.subscription_list.get_item(folder, true);
+        if (row)
+            $('input[name="_subscribed[]"]', row).first().prop('checked', state);
+    };
+
+    this.folder_size = function(folder)
+    {
+        var lock = this.set_busy(true, 'loading');
+        this.http_post('folder-size', {_mbox: folder}, lock);
+    };
+
+    this.folder_size_update = function(size)
+    {
+        $('#folder-size').replaceWith(size);
+    };
+
+    // filter folders by namespace
+    this.folder_filter = function(prefix)
+    {
+        this.subscription_list.reset_search();
+
+        this.subscription_list.container.children('li').each(function() {
+            var i, folder = ref.folder_id2name(this.id);
+            // show all folders
+            if (prefix == '---') {
+            }
+            // got namespace prefix
+            else if (prefix) {
+                if (folder !== prefix) {
+                    $(this).data('filtered', true).hide();
+                    return;
+                }
+            }
+            // no namespace prefix, filter out all other namespaces
+            else {
+                // first get all namespace roots
+                for (i in ref.env.ns_roots) {
+                    if (folder === ref.env.ns_roots[i]) {
+                        $(this).data('filtered', true).hide();
+                        return;
+                    }
+                }
+            }
+
+            $(this).removeData('filtered').show();
+        });
+    };
+
+    /*********************************************************/
+    /*********           GUI functionality           *********/
+    /*********************************************************/
+
+    this.init_button = function(cmd, prop)
+    {
+        var elm = document.getElementById(prop.id);
+        if (!elm)
+            return;
+
+        var preload = false;
+        if (prop.type == 'image') {
+            elm = elm.parentNode;
+            preload = true;
+        }
+
+        elm._command = cmd;
+        elm._id = prop.id;
+        if (prop.sel) {
+            elm.onmousedown = function(e) { return ref.button_sel(this._command, this._id); };
+            elm.onmouseup = function(e) { return ref.button_out(this._command, this._id); };
+            if (preload)
+                new Image().src = prop.sel;
+        }
+        if (prop.over) {
+            elm.onmouseover = function(e) { return ref.button_over(this._command, this._id); };
+            elm.onmouseout = function(e) { return ref.button_out(this._command, this._id); };
+            if (preload)
+                new Image().src = prop.over;
+        }
+    };
+
+    // set event handlers on registered buttons
+    this.init_buttons = function()
+    {
+        for (var cmd in this.buttons) {
+            if (typeof cmd !== 'string')
+                continue;
+
+            for (var i=0; i<this.buttons[cmd].length; i++) {
+                this.init_button(cmd, this.buttons[cmd][i]);
+            }
+        }
+    };
+
+    // set button to a specific state
+    this.set_button = function(command, state)
+    {
+        var n, button, obj, a_buttons = this.buttons[command],
+            len = a_buttons ? a_buttons.length : 0;
+
+        for (n=0; n<len; n++) {
+            button = a_buttons[n];
+            obj = document.getElementById(button.id);
+
+            if (!obj || button.status === state)
+                continue;
+
+            // get default/passive setting of the button
+            if (button.type == 'image' && !button.status) {
+                button.pas = obj._original_src ? obj._original_src : obj.src;
+                // respect PNG fix on IE browsers
+                if (obj.runtimeStyle && obj.runtimeStyle.filter && obj.runtimeStyle.filter.match(/src=['"]([^'"]+)['"]/))
+                    button.pas = RegExp.$1;
+            }
+            else if (!button.status)
+                button.pas = String(obj.className);
+
+            button.status = state;
+
+            // set image according to button state
+            if (button.type == 'image' && button[state]) {
+                obj.src = button[state];
+            }
+            // set class name according to button state
+            else if (button[state] !== undefined) {
+                obj.className = button[state];
+            }
+
+            // disable/enable input buttons
+            if (button.type == 'input' || button.type == 'button') {
+                obj.disabled = state == 'pas';
+            }
+            else {
+                $(obj).attr({
+                    tabindex: state == 'pas' || state == 'sel' ? '-1' : ($(obj).attr('data-tabindex') || '0'),
+                    'aria-disabled': state == 'pas' || state == 'sel' ? 'true' : 'false'
+                });
+            }
+        }
+    };
+
+    // display a specific alttext
+    this.set_alttext = function(command, label)
+    {
+        var n, button, obj, link, label,
+            a_buttons = this.buttons[command],
+            len = a_buttons ? a_buttons.length : 0;
+
+        for (n=0; n<len; n++) {
+            button = a_buttons[n];
+            obj = document.getElementById(button.id);
+            label = this.get_label(label);
+
+            if (obj && button.type == 'image') {
+                obj.setAttribute('alt', label);
+                if ((link = obj.parentNode) && link.tagName.toLowerCase() == 'a')
+                    link.setAttribute('title', label);
+            }
+            else if (obj)
+                obj.setAttribute('title', label);
+        }
+    };
+
+    // mouse over button
+    this.button_over = function(command, id)
+    {
+        this.button_event(command, id, 'over');
+    };
+
+    // mouse down on button
+    this.button_sel = function(command, id)
+    {
+        this.button_event(command, id, 'sel');
+    };
+
+    // mouse out of button
+    this.button_out = function(command, id)
+    {
+        this.button_event(command, id, 'act');
+    };
+
+    // event of button
+    this.button_event = function(command, id, event)
+    {
+        var n, button, obj, a_buttons = this.buttons[command],
+            len = a_buttons ? a_buttons.length : 0;
+
+        for (n=0; n<len; n++) {
+            button = a_buttons[n];
+            if (button.id == id && button.status == 'act') {
+                if (button[event] && (obj = document.getElementById(button.id))) {
+                    obj[button.type == 'image' ? 'src' : 'className'] = button[event];
+                }
+
+                if (event == 'sel') {
+                    this.buttons_sel[id] = command;
+                }
+            }
+        }
+    };
+
+    // write to the document/window title
+    this.set_pagetitle = function(title)
+    {
+        if (title && document.title)
+            document.title = title;
+    };
+
+    // display a system message, list of types in common.css (below #message definition)
+    this.display_message = function(msg, type, timeout, key)
+    {
+        if (msg && msg.length && /^[a-z._]+$/.test(msg))
+            msg = this.get_label(msg);
+
+        // pass command to parent window
+        if (this.is_framed())
+            return parent.rcmail.display_message(msg, type, timeout);
+
+        if (!this.gui_objects.message) {
+            // save message in order to display after page loaded
+            if (type != 'loading')
+                this.pending_message = [msg, type, timeout, key];
+            return 1;
+        }
+
+        if (!type)
+            type = 'notice';
+        else if (type == 'loading') {
+            if (!key)
+                key = 'loading';
+            if (!timeout)
+                timeout = this.env.request_timeout * 1000;
+            if (!msg)
+                msg = this.get_label('loading');
+        }
+
+        if (!key)
+            key = this.html_identifier(msg);
+
+        var date = new Date(),
+            id = type + date.getTime();
+
+        if (!timeout) {
+            switch (type) {
+                case 'error':
+                case 'warning':
+                    timeout = this.message_time * 2;
+                    break;
+
+                case 'uploading':
+                    timeout = 0;
+                    break;
+
+                default:
+                    timeout = this.message_time;
+            }
+        }
+
+        // The same message is already displayed
+        if (this.messages[key]) {
+            // replace label
+            if (this.messages[key].obj)
+                $('div.content', this.messages[key].obj).html(msg);
+            // store label in stack
+            if (type == 'loading') {
+                this.messages[key].labels.push({'id': id, 'msg': msg});
+            }
+            // add element and set timeout
+            this.messages[key].elements.push(id);
+            setTimeout(function() { ref.hide_message(id, type == 'loading'); }, timeout);
+            return id;
+        }
+
+        // create DOM object and display it
+        var obj = $('<div>').addClass(type + ' content').html(msg).data('key', key),
+            cont = $(this.gui_objects.message).append(obj).show();
+
+        this.messages[key] = {'obj': obj, 'elements': [id]};
+
+        if (type == 'loading') {
+            this.messages[key].labels = [{'id': id, 'msg': msg}];
+        }
+        else if (type != 'uploading') {
+            obj.click(function() { return ref.hide_message(obj); })
+                .attr('role', 'alert');
+        }
+
+        this.triggerEvent('message', { message:msg, type:type, timeout:timeout, object:obj });
+
+        if (timeout > 0)
+            setTimeout(function() { ref.hide_message(id, type != 'loading'); }, timeout);
+
+        return id;
+    };
+
+    // make a message to disappear
+    this.hide_message = function(obj, fade)
+    {
+    // pass command to parent window
+        if (this.is_framed())
+            return parent.rcmail.hide_message(obj, fade);
+
+        if (!this.gui_objects.message)
+            return;
+
+        var k, n, i, o, m = this.messages;
+
+        // Hide message by object, don't use for 'loading'!
+        if (typeof obj === 'object') {
+            o = $(obj);
+            k = o.data('key');
+            this.hide_message_object(o, fade);
+            if (m[k])
+                delete m[k];
+        }
+        // Hide message by id
+        else {
+            for (k in m) {
+                for (n in m[k].elements) {
+                    if (m[k] && m[k].elements[n] == obj) {
+                        m[k].elements.splice(n, 1);
+                        // hide DOM element if last instance is removed
+                        if (!m[k].elements.length) {
+                            this.hide_message_object(m[k].obj, fade);
+                            delete m[k];
+                        }
+                        // set pending action label for 'loading' message
+                        else if (k == 'loading') {
+                            for (i in m[k].labels) {
+                                if (m[k].labels[i].id == obj) {
+                                    delete m[k].labels[i];
+                                }
+                                else {
+                                    o = m[k].labels[i].msg;
+                                    $('div.content', m[k].obj).html(o);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+
+    // hide message object and remove from the DOM
+    this.hide_message_object = function(o, fade)
+    {
+        if (fade)
+            o.fadeOut(600, function() { $(this).remove(); });
+        else
+            o.hide().remove();
+    };
+
+    // remove all messages immediately
+    this.clear_messages = function()
+    {
+    // pass command to parent window
+        if (this.is_framed())
+            return parent.rcmail.clear_messages();
+
+        var k, n, m = this.messages;
+
+        for (k in m)
+            for (n in m[k].elements)
+                if (m[k].obj)
+                    this.hide_message_object(m[k].obj);
+
+        this.messages = {};
+    };
+
+    // display uploading message with progress indicator
+    // data should contain: name, total, current, percent, text
+    this.display_progress = function(data)
+    {
+        if (!data || !data.name)
+            return;
+
+        var msg = this.messages['progress' + data.name];
+
+        if (!data.label)
+            data.label = this.get_label('uploadingmany');
+
+        if (!msg) {
+            if (!data.percent || data.percent < 100)
+                this.display_message(data.label, 'uploading', 0, 'progress' + data.name);
+            return;
+        }
+
+        if (!data.total || data.percent >= 100) {
+            this.hide_message(msg.obj);
+            return;
+        }
+
+        if (data.text)
+            data.label += ' ' + data.text;
+
+        msg.obj.text(data.label);
+    };
+
+    // open a jquery UI dialog with the given content
+    this.show_popup_dialog = function(content, title, buttons, options)
+    {
+    // forward call to parent window
+        if (this.is_framed()) {
+            return parent.rcmail.show_popup_dialog(content, title, buttons, options);
+        }
+
+        var popup = $('<div class="popup">');
+
+        if (typeof content == 'object') {
+            popup.append(content);
+            if ($(content).is('iframe'))
+                popup.addClass('iframe');
+        }
+        else
+            popup.html(content);
+
+        // assign special classes to dialog buttons
+        var i = 0, fn = function(button, classes, idx) {
+            if (typeof button == 'function') {
+                button = {
+                    click: button,
+                    text: idx,
+                    'class': classes
+                };
+            }
+            else {
+                buttons['class'] = classes;
+            }
+
+            return button;
+        };
+
+        if (options && options.button_classes)
+            $.each(buttons, function(idx, button) {
+                var cl = options.button_classes[i];
+                if (cl)
+                    buttons[idx] = fn(button, cl, idx);
+                i++;
+            });
+
+        options = $.extend({
+            title: title,
+            buttons: buttons,
+            modal: true,
+            resizable: true,
+            width: 500,
+            close: function(event, ui) { $(this).remove(); }
+        }, options || {});
+
+        popup.dialog(options);
+
+        // Remember the jQuery instance (window), useful when closing the dialog
+        popup[0].jqref = $;
+
+        if (options.width)
+            popup.width(options.width);
+        if (options.height)
+            popup.height(options.height);
+
+        var dialog = popup.parent();
+
+        if (!options.noresize) {
+            // resize and center popup
+            var win = $(window), w = win.width(), h = win.height(),
+                width = popup.width(),
+                height = options.height || (popup[0].scrollHeight + 20),
+                titlebar_height = $('.ui-dialog-titlebar', dialog).outerHeight() || 0,
+                buttonpane_height = $('.ui-dialog-buttonpane', dialog).outerHeight() || 0,
+                padding = (parseInt(dialog.css('padding-top')) + parseInt(popup.css('padding-top'))) * 2;
+
+            popup.dialog('option', {
+                height: Math.min(h - 40, height + titlebar_height + buttonpane_height + padding + 2),
+                width: Math.min(w - 20, width + 28)
+            });
+        }
+        else {
+            popup.css('width', 'auto');
+        }
+
+        // Don't propagate keyboard events to the UI below the dialog (#6055)
+        dialog.on('keydown keyup', function(e) { e.stopPropagation(); });
+
+        // Add Enter key handler to the input, click the 'mainaction' button
+        dialog.find('input[data-submit]').on('keydown', function(e) {
+            if (e.which == 13) {
+                dialog.find('.ui-dialog-buttonpane button.mainaction').click();
+            }
+        });
+
+        this.triggerEvent('dialog-open', {obj: popup});
+
+        return popup;
+    };
+
+    // show_popup_dialog() wrapper for simple dialogs with action and Cancel buttons
+    this.simple_dialog = function(content, title, action_func, options)
+    {
+        if (!options)
+            options = {};
+
+        var title = this.get_label(title),
+            save_label = options.button || 'save',
+            save_class = options.button_class || save_label.replace(/^[^\.]+\./i, ''),
+            cancel_label = options.cancel_button || 'cancel',
+            cancel_class = options.cancel_class || cancel_label.replace(/^[^\.]+\./i, ''),
+            close_func = function(e, ui, dialog) {
+                if (!dialog)
+                    dialog = this;
+
+                // The dialog might got open in the current window, but also any of its parents (#8627)
+                // We have to use the jQuery object that did invoke the dialog, set in show_popup_dialog()
+                dialog.jqref(dialog).dialog('close');
+                if (options.cancel_func) options.cancel_func(e, ref);
+            },
+            buttons = [{
+                text: this.get_label(cancel_label),
+                'class': cancel_class.replace(/close/i, 'cancel'),
+                click: close_func
+            }];
+
+        if (!action_func)
+            buttons[0]['class'] += ' mainaction';
+        else
+            buttons.unshift({
+                text: this.get_label(save_label),
+                'class': 'mainaction ' + save_class,
+                click: function(e, ui) { if (action_func(e, ref)) close_func(e, ui, this); }
+            });
+
+        return this.show_popup_dialog(content, title, buttons, options);
+    };
+
+    // show_popup_dialog() wrapper for alert() type dialogs
+    this.alert_dialog = function(content, action, options)
+    {
+        options = $.extend(options || {}, {
+            cancel_button: 'ok',
+            cancel_class: 'save',
+            cancel_func: action,
+            noresize: true
+        });
+
+        return this.simple_dialog(content, options.title || 'alerttitle', null, options);
+    };
+
+    // simple_dialog() wrapper for confirm() type dialogs
+    this.confirm_dialog = function(content, button_label, action, options)
+    {
+        var action_func = function(e, ref) { action(e, ref); return true; };
+
+        options = $.extend(options || {}, {
+            button: button_label || 'continue',
+            noresize: true
+        });
+
+        return this.simple_dialog(content, options.title || 'confirmationtitle', action_func, options);
+    };
+
+    // enable/disable buttons for page shifting
+    this.set_page_buttons = function()
+    {
+        this.enable_command('nextpage', 'lastpage', this.env.pagecount > this.env.current_page);
+        this.enable_command('previouspage', 'firstpage', this.env.current_page > 1);
+
+        this.update_pagejumper();
+    };
+
+    // mark a mailbox as selected and set environment variable
+    this.select_folder = function(name, prefix, encode)
+    {
+        if (this.savedsearchlist) {
+            this.savedsearchlist.select('');
+        }
+
+        if (this.treelist) {
+            this.treelist.select(name);
+        }
+        else if (this.gui_objects.folderlist) {
+            $('li.selected', this.gui_objects.folderlist).removeClass('selected');
+            $(this.get_folder_li(name, prefix, encode)).addClass('selected');
+
+            // trigger event hook
+            this.triggerEvent('selectfolder', { folder:name, prefix:prefix });
+        }
+    };
+
+    // adds a class to selected folder
+    this.mark_folder = function(name, class_name, prefix, encode)
+    {
+        $(this.get_folder_li(name, prefix, encode)).addClass(class_name);
+        this.triggerEvent('markfolder', {folder: name, mark: class_name, status: true});
+    };
+
+    // adds a class to selected folder
+    this.unmark_folder = function(name, class_name, prefix, encode)
+    {
+        $(this.get_folder_li(name, prefix, encode)).removeClass(class_name);
+        this.triggerEvent('markfolder', {folder: name, mark: class_name, status: false});
+    };
+
+    // helper method to find a folder list item
+    this.get_folder_li = function(name, prefix, encode)
+    {
+        if (!prefix)
+            prefix = 'rcmli';
+
+        if (this.gui_objects.folderlist) {
+            name = this.html_identifier(name, encode);
+            return document.getElementById(prefix+name);
+        }
+    };
+
+    // for reordering column array (Konqueror workaround)
+    // and for setting some message list global variables
+    this.set_message_coltypes = function(cols, repl, smart_col)
+    {
+    // update list mode columns list
+        this.env.listcols = cols;
+
+        // reset message list cols
+        this.msglist_setup(this.env.layout);
+
+        var list = this.message_list,
+            thead = list ? list.thead : null,
+            repl, cell, col, c, n, len, tr,
+            listcols = this.env.msglist_cols;
+
+        if (!this.env.coltypes)
+            this.env.coltypes = {};
+
+        // replace old column headers
+        if (thead) {
+            if (repl) {
+                thead.innerHTML = '';
+                tr = document.createElement('tr');
+
+                for (n in listcols) {
+                    c = listcols[n];
+                    cell = document.createElement('th');
+                    cell.innerHTML = repl[c].html || '';
+                    if (repl[c].id) cell.id = repl[c].id;
+                    if (repl[c].className) cell.className = repl[c].className;
+                    tr.appendChild(cell);
+                }
+
+                if (list.checkbox_selection)
+                    list.insert_checkbox(tr, 'thead');
+
+                thead.appendChild(tr);
+            }
+
+            for (n = 0, len = listcols.length; n < len; n++) {
+                col = listcols[list.checkbox_selection ? n-1 : n];
+                if ((cell = thead.rows[0].cells[n]) && (col == 'from' || col == 'to' || col == 'fromto')) {
+                    $(cell).attr('rel', col).find('span,a').text(this.get_label(col == 'fromto' ? smart_col : col));
+                }
+            }
+        }
+
+        this.env.subject_col = null;
+        this.env.flagged_col = null;
+        this.env.status_col = null;
+
+        if (this.env.coltypes.folder)
+            this.env.coltypes.folder.hidden = !(this.env.search_request || this.env.search_id) || this.env.search_scope == 'base';
+
+        if ((n = $.inArray('subject', listcols)) >= 0) {
+            this.env.subject_col = n;
+            if (list)
+                list.subject_col = n;
+        }
+        if ((n = $.inArray('flag', listcols)) >= 0)
+            this.env.flagged_col = n;
+        if ((n = $.inArray('status', listcols)) >= 0)
+            this.env.status_col = n;
+
+        if (list) {
+            list.hide_column('folder', (this.env.coltypes.folder && this.env.coltypes.folder.hidden) || $.inArray('folder', listcols) < 0);
+            list.init_header();
+        }
+    };
+
+    // replace content of row count display
+    this.set_rowcount = function(text, mbox)
+    {
+    // #1487752
+        if (mbox && mbox != this.env.mailbox)
+            return false;
+
+        $(this.gui_objects.countdisplay).html(text);
+
+        // update page navigation buttons
+        this.set_page_buttons();
+    };
+
+    // replace content of mailboxname display
+    this.set_mailboxname = function(content)
+    {
+        if (this.gui_objects.mailboxname && content)
+            this.gui_objects.mailboxname.innerHTML = content;
+    };
+
+    // replace content of quota display
+    this.set_quota = function(content)
+    {
+        if (this.gui_objects.quotadisplay && content && content.type == 'text')
+            $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title || '');
+
+        this.triggerEvent('setquota', content);
+        this.env.quota_content = content;
+    };
+
+    // update trash folder state
+    this.set_trash_count = function(count)
+    {
+        this[(count ? 'un' : '') + 'mark_folder'](this.env.trash_mailbox, 'empty', '', true);
+    };
+
+    // update the mailboxlist
+    this.set_unread_count = function(mbox, count, set_title, mark)
+    {
+        if (!this.gui_objects.mailboxlist)
+            return false;
+
+        this.env.unread_counts[mbox] = count;
+        this.set_unread_count_display(mbox, set_title);
+
+        if (mark)
+            this.mark_folder(mbox, mark, '', true);
+        else if (!count)
+            this.unmark_folder(mbox, 'recent', '', true);
+
+        this.mark_all_read_state();
+    };
+
+    // update the mailbox count display
+    this.set_unread_count_display = function(mbox, set_title)
+    {
+        var reg, link, text_obj, item, mycount, childcount, div;
+
+        if (item = this.get_folder_li(mbox, '', true)) {
+            mycount = this.env.unread_counts[mbox] ? this.env.unread_counts[mbox] : 0;
+            link = $(item).children('a').eq(0);
+            text_obj = link.children('span.unreadcount');
+            if (!text_obj.length && mycount)
+                text_obj = $('<span>').addClass('unreadcount skip-content').appendTo(link);
+            reg = /\s+\([0-9]+\)$/i;
+
+            childcount = 0;
+            if ((div = item.getElementsByTagName('div')[0]) &&
+          div.className.match(/collapsed/)) {
+                // add children's counters
+                for (var k in this.env.unread_counts)
+                    if (k.startsWith(mbox + this.env.delimiter))
+                        childcount += this.env.unread_counts[k];
+            }
+
+            if (mycount && text_obj.length)
+                text_obj.html(this.env.unreadwrap.replace(/%[sd]/, mycount));
+            else if (text_obj.length)
+                text_obj.remove();
+
+            // set parent's display
+            reg = new RegExp(RegExp.escape(this.env.delimiter) + '[^' + RegExp.escape(this.env.delimiter) + ']+$');
+            if (mbox.match(reg))
+                this.set_unread_count_display(mbox.replace(reg, ''), false);
+
+            // set the right classes
+            if ((mycount+childcount)>0)
+                $(item).addClass('unread');
+            else
+                $(item).removeClass('unread');
+        }
+
+        // set unread count to window title
+        reg = /^\([0-9]+\)\s+/i;
+        if (set_title && document.title) {
+            var new_title = '',
+                doc_title = String(document.title);
+
+            if (mycount && doc_title.match(reg))
+                new_title = doc_title.replace(reg, '('+mycount+') ');
+            else if (mycount)
+                new_title = '('+mycount+') '+doc_title;
+            else
+                new_title = doc_title.replace(reg, '');
+
+            this.set_pagetitle(new_title);
+        }
+    };
+
+    // display fetched raw headers
+    this.set_headers = function(content)
+    {
+        if (this.gui_objects.all_headers_box && content)
+            $(this.gui_objects.all_headers_box).html(content).show();
+    };
+
+    // display all-headers row and fetch raw message headers
+    this.show_headers = function(props, elem)
+    {
+        if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box || !this.env.uid)
+            return;
+
+        $(elem).removeClass('show-headers').addClass('hide-headers');
+        $(this.gui_objects.all_headers_row).show();
+        elem.onclick = function() { ref.command('hide-headers', '', elem); };
+
+        // fetch headers only once
+        if (!this.gui_objects.all_headers_box.innerHTML) {
+            this.http_request('headers', {_uid: this.env.uid, _mbox: this.env.mailbox},
+                this.display_message('', 'loading')
+            );
+        }
+    };
+
+    // hide all-headers row
+    this.hide_headers = function(props, elem)
+    {
+        if (!this.gui_objects.all_headers_row || !this.gui_objects.all_headers_box)
+            return;
+
+        $(elem).removeClass('hide-headers').addClass('show-headers');
+        $(this.gui_objects.all_headers_row).hide();
+        elem.onclick = function() { ref.command('show-headers', '', elem); };
+    };
+
+    // create folder selector popup
+    this.folder_selector = function(event, callback)
+    {
+        this.entity_selector('folder-selector', callback, this.env.mailboxes_list, function(obj, a) {
+            var n = 0, s = 0,
+                delim = ref.env.delimiter,
+                folder = ref.env.mailboxes[obj],
+                id = folder.id,
+                row = $('<li>');
+
+            if (folder.virtual)
+                a.addClass('virtual').attr({'aria-disabled': 'true', tabindex: '-1'});
+            else
+                a.addClass('active').data('id', folder.id);
+
+            if (folder['class'])
+                row.addClass(folder['class']);
+
+            // calculate/set indentation level
+            while ((s = id.indexOf(delim, s)) >= 0) {
+                n++; s++;
+            }
+            a.css('padding-left', n ? (n * 16) + 'px' : 0);
+
+            // add folder name element
+            a.append($('<span>').text(folder.name));
+
+            return row.append(a);
+        }, event);
+    };
+
+    // create addressbook selector popup
+    this.addressbook_selector = function(event, callback)
+    {
+    // build addressbook + groups list
+        var combined_sources = [];
+
+        // check we really need it before processing
+        if (!this.entity_selectors['addressbook-selector']) {
+            $.each(this.env.address_sources, function() {
+                if (!this.readonly) {
+                    var source = this;
+                    combined_sources.push(source);
+
+                    $.each(ref.env.contactgroups, function() {
+                        if (source.id === this.source) {
+                            combined_sources.push(this);
+                        }
+                    });
+                }
+            });
+        }
+
+        this.entity_selector('addressbook-selector', callback, combined_sources, function(obj, a) {
+            if (obj.type == 'group') {
+                a.attr('rel', obj.source + ':' + obj.id)
+                    .addClass('contactgroup active')
+                    .data({source: obj.source, gid: obj.id, id: obj.source + ':' + obj.id})
+                    .css('padding-left', '16px');
+            }
+            else {
+                a.addClass('addressbook active').data('id', obj.id);
+            }
+            a.append($('<span>').text(obj.name));
+
+            return $('<li>').append(a);
+        }, event);
+    };
+
+    // create contactgroup selector popup
+    this.contactgroup_selector = function(event, callback)
+    {
+        this.entity_selector('contactgroup-selector', callback, this.env.contactgroups, function(obj, a) {
+            if (ref.env.source === obj.source) {
+                a.addClass('contactgroup active')
+                    .data({id: obj.id})
+                    .append($('<span>').text(obj.name));
+
+                return $('<li>').append(a);
+            }
+        }, event);
+    };
+
+    // create selector popup (eg for folders or address books), position and display it
+    this.entity_selector = function(name, click_callback, entity_list, list_callback, event)
+    {
+        var container = this.entity_selectors[name];
+
+        if (!container) {
+            var rows = [],
+                container = $('<div>').attr('id', name).addClass('popupmenu'),
+                ul = $('<ul>').addClass('toolbarmenu menu'),
+                link = document.createElement('a');
+
+            link.href = '#';
+            link.className = 'icon';
+
+            // loop over entity list
+            $.each(entity_list, function(i) {
+                var a = $(link.cloneNode(false)).attr('rel', this.id);
+                rows.push(list_callback(this, a, i));
+            });
+
+            ul.append(rows).appendTo(container);
+
+            // temporarily show element to calculate its size
+            container.css({left: '-1000px', top: '-1000px'})
+                .appendTo(document.body).show();
+
+            // set max-height if the list is long
+            if (rows.length > 10)
+                container.css('max-height', $('li', container)[0].offsetHeight * 10 + 9);
+
+            // register delegate event handler for folder item clicks
+            container.on('click', 'a.active', function(e) {
+                container.data('callback')($(this).data('id'), this);
+            });
+
+            this.entity_selectors[name] = container;
+        }
+
+        container.data('callback', click_callback);
+
+        // position menu on the screen
+        this.show_menu(name, true, event);
+    };
+
+    this.destroy_entity_selector = function(name)
+    {
+        $("#" + name).remove();
+        delete this.entity_selectors[name];
+        this.triggerEvent('destroy-entity-selector', { name: name });
+    };
+
+    /***********************************************/
+    /*********    popup menu functions     *********/
+    /***********************************************/
+
+    // Show/hide a specific popup menu
+    this.show_menu = function(prop, show, event)
+    {
+        var name = typeof prop == 'object' ? prop.menu : prop,
+            obj = $('#'+name),
+            ref = event && event.target ? $(event.target) : $(obj.attr('rel') || '#'+name+'link'),
+            keyboard = rcube_event.is_keyboard(event),
+            align = obj.attr('data-align') || '',
+            stack = false;
+
+        // find "real" button element
+        if (ref.get(0).tagName != 'A' && ref.closest('a').length)
+            ref = ref.closest('a');
+
+        if (typeof prop == 'string')
+            prop = { menu:name };
+
+        // let plugins or skins provide the menu element
+        if (!obj.length) {
+            obj = this.triggerEvent('menu-get', { name:name, props:prop, originalEvent:event });
+        }
+
+        if (!obj || !obj.length) {
+            // just delegate the action to subscribers
+            return this.triggerEvent(show === false ? 'menu-close' : 'menu-open', { name:name, props:prop, originalEvent:event });
+        }
+
+        // move element to top for proper absolute positioning
+        obj.appendTo(document.body);
+
+        if (typeof show == 'undefined')
+            show = obj.is(':visible') ? false : true;
+
+        if (show && ref.length) {
+            var win = $(window),
+                pos = ref.offset(),
+                above = align.indexOf('bottom') >= 0;
+
+            stack = ref.attr('role') == 'menuitem' || ref.closest('[role=menuitem]').length > 0;
+
+            ref.offsetWidth = ref.outerWidth();
+            ref.offsetHeight = ref.outerHeight();
+            if (!above && pos.top + ref.offsetHeight + obj.height() > win.height()) {
+                above = true;
+            }
+            if (align.indexOf('right') >= 0) {
+                pos.left = pos.left + ref.outerWidth() - obj.width();
+            }
+            else if (stack) {
+                pos.left = pos.left + ref.offsetWidth - 5;
+                pos.top -= ref.offsetHeight;
+            }
+            if (pos.left + obj.width() > win.width()) {
+                pos.left = win.width() - obj.width() - 12;
+            }
+            pos.top = Math.max(0, pos.top + (above ? -obj.height() : ref.offsetHeight));
+            obj.css({ left:pos.left+'px', top:pos.top+'px' });
+        }
+
+        // add menu to stack
+        if (show) {
+            // truncate stack down to the one containing the ref link
+            for (var i = this.menu_stack.length - 1; stack && i >= 0; i--) {
+                if (!$(ref).parents('#'+this.menu_stack[i]).length && $(event.target).parent().attr('role') != 'menuitem')
+                    this.hide_menu(this.menu_stack[i], event);
+            }
+            if (stack && this.menu_stack.length) {
+                obj.data('parent', $.last(this.menu_stack));
+                obj.css('z-index', ($('#'+$.last(this.menu_stack)).css('z-index') || 0) + 1);
+            }
+            else if (!stack && this.menu_stack.length) {
+                this.hide_menu(this.menu_stack[0], event);
+            }
+
+            obj.show().attr('aria-hidden', 'false').data('opener', ref.attr('aria-expanded', 'true').get(0));
+            this.triggerEvent('menu-open', { name:name, obj:obj, props:prop, originalEvent:event });
+            this.menu_stack.push(name);
+
+            this.menu_keyboard_active = show && keyboard;
+            if (this.menu_keyboard_active) {
+                this.focused_menu = name;
+                obj.find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
+            }
+        }
+        else {  // close menu
+            this.hide_menu(name, event);
+        }
+
+        return show;
+    };
+
+    // hide the given popup menu (and its children)
+    this.hide_menu = function(name, event)
+    {
+        if (!this.menu_stack.length) {
+            // delegate to subscribers
+            this.triggerEvent('menu-close', { name:name, props:{ menu:name }, originalEvent:event });
+            return;
+        }
+
+        var obj, keyboard = rcube_event.is_keyboard(event);
+        for (var j=this.menu_stack.length-1; j >= 0; j--) {
+            obj = $('#' + this.menu_stack[j]).hide().attr('aria-hidden', 'true').data('parent', false);
+            this.triggerEvent('menu-close', { name:this.menu_stack[j], obj:obj, props:{ menu:this.menu_stack[j] }, originalEvent:event });
+            if (this.menu_stack[j] == name) {
+                j = -1;  // stop loop
+                if (obj.data('opener')) {
+                    $(obj.data('opener')).attr('aria-expanded', 'false');
+                    if (keyboard)
+                        obj.data('opener').focus();
+                }
+            }
+            this.menu_stack.pop();
+        }
+
+        // focus previous menu in stack
+        if (this.menu_stack.length && keyboard) {
+            this.menu_keyboard_active = true;
+            this.focused_menu = $.last(this.menu_stack);
+            if (!obj || !obj.data('opener'))
+                $('#'+this.focused_menu).find('a,input:not(:disabled)').not('[aria-disabled=true]').first().focus();
+        }
+        else {
+            this.focused_menu = null;
+            this.menu_keyboard_active = false;
+        }
+    };
+
+    // position a menu element on the screen in relation to other object
+    this.element_position = function(element, obj)
+    {
+        var obj = $(obj), win = $(window),
+            width = obj.outerWidth(),
+            height = obj.outerHeight(),
+            menu_pos = obj.data('menu-pos'),
+            win_height = win.height(),
+            elem_height = $(element).height(),
+            elem_width = $(element).width(),
+            pos = obj.offset(),
+            top = pos.top,
+            left = pos.left + width;
+
+        if (menu_pos == 'bottom') {
+            top += height;
+            left -= width;
+        }
+        else
+            left -= 5;
+
+        if (top + elem_height > win_height) {
+            top -= elem_height - height;
+            if (top < 0)
+                top = Math.max(0, (win_height - elem_height) / 2);
+        }
+
+        if (left + elem_width > win.width())
+            left -= elem_width + width;
+
+        element.css({left: left + 'px', top: top + 'px'});
+    };
+
+    // initialize HTML editor
+    this.editor_init = function(config, id)
+    {
+        this.editor = new rcube_text_editor(config || this.env.editor_config, id);
+    };
+
+
+    /********************************************************/
+    /*********  html to text conversion functions   *********/
+    /********************************************************/
+
+    this.html2plain = function(html, func)
+    {
+        return this.format_converter(html, 'html', func);
+    };
+
+    this.plain2html = function(plain, func)
+    {
+        return this.format_converter(plain, 'plain', func);
+    };
+
+    this.format_converter = function(text, format, func)
+    {
+    // warn the user (if converted content is not empty)
+        if (!text
+      || (format == 'html' && !(text.replace(/<[^>]+>|&nbsp;|\xC2\xA0|\s/g, '')).length)
+      || (format != 'html' && !(text.replace(/\xC2\xA0|\s/g, '')).length)
+        ) {
+            // without setTimeout() here, textarea is filled with initial (onload) content
+            if (func)
+                setTimeout(function() { func(''); }, 50);
+            return true;
+        }
+
+        var confirmed = this.env.editor_warned || confirm(this.get_label('editorwarning'));
+
+        this.env.editor_warned = true;
+
+        if (!confirmed)
+            return false;
+
+        var url = '?_task=utils&_action=' + (format == 'html' ? 'html2text' : 'text2html'),
+            lock = this.set_busy(true, 'converting');
+
+        $.ajax({ type: 'POST', url: url, data: text, contentType: 'application/octet-stream',
+            error: function(o, status, err) { ref.http_error(o, status, err, lock); },
+            success: function(data) {
+                ref.set_busy(false, null, lock);
+                if (func) func(data);
+            }
+        });
+
+        return true;
+    };
+
+
+    /********************************************************/
+    /*********        remote request methods        *********/
+    /********************************************************/
+
+    // compose a valid url with the given parameters
+    this.url = function(action, query)
+    {
+        var querystring = typeof query === 'string' ? query : '';
+
+        if (typeof action !== 'string')
+            query = action;
+        else if (!query || typeof query !== 'object')
+            query = {};
+
+        if (action)
+            query._action = action;
+        else if (this.env.action)
+            query._action = this.env.action;
+
+        var url = this.env.comm_path, k, param = {};
+
+        // overwrite task name
+        if (action && action.match(/([a-z0-9_-]+)\/([a-z0-9-_.]+)/)) {
+            query._action = RegExp.$2;
+            url = url.replace(/\_task=[a-z0-9_-]+/, '_task=' + RegExp.$1);
+        }
+
+        // force _framed=0
+        if (query._framed === 0) {
+            url = url.replace('&_framed=1', '');
+            query._framed = null;
+        }
+
+        // remove undefined values
+        for (k in query) {
+            if (query[k] !== undefined && query[k] !== null)
+                param[k] = query[k];
+        }
+
+        if (param = $.param(param))
+            url += (url.indexOf('?') > -1 ? '&' : '?') + param;
+
+        if (querystring)
+            url += (url.indexOf('?') > -1 ? '&' : '?') + querystring;
+
+        return url;
+    };
+
+    this.redirect = function(url, lock)
+    {
+        if (lock !== false)
+            this.set_busy(true, 'loading');
+
+        if (this.is_framed()) {
+            url = url.replace(/&_framed=1/, '');
+            parent.rcmail.redirect(url, lock);
+        }
+        else {
+            if (this.env.extwin) {
+                if (typeof url == 'string')
+                    url += (url.indexOf('?') < 0 ? '?' : '&') + '_extwin=1';
+                else
+                    url._extwin = 1;
+            }
+            this.location_href(url, window);
+        }
+    };
+
+    this.goto_url = function(action, query, lock, secure)
+    {
+        var url = this.url(action, query);
+        if (secure) url = this.secure_url(url);
+        this.redirect(url, lock);
+    };
+
+    this.location_href = function(url, target, frame)
+    {
+        if (frame)
+            this.lock_frame(target);
+
+        if (typeof url == 'object')
+            url = this.env.comm_path + '&' + $.param(url);
+
+        // simulate real link click to force IE to send referer header
+        if (bw.ie && target == window)
+            $('<a>').attr('href', url).appendTo(document.body).get(0).click();
+        else
+            target.location.href = url;
+
+        // reset keep-alive interval
+        this.start_keepalive();
+    };
+
+    // update browser location to remember current view
+    this.update_state = function(query)
+    {
+        if (window.history.replaceState)
+            try {
+                // This may throw security exception in Firefox (#5400)
+                window.history.replaceState({}, document.title, rcmail.url('', query));
+            }
+            catch(e) { /* ignore */ };
+    };
+
+    // send a http request to the server
+    this.http_request = function(action, data, lock, type)
+    {
+        if (type != 'POST')
+            type = 'GET';
+
+        if (typeof data !== 'object')
+            data = rcube_parse_query(data);
+
+        data._remote = 1;
+        data._unlock = lock ? lock : 0;
+
+        // trigger plugin hook
+        var result = this.triggerEvent('request' + action, data);
+
+        // abort if one of the handlers returned false
+        if (result === false) {
+            if (data._unlock)
+                this.set_busy(false, null, data._unlock);
+            return false;
+        }
+        else if (result && result.getResponseHeader) {
+            return result;
+        }
+        else if (result !== undefined) {
+            data = result;
+            if (data._action) {
+                action = data._action;
+                delete data._action;
+            }
+        }
+
+        var url = this.url(action);
+
+        // reset keep-alive interval
+        this.start_keepalive();
+
+        // send request
+        return $.ajax({
+            type: type, url: url, data: data, dataType: 'json',
+            success: function(data) { ref.http_response(data); },
+            error: function(o, status, err) { ref.http_error(o, status, err, lock, action); }
+        });
+    };
+
+    // send a http GET request to the server
+    this.http_get = this.http_request;
+
+    // send a http POST request to the server
+    this.http_post = function(action, data, lock)
+    {
+        return this.http_request(action, data, lock, 'POST');
+    };
+
+    // aborts ajax request
+    this.abort_request = function(r)
+    {
+        if (r.request)
+            r.request.abort();
+        if (r.lock)
+            this.set_busy(false, null, r.lock);
+    };
+
+    // handle HTTP response
+    this.http_response = function(response)
+    {
+        if (!response)
+            return;
+
+        if (response.unlock)
+            this.set_busy(false, null, response.unlock);
+
+        this.triggerEvent('responsebefore', {response: response});
+        this.triggerEvent('responsebefore'+response.action, {response: response});
+
+        // set env vars
+        if (response.env)
+            this.set_env(response.env);
+
+        var i;
+
+        // we have labels to add
+        if (typeof response.texts === 'object') {
+            for (i in response.texts)
+                if (typeof response.texts[i] === 'string')
+                    this.add_label(i, response.texts[i]);
+        }
+
+        // if we get javascript code from server -> execute it
+        if (response.exec) {
+            eval(response.exec);
+        }
+
+        // execute callback functions of plugins
+        if (response.callbacks && response.callbacks.length) {
+            for (i=0; i < response.callbacks.length; i++)
+                this.triggerEvent(response.callbacks[i][0], response.callbacks[i][1]);
+        }
+
+        // process the response data according to the sent action
+        switch (response.action) {
+            case 'mark':
+                // Mark the message as Seen also in the opener/parent
+                if ((this.env.action == 'show' || this.env.action == 'preview') && this.env.last_flag == 'SEEN')
+                    this.set_unread_message(this.env.uid, this.env.mailbox);
+                break;
+
+            case 'delete':
+                if (this.task == 'addressbook') {
+                    var sid, uid = this.contact_list.get_selection(), writable = false;
+
+                    if (uid && this.contact_list.rows[uid]) {
+                        // search results, get source ID from record ID
+                        if (this.env.source == '') {
+                            sid = String(uid).replace(/^[^-]+-/, '');
+                            writable = sid && this.env.address_sources[sid] && !this.env.address_sources[sid].readonly;
+                        }
+                        else {
+                            writable = !this.env.address_sources[this.env.source].readonly;
+                        }
+                    }
+                    this.enable_command('delete', 'edit', writable);
+                    this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+                    this.enable_command('export-selected', 'print', false);
+                }
+
+            case 'move':
+                if (this.env.action == 'show') {
+                    // re-enable commands on move/delete error
+                    this.enable_command(this.env.message_commands, true);
+                    if (!this.env.list_post)
+                        this.enable_command('reply-list', false);
+                }
+                else if (this.task == 'addressbook') {
+                    this.triggerEvent('listupdate', { list:this.contact_list, folder:this.env.source, rowcount:this.contact_list.rowcount });
+                }
+
+            case 'purge':
+            case 'expunge':
+                if (this.task == 'mail') {
+                    if (!this.env.exists) {
+                        // clear preview pane content
+                        if (this.env.contentframe)
+                            this.show_contentframe(false);
+                        // disable commands useless when mailbox is empty
+                        this.enable_command(this.env.message_commands, 'purge', 'expunge',
+                            'select-all', 'select-none', 'expand-all', 'expand-unread', 'collapse-all', false);
+                    }
+                    if (this.message_list)
+                        this.triggerEvent('listupdate', { list:this.message_list, folder:this.env.mailbox, rowcount:this.message_list.rowcount });
+                }
+                break;
+
+            case 'refresh':
+            case 'check-recent':
+                // update message flags
+                $.each(this.env.recent_flags || {}, function(uid, flags) {
+                    ref.set_message(uid, 'deleted', flags.deleted);
+                    ref.set_message(uid, 'replied', flags.answered);
+                    ref.set_message(uid, 'unread', !flags.seen);
+                    ref.set_message(uid, 'forwarded', flags.forwarded);
+                    ref.set_message(uid, 'flagged', flags.flagged);
+                });
+                delete this.env.recent_flags;
+
+            case 'getunread':
+            case 'search':
+                this.env.qsearch = null;
+            case 'list':
+                if (this.task == 'mail') {
+                    var is_multifolder = this.is_multifolder_listing(),
+                        list = this.message_list,
+                        uid = this.env.list_uid;
+
+                    this.enable_command('show', 'select-all', 'select-none', this.env.messagecount > 0);
+                    this.enable_command('expunge', 'purge', this.env.exists && !is_multifolder);
+                    this.enable_command('import-messages', !is_multifolder);
+                    this.enable_command('expand-all', 'expand-unread', 'collapse-all', this.env.threading && this.env.messagecount && !is_multifolder);
+
+                    if (list) {
+                        if (response.action == 'list' || response.action == 'search') {
+                            // highlight message row when we're back from message page
+                            if (uid) {
+                                if (uid === 'FIRST') {
+                                    uid = list.get_first_row();
+                                }
+                                else if (uid === 'LAST') {
+                                    uid = list.get_last_row();
+                                }
+                                else if (!list.rows[uid]) {
+                                    uid += '-' + this.env.mailbox;
+                                }
+
+                                if (uid && list.rows[uid]) {
+                                    list.select(uid);
+                                }
+
+                                delete this.env.list_uid;
+                            }
+
+                            this.enable_command('set-listmode', this.env.threads && !is_multifolder);
+                            if (list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
+                                list.focus();
+
+                            // trigger 'select' so all dependent actions update its state
+                            // e.g. plugins use this event to activate buttons (#1490647)
+                            list.triggerEvent('select');
+                        }
+
+                        if (response.action != 'getunread')
+                            this.triggerEvent('listupdate', { list:list, folder:this.env.mailbox, rowcount:list.rowcount });
+                    }
+                }
+                else if (this.task == 'addressbook') {
+                    var list = this.contact_list,
+                        uid = this.env.list_uid;
+
+                    this.enable_command('export', 'select-all', 'select-none', (list && list.rowcount > 0));
+
+                    if (response.action == 'list' || response.action == 'search') {
+                        this.enable_command('search-create', this.env.source == '');
+                        this.enable_command('search-delete', this.env.search_id);
+                        this.update_group_commands();
+
+                        if (list && uid) {
+                            if (uid === 'FIRST') {
+                                uid = list.get_first_row();
+                            }
+                            else if (uid === 'LAST') {
+                                uid = list.get_last_row();
+                            }
+
+                            if (uid && list.rows[uid]) {
+                                list.select(uid);
+                            }
+
+                            delete this.env.list_uid;
+
+                            // trigger 'select' so all dependent actions update its state
+                            list.triggerEvent('select');
+                        }
+
+                        if (list.rowcount > 0 && !$(document.activeElement).is('input,textarea'))
+                            list.focus();
+
+                        this.triggerEvent('listupdate', { list:list, folder:this.env.source, rowcount:list.rowcount });
+                    }
+                }
+                break;
+
+            case 'list-contacts':
+            case 'search-contacts':
+                if (this.contact_list) {
+                    if (this.contact_list.rowcount > 0)
+                        this.contact_list.focus();
+                    this.triggerEvent('listupdate', { list:this.contact_list, rowcount:this.contact_list.rowcount });
+                }
+                break;
+        }
+
+        if (response.unlock)
+            this.hide_message(response.unlock);
+
+        this.triggerEvent('responseafter', {response: response});
+        this.triggerEvent('responseafter'+response.action, {response: response});
+
+        // reset keep-alive interval
+        this.start_keepalive();
+    };
+
+    // handle HTTP request errors
+    this.http_error = function(request, status, err, lock, action)
+    {
+        var errmsg = request.statusText;
+
+        this.set_busy(false, null, lock);
+        request.abort();
+
+        // don't display error message on page unload (#1488547)
+        if (this.unload)
+            return;
+
+        if (request.status && errmsg)
+            this.display_message(this.get_label('servererror') + ' (' + errmsg + ')', 'error');
+        else if (status == 'timeout')
+            this.display_message('requesttimedout', 'error');
+        else if (request.status == 0 && status != 'abort')
+            this.display_message('connerror', 'error');
+
+        // redirect to url specified in location header if not empty
+        var location_url = request.getResponseHeader("Location");
+        if (location_url && this.env.action != 'compose')  // don't redirect on compose screen, contents might get lost (#1488926)
+            this.redirect(location_url);
+
+        // 403 Forbidden response (CSRF prevention) - reload the page.
+        // In case there's a new valid session it will be used, otherwise
+        // login form will be presented (#1488960).
+        if (request.status == 403) {
+            (this.is_framed() ? parent : window).location.reload();
+            return;
+        }
+
+        // re-send keep-alive requests after 30 seconds
+        if (action == 'keep-alive')
+            setTimeout(function() { ref.keep_alive(); ref.start_keepalive(); }, 30000);
+    };
+
+    // handler for session errors detected on the server
+    this.session_error = function(redirect_url)
+    {
+        this.env.server_error = 401;
+
+        // save message in local storage and do not redirect
+        if (this.env.action == 'compose') {
+            this.save_compose_form_local();
+            this.compose_skip_unsavedcheck = true;
+            // stop keep-alive and refresh processes
+            this.env.session_lifetime = 0;
+            if (this._keepalive)
+                clearInterval(this._keepalive);
+            if (this._refresh)
+                clearInterval(this._refresh);
+        }
+        else if (redirect_url) {
+            setTimeout(function() { ref.redirect(redirect_url, true); }, 2000);
+        }
+    };
+
+    // callback when an iframe finished loading
+    this.iframe_loaded = function(unlock)
+    {
+        if (!unlock)
+            unlock = this.env.frame_lock;
+
+        this.set_busy(false, null, unlock);
+
+        if (this.submit_timer)
+            clearTimeout(this.submit_timer);
+    };
+
+    /**
    Send multi-threaded parallel HTTP requests to the server for a list if items.
    The string '%' in either a GET query or POST parameters will be replaced with the respective item value.
    This is the argument object expected: {
@@ -9420,808 +9420,808 @@ function rcube_webmail()
        whendone: function(alldata){ }   // Callback function called when all requests have been sent
    }
   */
-  this.multi_thread_http_request = function(prop)
-  {
-    var i, item, reqid = new Date().getTime(),
-      threads = prop.threads || 1;
+    this.multi_thread_http_request = function(prop)
+    {
+        var i, item, reqid = new Date().getTime(),
+            threads = prop.threads || 1;
 
-    prop.reqid = reqid;
-    prop.running = 0;
-    prop.requests = [];
-    prop.result = [];
-    prop._items = $.extend([], prop.items);  // copy items
+        prop.reqid = reqid;
+        prop.running = 0;
+        prop.requests = [];
+        prop.result = [];
+        prop._items = $.extend([], prop.items);  // copy items
 
-    if (!prop.lock)
-      prop.lock = this.display_message('', 'loading');
+        if (!prop.lock)
+            prop.lock = this.display_message('', 'loading');
 
-    // add the request arguments to the jobs pool
-    this.http_request_jobs[reqid] = prop;
+        // add the request arguments to the jobs pool
+        this.http_request_jobs[reqid] = prop;
 
-    // start n threads
-    for (i=0; i < threads; i++) {
-      item = prop._items.shift();
-      if (item === undefined)
-        break;
+        // start n threads
+        for (i=0; i < threads; i++) {
+            item = prop._items.shift();
+            if (item === undefined)
+                break;
 
-      prop.running++;
-      prop.requests.push(this.multi_thread_send_request(prop, item));
-    }
-
-    return reqid;
-  };
-
-  // helper method to send an HTTP request with the given iterator value
-  this.multi_thread_send_request = function(prop, item)
-  {
-    var k, postdata, query;
-
-    // replace %s in post data
-    if (prop.postdata) {
-      postdata = {};
-      for (k in prop.postdata) {
-        postdata[k] = String(prop.postdata[k]).replace('%s', item);
-      }
-      postdata._reqid = prop.reqid;
-    }
-    // replace %s in query
-    else if (typeof prop.query == 'string') {
-      query = prop.query.replace('%s', item);
-      query += '&_reqid=' + prop.reqid;
-    }
-    else if (typeof prop.query == 'object' && prop.query) {
-      query = {};
-      for (k in prop.query) {
-        query[k] = String(prop.query[k]).replace('%s', item);
-      }
-      query._reqid = prop.reqid;
-    }
-
-    // send HTTP GET or POST request
-    return postdata ? this.http_post(prop.action, postdata) : this.http_request(prop.action, query);
-  };
-
-  // callback function for multi-threaded http responses
-  this.multi_thread_http_response = function(data, reqid)
-  {
-    var prop = this.http_request_jobs[reqid];
-    if (!prop || prop.running <= 0 || prop.cancelled)
-      return;
-
-    prop.running--;
-
-    // trigger response callback
-    if (prop.onresponse && typeof prop.onresponse == 'function') {
-      prop.onresponse(data);
-    }
-
-    prop.result = $.extend(prop.result, data);
-
-    // send next request if prop.items is not yet empty
-    var item = prop._items.shift();
-    if (item !== undefined) {
-      prop.running++;
-      prop.requests.push(this.multi_thread_send_request(prop, item));
-    }
-    // trigger whendone callback and mark this request as done
-    else if (prop.running == 0) {
-      if (prop.whendone && typeof prop.whendone == 'function') {
-        prop.whendone(prop.result);
-      }
-
-      this.set_busy(false, '', prop.lock);
-
-      // remove from this.http_request_jobs pool
-      delete this.http_request_jobs[reqid];
-    }
-  };
-
-  // abort a running multi-thread request with the given identifier
-  this.multi_thread_request_abort = function(reqid)
-  {
-    var prop = this.http_request_jobs[reqid];
-    if (prop) {
-      for (var i=0; prop.running > 0 && i < prop.requests.length; i++) {
-        if (prop.requests[i].abort)
-          prop.requests[i].abort();
-      }
-
-      prop.running = 0;
-      prop.cancelled = true;
-      this.set_busy(false, '', prop.lock);
-    }
-  };
-
-  // post the given form to a hidden iframe
-  this.async_upload_form = function(form, action, onload)
-  {
-    // create hidden iframe
-    var ts = new Date().getTime(),
-      frame_name = 'rcmupload' + ts,
-      frame = this.dummy_iframe(frame_name);
-
-    // handle upload errors by parsing iframe content in onload
-    frame.on('load', {ts:ts}, onload);
-
-    $(form).attr({
-        target: frame_name,
-        action: this.url(action, {_id: this.env.compose_id || '', _uploadid: ts, _from: this.env.action}),
-        method: 'POST',
-        enctype: 'multipart/form-data'
-      })
-      .submit();
-
-    return frame_name;
-  };
-
-  // create hidden iframe element
-  this.dummy_iframe = function(name, src)
-  {
-    return $('<iframe>').attr({
-        name: name,
-        src: src,
-        style: 'width:0;height:0;visibility:hidden',
-        'aria-hidden': 'true'
-      })
-      .appendTo(document.body);
-  };
-
-  // html5 file-drop API
-  this.document_drag_hover = function(e, over)
-  {
-    // don't e.preventDefault() here to not block text dragging on the page (#1490619)
-    $(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
-  };
-
-  this.file_drag_hover = function(e, over)
-  {
-    e.preventDefault();
-    e.stopPropagation();
-    $(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
-  };
-
-  // handler when files are dropped to a designated area.
-  // compose a multipart form data and submit it to the server
-  this.file_dropped = function(e)
-  {
-    // abort event and reset UI
-    this.file_drag_hover(e, false);
-
-    // prepare multipart form data composition
-    var uri,
-      files = e.target.files || e.dataTransfer.files,
-      args = {_id: this.env.compose_id || this.env.cid || '', _remote: 1, _from: this.env.action};
-
-    if (!files || !files.length) {
-      // Roundcube attachment, pass its uri to the backend and attach
-      if (uri = e.dataTransfer.getData('roundcube-uri')) {
-        var ts = 'upload' + new Date().getTime(),
-          // jQuery way to escape filename (#1490530)
-          content = $('<span>').text(e.dataTransfer.getData('roundcube-name') || this.get_label('attaching')).html();
-
-        args._uri = uri;
-        args._uploadid = ts;
-
-        // add to attachments list
-        if (!this.add2attachment_list(ts, {name: '', html: content, classname: 'uploading', complete: false}))
-          this.file_upload_id = this.set_busy(true, 'attaching');
-
-        this.http_post(this.env.filedrop.action || 'upload', args);
-      }
-
-      return;
-    }
-
-    this.file_upload(files, args, {
-      name: (this.env.filedrop.fieldname || '_file') + (this.env.filedrop.single ? '' : '[]'),
-      single: this.env.filedrop.single,
-      filter: this.env.filedrop.filter,
-      action: ref.env.filedrop.action
-    });
-  };
-
-  // Files upload using ajax
-  this.file_upload = function(files, post_args, props)
-  {
-    if (!window.FormData || !files || !files.length)
-      return false;
-
-    var f, i, fname, size = 0, numfiles = 0,
-      formdata = new FormData(),
-      fieldname = props.name || '_file[]',
-      limit = props.single ? 1 : files.length;
-      args = $.extend({_remote: 1, _from: this.env.action}, post_args || {});
-
-    // add files to form data
-    for (i=0; numfiles < limit && (f = files[i]); i++) {
-      // filter by file type if requested
-      if (props.filter && !f.type.match(new RegExp(props.filter))) {
-        // TODO: show message to user
-        continue;
-      }
-
-      formdata.append(fieldname, f);
-      size += f.size;
-      fname = f.name;
-      numfiles++;
-    }
-
-    if (numfiles) {
-      if (this.env.max_filesize && this.env.filesizeerror && size > this.env.max_filesize) {
-        this.display_message(this.env.filesizeerror, 'error');
-        return false;
-      }
-
-      if (this.env.max_filecount && this.env.filecounterror && numfiles > this.env.max_filecount) {
-        this.display_message(this.env.filecounterror, 'error');
-        return false;
-      }
-
-      var ts = 'upload' + new Date().getTime(),
-        label = numfiles > 1 ? this.get_label('uploadingmany') : fname,
-        // jQuery way to escape filename (#1490530)
-        content = $('<span>').text(label).html();
-
-      // add to attachments list
-      if (!this.add2attachment_list(ts, {name: '', html: content, classname: 'uploading', complete: false}) && !props.lock)
-        props.lock = this.file_upload_id = this.set_busy(true, 'uploading');
-
-      args._uploadid = ts;
-      args._unlock = props.lock;
-
-      this.uploads[ts] = $.ajax({
-        type: 'POST',
-        dataType: 'json',
-        url: this.url(props.action || 'upload', args),
-        contentType: false,
-        processData: false,
-        timeout: this.uploadTimeout, // ajax call timeout for loading attachment
-        data: formdata,
-        headers: {'X-Roundcube-Request': this.env.request_token},
-        xhr: function() {
-          var xhr = $.ajaxSettings.xhr();
-          if (xhr.upload && ref.labels.uploadprogress) {
-            xhr.upload.onprogress = function(e) {
-              var msg = ref.file_upload_msg(e.loaded, e.total);
-              if (msg) {
-                $('#' + ts).find('.uploading').text(msg);
-              }
-            };
-          }
-          return xhr;
-        },
-        success: function(data) {
-          delete ref.uploads[ts];
-          ref.http_response(data);
-        },
-        error: function(o, status, err) {
-          delete ref.uploads[ts];
-          ref.remove_from_attachment_list(ts);
-          ref.http_error(o, status, err, props.lock, 'attachment');
+            prop.running++;
+            prop.requests.push(this.multi_thread_send_request(prop, item));
         }
-      });
-    }
 
-    return true;
-  };
+        return reqid;
+    };
 
-  this.file_upload_msg = function(current, total)
-  {
-    if (total && current < total) {
-      var percent = Math.round(current/total * 100),
-        label = ref.get_label('uploadprogress');
+    // helper method to send an HTTP request with the given iterator value
+    this.multi_thread_send_request = function(prop, item)
+    {
+        var k, postdata, query;
 
-      if (total >= 1073741824) {
-        total = parseFloat(total/1073741824).toFixed(1) + ' ' . this.get_label('GB');
-        current = parseFloat(current/1073741824).toFixed(1);
-      }
-      else if (total >= 1048576) {
-        total = parseFloat(total/1048576).toFixed(1) + ' ' + this.get_label('MB');
-        current = parseFloat(current/1048576).toFixed(1);
-      }
-      else if (total >= 1024) {
-        total = parseInt(total/1024) + ' ' + this.get_label('KB');
-        current = parseInt(current/1024);
-      }
-      else {
-        total = total + ' ' + this.get_label('B');
-      }
+        // replace %s in post data
+        if (prop.postdata) {
+            postdata = {};
+            for (k in prop.postdata) {
+                postdata[k] = String(prop.postdata[k]).replace('%s', item);
+            }
+            postdata._reqid = prop.reqid;
+        }
+        // replace %s in query
+        else if (typeof prop.query == 'string') {
+            query = prop.query.replace('%s', item);
+            query += '&_reqid=' + prop.reqid;
+        }
+        else if (typeof prop.query == 'object' && prop.query) {
+            query = {};
+            for (k in prop.query) {
+                query[k] = String(prop.query[k]).replace('%s', item);
+            }
+            query._reqid = prop.reqid;
+        }
 
-      return label.replace('$percent', percent + '%').replace('$current', current).replace('$total', total);
-    }
-  };
+        // send HTTP GET or POST request
+        return postdata ? this.http_post(prop.action, postdata) : this.http_request(prop.action, query);
+    };
 
-  // starts interval for keep-alive signal
-  this.start_keepalive = function()
-  {
-    if (!this.env.session_lifetime || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
-      return;
+    // callback function for multi-threaded http responses
+    this.multi_thread_http_response = function(data, reqid)
+    {
+        var prop = this.http_request_jobs[reqid];
+        if (!prop || prop.running <= 0 || prop.cancelled)
+            return;
 
-    if (this._keepalive)
-      clearInterval(this._keepalive);
+        prop.running--;
 
-    // use Math to prevent from an integer overflow (#5273)
-    // maximum interval is 15 minutes, minimum is 30 seconds
-    var interval = Math.min(1800, this.env.session_lifetime) * 0.5 * 1000;
-    this._keepalive = setInterval(function() { ref.keep_alive(); }, interval < 30000 ? 30000 : interval);
-  };
+        // trigger response callback
+        if (prop.onresponse && typeof prop.onresponse == 'function') {
+            prop.onresponse(data);
+        }
 
-  // starts interval for refresh signal
-  this.start_refresh = function()
-  {
-    if (!this.env.refresh_interval || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
-      return;
+        prop.result = $.extend(prop.result, data);
 
-    if (this._refresh)
-      clearInterval(this._refresh);
+        // send next request if prop.items is not yet empty
+        var item = prop._items.shift();
+        if (item !== undefined) {
+            prop.running++;
+            prop.requests.push(this.multi_thread_send_request(prop, item));
+        }
+        // trigger whendone callback and mark this request as done
+        else if (prop.running == 0) {
+            if (prop.whendone && typeof prop.whendone == 'function') {
+                prop.whendone(prop.result);
+            }
 
-    this._refresh = setInterval(function(){ ref.refresh(); }, this.env.refresh_interval * 1000);
-  };
+            this.set_busy(false, '', prop.lock);
 
-  // sends keep-alive signal
-  this.keep_alive = function()
-  {
-    if (!this.busy)
-      this.http_request('keep-alive');
-  };
+            // remove from this.http_request_jobs pool
+            delete this.http_request_jobs[reqid];
+        }
+    };
 
-  // sends refresh signal
-  this.refresh = function()
-  {
-    if (this.busy) {
-      // try again after 10 seconds
-      setTimeout(function() { ref.refresh(); ref.start_refresh(); }, 10000);
-      return;
-    }
+    // abort a running multi-thread request with the given identifier
+    this.multi_thread_request_abort = function(reqid)
+    {
+        var prop = this.http_request_jobs[reqid];
+        if (prop) {
+            for (var i=0; prop.running > 0 && i < prop.requests.length; i++) {
+                if (prop.requests[i].abort)
+                    prop.requests[i].abort();
+            }
 
-    var params = {}, lock = this.set_busy(true, 'refreshing');
+            prop.running = 0;
+            prop.cancelled = true;
+            this.set_busy(false, '', prop.lock);
+        }
+    };
 
-    if (this.task == 'mail' && this.gui_objects.mailboxlist)
-      params = this.check_recent_params();
+    // post the given form to a hidden iframe
+    this.async_upload_form = function(form, action, onload)
+    {
+    // create hidden iframe
+        var ts = new Date().getTime(),
+            frame_name = 'rcmupload' + ts,
+            frame = this.dummy_iframe(frame_name);
 
-    params._last = Math.floor(this.env.lastrefresh.getTime() / 1000);
-    this.env.lastrefresh = new Date();
+        // handle upload errors by parsing iframe content in onload
+        frame.on('load', {ts:ts}, onload);
 
-    // plugins should bind to 'requestrefresh' event to add own params
-    this.http_post('refresh', params, lock);
-  };
+        $(form).attr({
+            target: frame_name,
+            action: this.url(action, {_id: this.env.compose_id || '', _uploadid: ts, _from: this.env.action}),
+            method: 'POST',
+            enctype: 'multipart/form-data'
+        })
+            .submit();
 
-  // returns check-recent request parameters
-  this.check_recent_params = function()
-  {
-    var params = {_mbox: this.env.mailbox};
+        return frame_name;
+    };
 
-    if (this.gui_objects.mailboxlist)
-      params._folderlist = 1;
-    if (this.gui_objects.quotadisplay)
-      params._quota = 1;
-    if (this.env.search_request)
-      params._search = this.env.search_request;
+    // create hidden iframe element
+    this.dummy_iframe = function(name, src)
+    {
+        return $('<iframe>').attr({
+            name: name,
+            src: src,
+            style: 'width:0;height:0;visibility:hidden',
+            'aria-hidden': 'true'
+        })
+            .appendTo(document.body);
+    };
 
-    if (this.gui_objects.messagelist) {
-      params._list = 1;
+    // html5 file-drop API
+    this.document_drag_hover = function(e, over)
+    {
+    // don't e.preventDefault() here to not block text dragging on the page (#1490619)
+        $(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('active');
+    };
 
-      // message uids for flag updates check
-      params._uids = $.map(this.message_list.rows, function(row, uid) { return uid; }).join(',');
-    }
+    this.file_drag_hover = function(e, over)
+    {
+        e.preventDefault();
+        e.stopPropagation();
+        $(this.gui_objects.filedrop)[(over?'addClass':'removeClass')]('hover');
+    };
 
-    return params;
-  };
+    // handler when files are dropped to a designated area.
+    // compose a multipart form data and submit it to the server
+    this.file_dropped = function(e)
+    {
+    // abort event and reset UI
+        this.file_drag_hover(e, false);
+
+        // prepare multipart form data composition
+        var uri,
+            files = e.target.files || e.dataTransfer.files,
+            args = {_id: this.env.compose_id || this.env.cid || '', _remote: 1, _from: this.env.action};
+
+        if (!files || !files.length) {
+            // Roundcube attachment, pass its uri to the backend and attach
+            if (uri = e.dataTransfer.getData('roundcube-uri')) {
+                var ts = 'upload' + new Date().getTime(),
+                    // jQuery way to escape filename (#1490530)
+                    content = $('<span>').text(e.dataTransfer.getData('roundcube-name') || this.get_label('attaching')).html();
+
+                args._uri = uri;
+                args._uploadid = ts;
+
+                // add to attachments list
+                if (!this.add2attachment_list(ts, {name: '', html: content, classname: 'uploading', complete: false}))
+                    this.file_upload_id = this.set_busy(true, 'attaching');
+
+                this.http_post(this.env.filedrop.action || 'upload', args);
+            }
+
+            return;
+        }
+
+        this.file_upload(files, args, {
+            name: (this.env.filedrop.fieldname || '_file') + (this.env.filedrop.single ? '' : '[]'),
+            single: this.env.filedrop.single,
+            filter: this.env.filedrop.filter,
+            action: ref.env.filedrop.action
+        });
+    };
+
+    // Files upload using ajax
+    this.file_upload = function(files, post_args, props)
+    {
+        if (!window.FormData || !files || !files.length)
+            return false;
+
+        var f, i, fname, size = 0, numfiles = 0,
+            formdata = new FormData(),
+            fieldname = props.name || '_file[]',
+            limit = props.single ? 1 : files.length;
+        args = $.extend({_remote: 1, _from: this.env.action}, post_args || {});
+
+        // add files to form data
+        for (i=0; numfiles < limit && (f = files[i]); i++) {
+            // filter by file type if requested
+            if (props.filter && !f.type.match(new RegExp(props.filter))) {
+                // TODO: show message to user
+                continue;
+            }
+
+            formdata.append(fieldname, f);
+            size += f.size;
+            fname = f.name;
+            numfiles++;
+        }
+
+        if (numfiles) {
+            if (this.env.max_filesize && this.env.filesizeerror && size > this.env.max_filesize) {
+                this.display_message(this.env.filesizeerror, 'error');
+                return false;
+            }
+
+            if (this.env.max_filecount && this.env.filecounterror && numfiles > this.env.max_filecount) {
+                this.display_message(this.env.filecounterror, 'error');
+                return false;
+            }
+
+            var ts = 'upload' + new Date().getTime(),
+                label = numfiles > 1 ? this.get_label('uploadingmany') : fname,
+                // jQuery way to escape filename (#1490530)
+                content = $('<span>').text(label).html();
+
+            // add to attachments list
+            if (!this.add2attachment_list(ts, {name: '', html: content, classname: 'uploading', complete: false}) && !props.lock)
+                props.lock = this.file_upload_id = this.set_busy(true, 'uploading');
+
+            args._uploadid = ts;
+            args._unlock = props.lock;
+
+            this.uploads[ts] = $.ajax({
+                type: 'POST',
+                dataType: 'json',
+                url: this.url(props.action || 'upload', args),
+                contentType: false,
+                processData: false,
+                timeout: this.uploadTimeout, // ajax call timeout for loading attachment
+                data: formdata,
+                headers: {'X-Roundcube-Request': this.env.request_token},
+                xhr: function() {
+                    var xhr = $.ajaxSettings.xhr();
+                    if (xhr.upload && ref.labels.uploadprogress) {
+                        xhr.upload.onprogress = function(e) {
+                            var msg = ref.file_upload_msg(e.loaded, e.total);
+                            if (msg) {
+                                $('#' + ts).find('.uploading').text(msg);
+                            }
+                        };
+                    }
+                    return xhr;
+                },
+                success: function(data) {
+                    delete ref.uploads[ts];
+                    ref.http_response(data);
+                },
+                error: function(o, status, err) {
+                    delete ref.uploads[ts];
+                    ref.remove_from_attachment_list(ts);
+                    ref.http_error(o, status, err, props.lock, 'attachment');
+                }
+            });
+        }
+
+        return true;
+    };
+
+    this.file_upload_msg = function(current, total)
+    {
+        if (total && current < total) {
+            var percent = Math.round(current/total * 100),
+                label = ref.get_label('uploadprogress');
+
+            if (total >= 1073741824) {
+                total = parseFloat(total/1073741824).toFixed(1) + ' ' . this.get_label('GB');
+                current = parseFloat(current/1073741824).toFixed(1);
+            }
+            else if (total >= 1048576) {
+                total = parseFloat(total/1048576).toFixed(1) + ' ' + this.get_label('MB');
+                current = parseFloat(current/1048576).toFixed(1);
+            }
+            else if (total >= 1024) {
+                total = parseInt(total/1024) + ' ' + this.get_label('KB');
+                current = parseInt(current/1024);
+            }
+            else {
+                total = total + ' ' + this.get_label('B');
+            }
+
+            return label.replace('$percent', percent + '%').replace('$current', current).replace('$total', total);
+        }
+    };
+
+    // starts interval for keep-alive signal
+    this.start_keepalive = function()
+    {
+        if (!this.env.session_lifetime || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
+            return;
+
+        if (this._keepalive)
+            clearInterval(this._keepalive);
+
+        // use Math to prevent from an integer overflow (#5273)
+        // maximum interval is 15 minutes, minimum is 30 seconds
+        var interval = Math.min(1800, this.env.session_lifetime) * 0.5 * 1000;
+        this._keepalive = setInterval(function() { ref.keep_alive(); }, interval < 30000 ? 30000 : interval);
+    };
+
+    // starts interval for refresh signal
+    this.start_refresh = function()
+    {
+        if (!this.env.refresh_interval || this.env.framed || this.env.extwin || this.task == 'login' || this.env.action == 'print')
+            return;
+
+        if (this._refresh)
+            clearInterval(this._refresh);
+
+        this._refresh = setInterval(function(){ ref.refresh(); }, this.env.refresh_interval * 1000);
+    };
+
+    // sends keep-alive signal
+    this.keep_alive = function()
+    {
+        if (!this.busy)
+            this.http_request('keep-alive');
+    };
+
+    // sends refresh signal
+    this.refresh = function()
+    {
+        if (this.busy) {
+            // try again after 10 seconds
+            setTimeout(function() { ref.refresh(); ref.start_refresh(); }, 10000);
+            return;
+        }
+
+        var params = {}, lock = this.set_busy(true, 'refreshing');
+
+        if (this.task == 'mail' && this.gui_objects.mailboxlist)
+            params = this.check_recent_params();
+
+        params._last = Math.floor(this.env.lastrefresh.getTime() / 1000);
+        this.env.lastrefresh = new Date();
+
+        // plugins should bind to 'requestrefresh' event to add own params
+        this.http_post('refresh', params, lock);
+    };
+
+    // returns check-recent request parameters
+    this.check_recent_params = function()
+    {
+        var params = {_mbox: this.env.mailbox};
+
+        if (this.gui_objects.mailboxlist)
+            params._folderlist = 1;
+        if (this.gui_objects.quotadisplay)
+            params._quota = 1;
+        if (this.env.search_request)
+            params._search = this.env.search_request;
+
+        if (this.gui_objects.messagelist) {
+            params._list = 1;
+
+            // message uids for flag updates check
+            params._uids = $.map(this.message_list.rows, function(row, uid) { return uid; }).join(',');
+        }
+
+        return params;
+    };
 
 
-  /********************************************************/
-  /*********            helper methods            *********/
-  /********************************************************/
+    /********************************************************/
+    /*********            helper methods            *********/
+    /********************************************************/
 
-  /**
+    /**
    * Quote html entities
    */
-  this.quote_html = function(str)
-  {
-    return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
-  };
+    this.quote_html = function(str)
+    {
+        return String(str).replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+    };
 
-  // get window.opener.rcmail if available
-  this.opener = function(deep, filter)
-  {
-    var i, win = window.opener;
+    // get window.opener.rcmail if available
+    this.opener = function(deep, filter)
+    {
+        var i, win = window.opener;
 
-    // catch Error: Permission denied to access property rcmail
-    try {
-      if (win && !win.closed && win !== window) {
-        // try parent of the opener window, e.g. preview frame
-        if (deep && (!win.rcmail || win.rcmail.env.framed) && win.parent && win.parent.rcmail)
-          win = win.parent;
+        // catch Error: Permission denied to access property rcmail
+        try {
+            if (win && !win.closed && win !== window) {
+                // try parent of the opener window, e.g. preview frame
+                if (deep && (!win.rcmail || win.rcmail.env.framed) && win.parent && win.parent.rcmail)
+                    win = win.parent;
 
-        if (win.rcmail && filter)
-          for (i in filter)
-            if (win.rcmail.env[i] != filter[i])
-              return;
+                if (win.rcmail && filter)
+                    for (i in filter)
+                        if (win.rcmail.env[i] != filter[i])
+                            return;
 
-        return win.rcmail;
-      }
-    }
-    catch (e) {}
-  };
+                return win.rcmail;
+            }
+        }
+        catch (e) {}
+    };
 
-  // check if we're in show mode or if we have a unique selection
-  // and return the message uid
-  this.get_single_uid = function()
-  {
-    var uid = this.env.uid || (this.message_list ? this.message_list.get_single_selection() : null);
-    var result = ref.triggerEvent('get_single_uid', { uid: uid });
-    return result || uid;
-  };
+    // check if we're in show mode or if we have a unique selection
+    // and return the message uid
+    this.get_single_uid = function()
+    {
+        var uid = this.env.uid || (this.message_list ? this.message_list.get_single_selection() : null);
+        var result = ref.triggerEvent('get_single_uid', { uid: uid });
+        return result || uid;
+    };
 
-  // same as above but for contacts
-  this.get_single_cid = function()
-  {
-    var cid = this.env.cid || (this.contact_list ? this.contact_list.get_single_selection() : null);
-    var result = ref.triggerEvent('get_single_cid', { cid: cid });
-    return result || cid;
-  };
+    // same as above but for contacts
+    this.get_single_cid = function()
+    {
+        var cid = this.env.cid || (this.contact_list ? this.contact_list.get_single_selection() : null);
+        var result = ref.triggerEvent('get_single_cid', { cid: cid });
+        return result || cid;
+    };
 
-  // get the IMP mailbox of the message with the given UID
-  this.get_message_mailbox = function(uid)
-  {
-    var msg;
+    // get the IMP mailbox of the message with the given UID
+    this.get_message_mailbox = function(uid)
+    {
+        var msg;
 
-    if (this.env.messages && uid && (msg = this.env.messages[uid]) && msg.mbox)
-      return msg.mbox;
+        if (this.env.messages && uid && (msg = this.env.messages[uid]) && msg.mbox)
+            return msg.mbox;
 
-    if (/^[0-9]+-(.*)$/.test(uid))
-      return RegExp.$1;
+        if (/^[0-9]+-(.*)$/.test(uid))
+            return RegExp.$1;
 
-    return this.env.mailbox;
-  };
+        return this.env.mailbox;
+    };
 
-  // build request parameters from single message id (maybe with mailbox name)
-  this.params_from_uid = function(uid, params)
-  {
-    if (!params)
-      params = {};
+    // build request parameters from single message id (maybe with mailbox name)
+    this.params_from_uid = function(uid, params)
+    {
+        if (!params)
+            params = {};
 
-    params._uid = String(uid).split('-')[0];
-    params._mbox = this.get_message_mailbox(uid);
+        params._uid = String(uid).split('-')[0];
+        params._mbox = this.get_message_mailbox(uid);
 
-    return params;
-  };
+        return params;
+    };
 
-  // gets cursor position
-  this.get_caret_pos = function(obj)
-  {
-    if (obj.selectionEnd !== undefined)
-      return obj.selectionEnd;
+    // gets cursor position
+    this.get_caret_pos = function(obj)
+    {
+        if (obj.selectionEnd !== undefined)
+            return obj.selectionEnd;
 
-    return obj.value.length;
-  };
+        return obj.value.length;
+    };
 
-  // moves cursor to specified position
-  this.set_caret_pos = function(obj, pos)
-  {
-    try {
-      if (obj.setSelectionRange)
-        obj.setSelectionRange(pos, pos);
-    }
-    catch(e) {} // catch Firefox exception if obj is hidden
-  };
+    // moves cursor to specified position
+    this.set_caret_pos = function(obj, pos)
+    {
+        try {
+            if (obj.setSelectionRange)
+                obj.setSelectionRange(pos, pos);
+        }
+        catch(e) {} // catch Firefox exception if obj is hidden
+    };
 
-  // get selected text from an input field
-  this.get_input_selection = function(obj)
-  {
-    var start = 0, end = 0, normalizedValue = '';
+    // get selected text from an input field
+    this.get_input_selection = function(obj)
+    {
+        var start = 0, end = 0, normalizedValue = '';
 
-    if (typeof obj.selectionStart == "number" && typeof obj.selectionEnd == "number") {
-      normalizedValue = obj.value;
-      start = obj.selectionStart;
-      end = obj.selectionEnd;
-    }
+        if (typeof obj.selectionStart == "number" && typeof obj.selectionEnd == "number") {
+            normalizedValue = obj.value;
+            start = obj.selectionStart;
+            end = obj.selectionEnd;
+        }
 
-    return {start: start, end: end, text: normalizedValue.substr(start, end-start)};
-  };
+        return {start: start, end: end, text: normalizedValue.substr(start, end-start)};
+    };
 
-  // disable/enable all fields of a form
-  this.lock_form = function(form, lock)
-  {
-    if (!form || !form.elements)
-      return;
+    // disable/enable all fields of a form
+    this.lock_form = function(form, lock)
+    {
+        if (!form || !form.elements)
+            return;
 
-    if (lock)
-      this.disabled_form_elements = [];
+        if (lock)
+            this.disabled_form_elements = [];
 
-    $.each(form.elements, function() {
-      if (this.type == 'hidden')
-        return;
-      // remember which elem was disabled before lock
-      if (lock && this.disabled)
-        ref.disabled_form_elements.push(this);
-      else if (lock || $.inArray(this, ref.disabled_form_elements) < 0)
-        this.disabled = lock;
-    });
-  };
+        $.each(form.elements, function() {
+            if (this.type == 'hidden')
+                return;
+            // remember which elem was disabled before lock
+            if (lock && this.disabled)
+                ref.disabled_form_elements.push(this);
+            else if (lock || $.inArray(this, ref.disabled_form_elements) < 0)
+                this.disabled = lock;
+        });
+    };
 
-  this.mailto_handler_uri = function()
-  {
-    return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
-  };
+    this.mailto_handler_uri = function()
+    {
+        return location.href.split('?')[0] + '?_task=mail&_action=compose&_to=%s';
+    };
 
-  this.register_protocol_handler = function(name)
-  {
-    try {
-      window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
-    }
-    catch(e) {
-      this.display_message(String(e), 'error');
-    }
-  };
+    this.register_protocol_handler = function(name)
+    {
+        try {
+            window.navigator.registerProtocolHandler('mailto', this.mailto_handler_uri(), name);
+        }
+        catch(e) {
+            this.display_message(String(e), 'error');
+        }
+    };
 
-  this.check_protocol_handler = function(name, elem)
-  {
-    var nav = window.navigator;
+    this.check_protocol_handler = function(name, elem)
+    {
+        var nav = window.navigator;
 
-    if (!nav || (typeof nav.registerProtocolHandler != 'function')) {
-      $(elem).addClass('disabled').click(function() {
-        ref.display_message('nosupporterror', 'error');
-        return false;
-      });
-    }
-    else if (typeof nav.isProtocolHandlerRegistered == 'function') {
-      var status = nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri());
-      if (status)
-        $(elem).parent().find('.mailtoprotohandler-status').html(status);
-    }
-    else {
-      $(elem).click(function() { ref.register_protocol_handler(name); return false; });
-    }
-  };
+        if (!nav || (typeof nav.registerProtocolHandler != 'function')) {
+            $(elem).addClass('disabled').click(function() {
+                ref.display_message('nosupporterror', 'error');
+                return false;
+            });
+        }
+        else if (typeof nav.isProtocolHandlerRegistered == 'function') {
+            var status = nav.isProtocolHandlerRegistered('mailto', this.mailto_handler_uri());
+            if (status)
+                $(elem).parent().find('.mailtoprotohandler-status').html(status);
+        }
+        else {
+            $(elem).click(function() { ref.register_protocol_handler(name); return false; });
+        }
+    };
 
-  // Checks browser capabilities e.g. PDF support, TIF support
-  this.browser_capabilities_check = function()
-  {
-    if (!this.env.browser_capabilities)
-      this.env.browser_capabilities = {};
+    // Checks browser capabilities e.g. PDF support, TIF support
+    this.browser_capabilities_check = function()
+    {
+        if (!this.env.browser_capabilities)
+            this.env.browser_capabilities = {};
 
-    $.each(['pdf', 'flash', 'tiff', 'webp', 'pgpmime'], function() {
-      if (ref.env.browser_capabilities[this] === undefined)
-        ref.env.browser_capabilities[this] = ref[this + '_support_check']();
-    });
-  };
+        $.each(['pdf', 'flash', 'tiff', 'webp', 'pgpmime'], function() {
+            if (ref.env.browser_capabilities[this] === undefined)
+                ref.env.browser_capabilities[this] = ref[this + '_support_check']();
+        });
+    };
 
-  // Returns browser capabilities string
-  this.browser_capabilities = function()
-  {
-    if (!this.env.browser_capabilities)
-      return '';
+    // Returns browser capabilities string
+    this.browser_capabilities = function()
+    {
+        if (!this.env.browser_capabilities)
+            return '';
 
-    var n, ret = [];
+        var n, ret = [];
 
-    for (n in this.env.browser_capabilities)
-      ret.push(n + '=' + this.env.browser_capabilities[n]);
+        for (n in this.env.browser_capabilities)
+            ret.push(n + '=' + this.env.browser_capabilities[n]);
 
-    return ret.join();
-  };
+        return ret.join();
+    };
 
-  this.tiff_support_check = function()
-  {
-    this.image_support_check('tiff');
-    return 0;
-  };
+    this.tiff_support_check = function()
+    {
+        this.image_support_check('tiff');
+        return 0;
+    };
 
-  this.webp_support_check = function()
-  {
-    this.image_support_check('webp');
-    return 0;
-  };
+    this.webp_support_check = function()
+    {
+        this.image_support_check('webp');
+        return 0;
+    };
 
-  this.image_support_check = function(type)
-  {
-    setTimeout(function() {
-      var img = new Image();
-      img.onload = function() { ref.env.browser_capabilities[type] = 1; };
-      img.onerror = function() { ref.env.browser_capabilities[type] = 0; };
-      img.src = ref.assets_path('program/resources/blank.' + type);
-    }, 10);
-  };
+    this.image_support_check = function(type)
+    {
+        setTimeout(function() {
+            var img = new Image();
+            img.onload = function() { ref.env.browser_capabilities[type] = 1; };
+            img.onerror = function() { ref.env.browser_capabilities[type] = 0; };
+            img.src = ref.assets_path('program/resources/blank.' + type);
+        }, 10);
+    };
 
-  this.pdf_support_check = function()
-  {
-    if ('pdfViewerEnabled' in navigator)
-      return navigator.pdfViewerEnabled ? 1 : 0;
+    this.pdf_support_check = function()
+    {
+        if ('pdfViewerEnabled' in navigator)
+            return navigator.pdfViewerEnabled ? 1 : 0;
 
-    var i, plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
-      regex = /Adobe Reader|PDF|Acrobat/i;
+        var i, plugin = navigator.mimeTypes ? navigator.mimeTypes["application/pdf"] : {},
+            regex = /Adobe Reader|PDF|Acrobat/i;
 
-    if (plugin && plugin.enabledPlugin)
-        return 1;
+        if (plugin && plugin.enabledPlugin)
+            return 1;
 
-    for (i in navigator.plugins) {
-      plugin = navigator.plugins[i];
-      if (typeof plugin === 'string') {
-        if (regex.test(plugin))
-          return 1;
-      }
-      else if (plugin.name && regex.test(plugin.name))
-        return 1;
-    }
+        for (i in navigator.plugins) {
+            plugin = navigator.plugins[i];
+            if (typeof plugin === 'string') {
+                if (regex.test(plugin))
+                    return 1;
+            }
+            else if (plugin.name && regex.test(plugin.name))
+                return 1;
+        }
 
-    setTimeout(function() {
-      $('<object>').attr({
-          data: ref.assets_path('program/resources/dummy.pdf'),
-          type: 'application/pdf',
-          style: 'position: "absolute"; top: -1000px; height: 1px; width: 1px'
-        })
-        .on('load error', function(e) {
-          ref.env.browser_capabilities.pdf = e.type == 'load' ? 1 : 0;
+        setTimeout(function() {
+            $('<object>').attr({
+                data: ref.assets_path('program/resources/dummy.pdf'),
+                type: 'application/pdf',
+                style: 'position: "absolute"; top: -1000px; height: 1px; width: 1px'
+            })
+                .on('load error', function(e) {
+                    ref.env.browser_capabilities.pdf = e.type == 'load' ? 1 : 0;
 
-          // add a short delay before attempting to remove element (#8128)
-          var obj = this;
-          setTimeout(function() { $(obj).remove(); }, 10);
-        })
-        .appendTo(document.body);
-      }, 10);
+                    // add a short delay before attempting to remove element (#8128)
+                    var obj = this;
+                    setTimeout(function() { $(obj).remove(); }, 10);
+                })
+                .appendTo(document.body);
+        }, 10);
 
-    return 0;
-  };
+        return 0;
+    };
 
-  this.flash_support_check = function()
-  {
-    var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};
+    this.flash_support_check = function()
+    {
+        var plugin = navigator.mimeTypes ? navigator.mimeTypes["application/x-shockwave-flash"] : {};
 
-    if (plugin && plugin.enabledPlugin)
-        return 1;
+        if (plugin && plugin.enabledPlugin)
+            return 1;
 
-    if ('ActiveXObject' in window) {
-      try {
-        if (plugin = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
-          return 1;
-      }
-      catch (e) {}
-    }
+        if ('ActiveXObject' in window) {
+            try {
+                if (plugin = new ActiveXObject("ShockwaveFlash.ShockwaveFlash"))
+                    return 1;
+            }
+            catch (e) {}
+        }
 
-    return 0;
-  };
+        return 0;
+    };
 
-  // check for mailvelope API
-  this.pgpmime_support_check = function(action)
-  {
-    if (window.mailvelope)
-      return 1;
+    // check for mailvelope API
+    this.pgpmime_support_check = function(action)
+    {
+        if (window.mailvelope)
+            return 1;
 
-    $(window).on('mailvelope', function() {
-      ref.env.browser_capabilities['pgpmime'] = 1;
-    });
+        $(window).on('mailvelope', function() {
+            ref.env.browser_capabilities['pgpmime'] = 1;
+        });
 
-    return 0;
-  };
+        return 0;
+    };
 
-  this.assets_path = function(path)
-  {
-    if (this.env.assets_path && !path.startsWith(this.env.assets_path)) {
-      path = this.env.assets_path + path;
-    }
+    this.assets_path = function(path)
+    {
+        if (this.env.assets_path && !path.startsWith(this.env.assets_path)) {
+            path = this.env.assets_path + path;
+        }
 
-    return path;
-  };
+        return path;
+    };
 
-  // Cookie setter
-  this.set_cookie = function(name, value, expires)
-  {
-    if (expires === false) {
-      var expires = new Date();
-      expires.setYear(expires.getFullYear() + 1);
-    }
+    // Cookie setter
+    this.set_cookie = function(name, value, expires)
+    {
+        if (expires === false) {
+            var expires = new Date();
+            expires.setYear(expires.getFullYear() + 1);
+        }
 
-    setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
-  };
+        setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
+    };
 
-  this.get_local_storage_prefix = function()
-  {
-    if (!this.local_storage_prefix)
-      this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';
+    this.get_local_storage_prefix = function()
+    {
+        if (!this.local_storage_prefix)
+            this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';
 
-    return this.local_storage_prefix;
-  };
+        return this.local_storage_prefix;
+    };
 
-  // wrapper for localStorage.getItem(key)
-  this.local_storage_get_item = function(key, deflt, encrypted)
-  {
-    var item, result;
+    // wrapper for localStorage.getItem(key)
+    this.local_storage_get_item = function(key, deflt, encrypted)
+    {
+        var item, result;
 
-    // TODO: add encryption
-    try {
-      item = localStorage.getItem(this.get_local_storage_prefix() + key);
-      result = JSON.parse(item);
-    }
-    catch (e) { }
+        // TODO: add encryption
+        try {
+            item = localStorage.getItem(this.get_local_storage_prefix() + key);
+            result = JSON.parse(item);
+        }
+        catch (e) { }
 
-    return result || deflt || null;
-  };
+        return result || deflt || null;
+    };
 
-  // wrapper for localStorage.setItem(key, data)
-  this.local_storage_set_item = function(key, data, encrypted)
-  {
+    // wrapper for localStorage.setItem(key, data)
+    this.local_storage_set_item = function(key, data, encrypted)
+    {
     // try/catch to handle no localStorage support, but also error
     // in Safari-in-private-browsing-mode where localStorage exists
     // but can't be used (#1489996)
-    try {
-      // TODO: add encryption
-      localStorage.setItem(this.get_local_storage_prefix() + key, JSON.stringify(data));
-      return true;
-    }
-    catch (e) {
-      return false;
-    }
-  };
+        try {
+            // TODO: add encryption
+            localStorage.setItem(this.get_local_storage_prefix() + key, JSON.stringify(data));
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    };
 
-  // wrapper for localStorage.removeItem(key)
-  this.local_storage_remove_item = function(key)
-  {
-    try {
-      localStorage.removeItem(this.get_local_storage_prefix() + key);
-      return true;
-    }
-    catch (e) {
-      return false;
-    }
-  };
+    // wrapper for localStorage.removeItem(key)
+    this.local_storage_remove_item = function(key)
+    {
+        try {
+            localStorage.removeItem(this.get_local_storage_prefix() + key);
+            return true;
+        }
+        catch (e) {
+            return false;
+        }
+    };
 
-  this.print_dialog = function()
-  {
+    this.print_dialog = function()
+    {
     // setTimeout for Safari
-    setTimeout('window.print()', 10);
-  };
+        setTimeout('window.print()', 10);
+    };
 }  // end object rcube_webmail
 
 
 // some static methods
 rcube_webmail.long_subject_title = function(elem, indent, text_elem)
 {
-  if (!elem.title) {
-    var $elem = $(text_elem || elem);
-    if ($elem.width() + (indent || 0) * 15 > $elem.parent().width())
-      elem.title = rcube_webmail.subject_text($elem[0]);
-  }
+    if (!elem.title) {
+        var $elem = $(text_elem || elem);
+        if ($elem.width() + (indent || 0) * 15 > $elem.parent().width())
+            elem.title = rcube_webmail.subject_text($elem[0]);
+    }
 };
 
 rcube_webmail.long_subject_title_ex = function(elem)
 {
-  if (!elem.title) {
-    var $elem = $(elem),
-      txt = $elem.text().trim(),
-      indent = $('span.branch', $elem).width() || 0,
-      tmp = $('<span>').text(txt)
-        .css({position: 'absolute', 'float': 'left', visibility: 'hidden',
-          'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
-        .appendTo(document.body),
-      w = tmp.width();
+    if (!elem.title) {
+        var $elem = $(elem),
+            txt = $elem.text().trim(),
+            indent = $('span.branch', $elem).width() || 0,
+            tmp = $('<span>').text(txt)
+                .css({position: 'absolute', 'float': 'left', visibility: 'hidden',
+                    'font-size': $elem.css('font-size'), 'font-weight': $elem.css('font-weight')})
+                .appendTo(document.body),
+            w = tmp.width();
 
-    tmp.remove();
-    if (w + indent * 15 > $elem.width())
-      elem.title = rcube_webmail.subject_text(elem);
-  }
+        tmp.remove();
+        if (w + indent * 15 > $elem.width())
+            elem.title = rcube_webmail.subject_text(elem);
+    }
 };
 
 rcube_webmail.subject_text = function(elem)
 {
-  var t = $(elem).clone();
-  t.find('.skip-on-drag,.skip-content,.voice').remove();
-  return t.text().trim();
+    var t = $(elem).clone();
+    t.find('.skip-on-drag,.skip-content,.voice').remove();
+    return t.text().trim();
 };
 
 // set event handlers on all iframe elements (and their contents)
 rcube_webmail.set_iframe_events = function(events)
 {
-  $('iframe').each(function() {
-    var frame = $(this);
-    $.each(events, function(event_name, event_handler) {
-      frame.on('load', function(e) {
-        try { $(this).contents().on(event_name, event_handler); }
-        catch (e) {/* catch possible permission error in IE */ }
-      });
+    $('iframe').each(function() {
+        var frame = $(this);
+        $.each(events, function(event_name, event_handler) {
+            frame.on('load', function(e) {
+                try { $(this).contents().on(event_name, event_handler); }
+                catch (e) {/* catch possible permission error in IE */ }
+            });
 
-      try { frame.contents().on(event_name, event_handler); }
-      catch (e) {/* catch possible permission error in IE */ }
+            try { frame.contents().on(event_name, event_handler); }
+            catch (e) {/* catch possible permission error in IE */ }
+        });
     });
-  });
 };
 
 rcube_webmail.prototype.get_cookie = getCookie;
diff --git a/program/js/common.js b/program/js/common.js
index 5384d84b5..7c58d6ed0 100644
--- a/program/js/common.js
+++ b/program/js/common.js
@@ -37,284 +37,284 @@ var CONTROL_SHIFT_KEY = 3;
  */
 function roundcube_browser()
 {
-  var n = navigator;
+    var n = navigator;
 
-  this.agent = n.userAgent;
-  this.agent_lc = n.userAgent.toLowerCase();
-  this.name = n.appName;
-  this.vendor = n.vendor ? n.vendor : '';
-  this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0;
-  this.product = n.product ? n.product : '';
-  this.platform = String(n.platform).toLowerCase();
-  this.lang = n.language ? n.language.substring(0,2) :
-              n.browserLanguage ? n.browserLanguage.substring(0,2) :
-              n.systemLanguage ? n.systemLanguage.substring(0,2) : 'en';
+    this.agent = n.userAgent;
+    this.agent_lc = n.userAgent.toLowerCase();
+    this.name = n.appName;
+    this.vendor = n.vendor ? n.vendor : '';
+    this.vendver = n.vendorSub ? parseFloat(n.vendorSub) : 0;
+    this.product = n.product ? n.product : '';
+    this.platform = String(n.platform).toLowerCase();
+    this.lang = n.language ? n.language.substring(0, 2) :
+        n.browserLanguage ? n.browserLanguage.substring(0, 2) :
+            n.systemLanguage ? n.systemLanguage.substring(0, 2) : 'en';
 
-  this.win = this.platform.indexOf('win') >= 0;
-  this.mac = this.platform.indexOf('mac') >= 0;
-  this.linux = this.platform.indexOf('linux') >= 0;
-  this.unix = this.platform.indexOf('unix') >= 0;
+    this.win = this.platform.indexOf('win') >= 0;
+    this.mac = this.platform.indexOf('mac') >= 0;
+    this.linux = this.platform.indexOf('linux') >= 0;
+    this.unix = this.platform.indexOf('unix') >= 0;
 
-  this.dom = document.getElementById ? true : false;
-  this.dom2 = document.addEventListener && document.removeEventListener;
+    this.dom = document.getElementById ? true : false;
+    this.dom2 = document.addEventListener && document.removeEventListener;
 
-  this.edge = this.agent_lc.indexOf(' edge/') > 0 || this.agent_lc.indexOf(' edg/') > 0; // "edg" in Chromium based Edge
-  this.webkit = !this.edge && this.agent_lc.indexOf('applewebkit') > 0;
-  this.ie = (document.all && !window.opera) || (this.win && this.agent_lc.indexOf('trident/') > 0);
+    this.edge = this.agent_lc.indexOf(' edge/') > 0 || this.agent_lc.indexOf(' edg/') > 0; // "edg" in Chromium based Edge
+    this.webkit = !this.edge && this.agent_lc.indexOf('applewebkit') > 0;
+    this.ie = (document.all && !window.opera) || (this.win && this.agent_lc.indexOf('trident/') > 0);
 
-  if (window.opera) {
-    this.opera = true; // Opera < 15
-    this.vendver = opera.version();
-  }
-  else if (!this.ie && !this.edge) {
-    this.chrome = this.agent_lc.indexOf('chrome') > 0;
-    this.opera = this.webkit && this.agent.indexOf(' OPR/') > 0; // Opera >= 15
-    this.safari = !this.chrome && !this.opera && (this.webkit || this.agent_lc.indexOf('safari') > 0);
-    this.konq = this.agent_lc.indexOf('konqueror') > 0;
-    this.mz = this.dom && !this.chrome && !this.safari && !this.konq && !this.opera && this.agent.indexOf('Mozilla') >= 0;
-    this.iphone = this.safari && (this.agent_lc.indexOf('iphone') > 0 || this.agent_lc.indexOf('ipod') > 0 || this.platform == 'ipod' || this.platform == 'iphone');
-    this.ipad = this.safari && (this.agent_lc.indexOf('ipad') > 0 || this.platform == 'ipad');
-  }
+    if (window.opera) {
+        this.opera = true; // Opera < 15
+        this.vendver = opera.version();
+    }
+    else if (!this.ie && !this.edge) {
+        this.chrome = this.agent_lc.indexOf('chrome') > 0;
+        this.opera = this.webkit && this.agent.indexOf(' OPR/') > 0; // Opera >= 15
+        this.safari = !this.chrome && !this.opera && (this.webkit || this.agent_lc.indexOf('safari') > 0);
+        this.konq = this.agent_lc.indexOf('konqueror') > 0;
+        this.mz = this.dom && !this.chrome && !this.safari && !this.konq && !this.opera && this.agent.indexOf('Mozilla') >= 0;
+        this.iphone = this.safari && (this.agent_lc.indexOf('iphone') > 0 || this.agent_lc.indexOf('ipod') > 0 || this.platform == 'ipod' || this.platform == 'iphone');
+        this.ipad = this.safari && (this.agent_lc.indexOf('ipad') > 0 || this.platform == 'ipad');
+    }
 
-  if (!this.vendver) {
-    if (this.ie)
-      pattern = /(msie|rv)(\s|:)([0-9\.]+)/;
-    else if (this.edge)
-      pattern = /(edge?)(\/)([0-9\.]+)/;
-    else if (this.opera)
-      pattern = /(opera|opr)(\/)([0-9\.]+)/;
-    else if (this.konq)
-      pattern = /(konqueror)(\/)([0-9\.]+)/;
-    else if (this.safari)
-      pattern = /(version)(\/)([0-9\.]+)/;
-    else if (this.chrome)
-      pattern = /(chrome)(\/)([0-9\.]+)/;
-    else if (this.mz)
-      pattern = /(firefox)(\/)([0-9\.]+)/;
-    else
-      pattern = /(khtml|safari|applewebkit|rv)(\s|\/|:)([0-9\.]+)/;
+    if (!this.vendver) {
+        if (this.ie)
+            pattern = /(msie|rv)(\s|:)([0-9\.]+)/;
+        else if (this.edge)
+            pattern = /(edge?)(\/)([0-9\.]+)/;
+        else if (this.opera)
+            pattern = /(opera|opr)(\/)([0-9\.]+)/;
+        else if (this.konq)
+            pattern = /(konqueror)(\/)([0-9\.]+)/;
+        else if (this.safari)
+            pattern = /(version)(\/)([0-9\.]+)/;
+        else if (this.chrome)
+            pattern = /(chrome)(\/)([0-9\.]+)/;
+        else if (this.mz)
+            pattern = /(firefox)(\/)([0-9\.]+)/;
+        else
+            pattern = /(khtml|safari|applewebkit|rv)(\s|\/|:)([0-9\.]+)/;
 
-    // common version strings
-    this.vendver = pattern.test(this.agent_lc) ? parseFloat(RegExp.$3) : 0;
-  }
+        // common version strings
+        this.vendver = pattern.test(this.agent_lc) ? parseFloat(RegExp.$3) : 0;
+    }
 
-  // get real language out of safari's user agent
-  if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
-    this.lang = RegExp.$1;
+    // get real language out of safari's user agent
+    if (this.safari && (/;\s+([a-z]{2})-[a-z]{2}\)/.test(this.agent_lc)))
+        this.lang = RegExp.$1;
 
-  this.mobile = /iphone|ipod|blackberry|iemobile|opera mini|opera mobi|mobile/i.test(this.agent_lc);
-  this.tablet = !this.mobile && /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc);
-  this.touch = this.mobile || this.tablet;
-  this.pointer = typeof window.PointerEvent == "function";
-  this.cookies = n.cookieEnabled;
+    this.mobile = /iphone|ipod|blackberry|iemobile|opera mini|opera mobi|mobile/i.test(this.agent_lc);
+    this.tablet = !this.mobile && /ipad|android|xoom|sch-i800|playbook|tablet|kindle/i.test(this.agent_lc);
+    this.touch = this.mobile || this.tablet;
+    this.pointer = typeof window.PointerEvent == "function";
+    this.cookies = n.cookieEnabled;
 
-  // set class names to html tag according to the current user agent detection
-  // this allows browser-specific css selectors like "html.chrome .someclass"
-  this.set_html_class = function()
-  {
-    var classname = ' js';
+    // set class names to html tag according to the current user agent detection
+    // this allows browser-specific css selectors like "html.chrome .someclass"
+    this.set_html_class = function()
+    {
+        var classname = ' js';
 
-    if (this.ie)
-      classname += ' ms ie ie'+parseInt(this.vendver);
-    else if (this.edge && this.vendver > 74)
-      classname += ' chrome';
-    else if (this.edge)
-      classname += ' ms edge';
-    else if (this.opera)
-      classname += ' opera';
-    else if (this.konq)
-      classname += ' konqueror';
-    else if (this.safari)
-      classname += ' chrome';
-    else if (this.chrome)
-      classname += ' chrome';
-    else if (this.mz)
-      classname += ' mozilla';
+        if (this.ie)
+            classname += ' ms ie ie'+parseInt(this.vendver);
+        else if (this.edge && this.vendver > 74)
+            classname += ' chrome';
+        else if (this.edge)
+            classname += ' ms edge';
+        else if (this.opera)
+            classname += ' opera';
+        else if (this.konq)
+            classname += ' konqueror';
+        else if (this.safari)
+            classname += ' chrome';
+        else if (this.chrome)
+            classname += ' chrome';
+        else if (this.mz)
+            classname += ' mozilla';
 
-    if (this.iphone)
-      classname += ' iphone';
-    else if (this.ipad)
-      classname += ' ipad';
-    else if (this.webkit)
-      classname += ' webkit';
+        if (this.iphone)
+            classname += ' iphone';
+        else if (this.ipad)
+            classname += ' ipad';
+        else if (this.webkit)
+            classname += ' webkit';
 
-    if (this.mobile)
-      classname += ' mobile';
-    if (this.tablet)
-      classname += ' tablet';
+        if (this.mobile)
+            classname += ' mobile';
+        if (this.tablet)
+            classname += ' tablet';
 
-    if (document.documentElement)
-      document.documentElement.className += classname;
-  };
+        if (document.documentElement)
+            document.documentElement.className += classname;
+    };
 };
 
 
 // static functions for DOM event handling
 var rcube_event = {
 
-/**
+    /**
  * returns the event target element
  */
-get_target: function(e)
-{
-  e = e || window.event;
-  return e && e.target ? e.target : e.srcElement || document;
-},
+    get_target: function(e)
+    {
+        e = e || window.event;
+        return e && e.target ? e.target : e.srcElement || document;
+    },
 
-/**
+    /**
  * returns the event key code
  */
-get_keycode: function(e)
-{
-  e = e || window.event;
-  return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
-},
+    get_keycode: function(e)
+    {
+        e = e || window.event;
+        return e && e.keyCode ? e.keyCode : (e && e.which ? e.which : 0);
+    },
 
-/**
+    /**
  * returns the event key code
  */
-get_button: function(e)
-{
-  e = e || window.event;
-  return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0);
-},
+    get_button: function(e)
+    {
+        e = e || window.event;
+        return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0);
+    },
 
-/**
+    /**
  * returns modifier key (constants defined at top of file)
  */
-get_modifier: function(e)
-{
-  var opcode = 0;
-  e = e || window.event;
+    get_modifier: function(e)
+    {
+        var opcode = 0;
+        e = e || window.event;
 
-  if (bw.mac && e)
-    opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
-  else if (e)
-    opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
+        if (bw.mac && e)
+            opcode += (e.metaKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
+        else if (e)
+            opcode += (e.ctrlKey && CONTROL_KEY) + (e.shiftKey && SHIFT_KEY);
 
-  return opcode;
-},
+        return opcode;
+    },
 
-/**
+    /**
  * Return absolute mouse position of an event
  */
-get_mouse_pos: function(e)
-{
-  if (!e) e = window.event;
-  var mX = (e.pageX) ? e.pageX : e.clientX,
-    mY = (e.pageY) ? e.pageY : e.clientY;
+    get_mouse_pos: function(e)
+    {
+        if (!e) e = window.event;
+        var mX = (e.pageX) ? e.pageX : e.clientX,
+            mY = (e.pageY) ? e.pageY : e.clientY;
 
-  if (document.body && document.all) {
-    mX += document.body.scrollLeft;
-    mY += document.body.scrollTop;
-  }
+        if (document.body && document.all) {
+            mX += document.body.scrollLeft;
+            mY += document.body.scrollTop;
+        }
 
-  if (e._offset) {
-    mX += e._offset.left;
-    mY += e._offset.top;
-  }
+        if (e._offset) {
+            mX += e._offset.left;
+            mY += e._offset.top;
+        }
 
-  return { x:mX, y:mY };
-},
+        return { x:mX, y:mY };
+    },
 
-/**
+    /**
  * Add an object method as event listener to a certain element
  */
-add_listener: function(p)
-{
-  if (!p.object || !p.method)  // not enough arguments
-    return;
-  if (!p.element)
-    p.element = document;
+    add_listener: function(p)
+    {
+        if (!p.object || !p.method)  // not enough arguments
+            return;
+        if (!p.element)
+            p.element = document;
 
-  if (!p.object._rc_events)
-    p.object._rc_events = {};
+        if (!p.object._rc_events)
+            p.object._rc_events = {};
 
-  var key = p.event + '*' + p.method;
-  if (!p.object._rc_events[key])
-    p.object._rc_events[key] = function(e){ return p.object[p.method](e); };
+        var key = p.event + '*' + p.method;
+        if (!p.object._rc_events[key])
+            p.object._rc_events[key] = function(e){ return p.object[p.method](e); };
 
-  if (p.element.addEventListener)
-    p.element.addEventListener(p.event, p.object._rc_events[key], false);
-  else if (p.element.attachEvent) {
-    // IE allows multiple events with the same function to be applied to the same object
-    // forcibly detach the event, then attach
-    p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
-    p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
-  }
-  else
-    p.element['on'+p.event] = p.object._rc_events[key];
-},
+        if (p.element.addEventListener)
+            p.element.addEventListener(p.event, p.object._rc_events[key], false);
+        else if (p.element.attachEvent) {
+            // IE allows multiple events with the same function to be applied to the same object
+            // forcibly detach the event, then attach
+            p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
+            p.element.attachEvent('on'+p.event, p.object._rc_events[key]);
+        }
+        else
+            p.element['on'+p.event] = p.object._rc_events[key];
+    },
 
-/**
+    /**
  * Remove event listener
  */
-remove_listener: function(p)
-{
-  if (!p.element)
-    p.element = document;
+    remove_listener: function(p)
+    {
+        if (!p.element)
+            p.element = document;
 
-  var key = p.event + '*' + p.method;
-  if (p.object && p.object._rc_events && p.object._rc_events[key]) {
-    if (p.element.removeEventListener)
-      p.element.removeEventListener(p.event, p.object._rc_events[key], false);
-    else if (p.element.detachEvent)
-      p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
-    else
-      p.element['on'+p.event] = null;
-  }
-},
+        var key = p.event + '*' + p.method;
+        if (p.object && p.object._rc_events && p.object._rc_events[key]) {
+            if (p.element.removeEventListener)
+                p.element.removeEventListener(p.event, p.object._rc_events[key], false);
+            else if (p.element.detachEvent)
+                p.element.detachEvent('on'+p.event, p.object._rc_events[key]);
+            else
+                p.element['on'+p.event] = null;
+        }
+    },
 
-/**
+    /**
  * Prevent event propagation and bubbling
  */
-cancel: function(evt)
-{
-  var e = evt ? evt : window.event;
+    cancel: function(evt)
+    {
+        var e = evt ? evt : window.event;
 
-  if (e.preventDefault)
-    e.preventDefault();
-  else
-    e.returnValue = false;
+        if (e.preventDefault)
+            e.preventDefault();
+        else
+            e.returnValue = false;
 
-  if (e.stopPropagation)
-    e.stopPropagation();
+        if (e.stopPropagation)
+            e.stopPropagation();
 
-  e.cancelBubble = true;
+        e.cancelBubble = true;
 
-  return false;
-},
+        return false;
+    },
 
-/**
+    /**
  * Determine whether the given event was triggered from keyboard
  */
-is_keyboard: function(e)
-{
-  if (!e)
-    return false;
+    is_keyboard: function(e)
+    {
+        if (!e)
+            return false;
 
-  // DOM3-compatible
-  // An event invoked by pressing Enter on a link will produce a 'click' event,
-  // so we have to extend the check, e.g. with use of e.clientX.
-  if (e.type)
-    return !!e.type.match(/^key/) || (e.type == 'click' && !e.clientX);
+        // DOM3-compatible
+        // An event invoked by pressing Enter on a link will produce a 'click' event,
+        // so we have to extend the check, e.g. with use of e.clientX.
+        if (e.type)
+            return !!e.type.match(/^key/) || (e.type == 'click' && !e.clientX);
 
-  // Old browsers
-  return !e.pageX && (e.pageY || 0) <= 0 && !e.clientX && (e.clientY || 0) <= 0;
-},
+        // Old browsers
+        return !e.pageX && (e.pageY || 0) <= 0 && !e.clientX && (e.clientY || 0) <= 0;
+    },
 
-/**
+    /**
  * Accept event if triggered from keyboard action (e.g. <Enter>)
  */
-keyboard_only: function(e)
-{
-  return rcube_event.is_keyboard(e) ? true : rcube_event.cancel(e);
-},
+    keyboard_only: function(e)
+    {
+        return rcube_event.is_keyboard(e) ? true : rcube_event.cancel(e);
+    },
 
-touchevent: function(e)
-{
-  return { pageX:e.pageX, pageY:e.pageY, offsetX:e.pageX - e.target.offsetLeft, offsetY:e.pageY - e.target.offsetTop, target:e.target, istouch:true };
-}
+    touchevent: function(e)
+    {
+        return { pageX:e.pageX, pageY:e.pageY, offsetX:e.pageX - e.target.offsetLeft, offsetY:e.pageY - e.target.offsetTop, target:e.target, istouch:true };
+    }
 
 };
 
@@ -324,88 +324,88 @@ touchevent: function(e)
  */
 function rcube_event_engine()
 {
-  this._events = {};
+    this._events = {};
 };
 
 rcube_event_engine.prototype = {
 
-/**
+    /**
  * Setter for object event handlers
  *
  * @param {String}   Event name
  * @param {Function} Handler function
  */
-addEventListener: function(evt, func, obj)
-{
-  if (!this._events)
-    this._events = {};
-  if (!this._events[evt])
-    this._events[evt] = [];
+    addEventListener: function(evt, func, obj)
+    {
+        if (!this._events)
+            this._events = {};
+        if (!this._events[evt])
+            this._events[evt] = [];
 
-  this._events[evt].push({func:func, obj:obj ? obj : window});
+        this._events[evt].push({func:func, obj:obj ? obj : window});
 
-  return this; // chainable
-},
+        return this; // chainable
+    },
 
-/**
+    /**
  * Removes a specific event listener
  *
  * @param {String} Event name
  * @param {Int}    Listener ID to remove
  */
-removeEventListener: function(evt, func, obj)
-{
-  if (obj === undefined)
-    obj = window;
+    removeEventListener: function(evt, func, obj)
+    {
+        if (obj === undefined)
+            obj = window;
 
-  for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
-    if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
-      this._events[evt][i] = null;
-},
+        for (var h, i=0; this._events && this._events[evt] && i < this._events[evt].length; i++)
+            if ((h = this._events[evt][i]) && h.func == func && h.obj == obj)
+                this._events[evt][i] = null;
+    },
 
-/**
+    /**
  * This will execute all registered event handlers
  *
  * @param {String} Event to trigger
  * @param {Object} Event object/arguments
  */
-triggerEvent: function(evt, e)
-{
-  var ret, h,
-    reset_fn = function(o) {
-      try { if (o && o.event) delete o.event; } catch(err) { };
-    };
+    triggerEvent: function(evt, e)
+    {
+        var ret, h,
+            reset_fn = function(o) {
+                try { if (o && o.event) delete o.event; } catch(err) { };
+            };
 
-  if (e === undefined)
-    e = this;
-  else if (typeof e === 'object')
-    e.event = evt;
+        if (e === undefined)
+            e = this;
+        else if (typeof e === 'object')
+            e.event = evt;
 
-  if (!this._event_exec)
-    this._event_exec = {};
+        if (!this._event_exec)
+            this._event_exec = {};
 
-  if (this._events && this._events[evt] && !this._event_exec[evt]) {
-    this._event_exec[evt] = true;
-    for (var i=0; i < this._events[evt].length; i++) {
-      if ((h = this._events[evt][i])) {
-        if (typeof h.func === 'function')
-          ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
-        else if (typeof h.obj[h.func] === 'function')
-          ret = h.obj[h.func](e);
+        if (this._events && this._events[evt] && !this._event_exec[evt]) {
+            this._event_exec[evt] = true;
+            for (var i=0; i < this._events[evt].length; i++) {
+                if ((h = this._events[evt][i])) {
+                    if (typeof h.func === 'function')
+                        ret = h.func.call ? h.func.call(h.obj, e) : h.func(e);
+                    else if (typeof h.obj[h.func] === 'function')
+                        ret = h.obj[h.func](e);
 
-        // cancel event execution
-        if (ret !== undefined && !ret)
-          break;
-      }
+                    // cancel event execution
+                    if (ret !== undefined && !ret)
+                        break;
+                }
+            }
+            reset_fn(ret);
+        }
+
+        delete this._event_exec[evt];
+        reset_fn(e);
+
+        return ret;
     }
-    reset_fn(ret);
-  }
-
-  delete this._event_exec[evt];
-  reset_fn(e);
-
-  return ret;
-}
 
 };  // end rcube_event_engine.prototype
 
@@ -415,129 +415,129 @@ triggerEvent: function(evt, e)
 // http://code.iamcal.com/php/rfc822/
 function rcube_check_email(input, inline, count, strict)
 {
-  if (!input)
-    return count ? 0 : false;
+    if (!input)
+        return count ? 0 : false;
 
-  if (count) inline = true;
+    if (count) inline = true;
 
-  var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]',
-      dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]',
-      atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+',
-      quoted_pair = '\\x5c[\\x00-\\x7f]',
-      quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
-      ipv4 = '\\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\\]',
-      ipv6 = '\\[IPv6:[0-9a-f:.]+\\]',
-      ip_addr = '(' + ipv4 + ')|(' + ipv6 + ')',
-      // Use simplified domain matching, because we need to allow Unicode characters here
-      // So, e-mail address should be validated also on server side after idn_to_ascii()
-      // Allow punycode/unicode top-level domains, allow extended domains (#5588)
-      // Allow a domain ending with .s (#8854)
-      domain = '(('+ip_addr+')|(([^@.]+\\.)+([^\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|s|xn--[a-z0-9]{2,})))',
-      // ICANN e-mail test (http://idn.icann.org/E-mail_test)
-      icann_domains = [
-        '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631',
-        '\\u4f8b\\u5b50\\x2e\\u6d4b\\u8bd5',
-        '\\u4f8b\\u5b50\\x2e\\u6e2c\\u8a66',
-        '\\u03c0\\u03b1\\u03c1\\u03ac\\u03b4\\u03b5\\u03b9\\u03b3\\u03bc\\u03b1\\x2e\\u03b4\\u03bf\\u03ba\\u03b9\\u03bc\\u03ae',
-        '\\u0909\\u0926\\u093e\\u0939\\u0930\\u0923\\x2e\\u092a\\u0930\\u0940\\u0915\\u094d\\u0937\\u093e',
-        '\\u4f8b\\u3048\\x2e\\u30c6\\u30b9\\u30c8',
-        '\\uc2e4\\ub840\\x2e\\ud14c\\uc2a4\\ud2b8',
-        '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0622\\u0632\\u0645\\u0627\\u06cc\\u0634\\u06cc',
-        '\\u043f\\u0440\\u0438\\u043c\\u0435\\u0440\\x2e\\u0438\\u0441\\u043f\\u044b\\u0442\\u0430\\u043d\\u0438\\u0435',
-        '\\u0b89\\u0ba4\\u0bbe\\u0bb0\\u0ba3\\u0bae\\u0bcd\\x2e\\u0baa\\u0bb0\\u0bbf\\u0b9f\\u0bcd\\u0b9a\\u0bc8',
-        '\\u05d1\\u05f2\\u05b7\\u05e9\\u05e4\\u05bc\\u05d9\\u05dc\\x2e\\u05d8\\u05e2\\u05e1\\u05d8'
-      ],
-      icann_addr = 'mailtest\\x40('+icann_domains.join('|')+')',
-      word = strict ? '('+atom+'|'+quoted_string+')' : '[^\\u0000-\\u0020\\u002e\\u00a0\\u0040\\u007f\\u2028\\u2029]+',
-      delim = '[,;\\s\\n]',
-      local_part = word+'(\\x2e'+word+')*',
-      addr_spec = '(('+local_part+'\\x40'+domain+')|('+icann_addr+'))',
-      rx_flag = count ? 'ig' : 'i',
-      rx = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', rx_flag) : new RegExp('^'+addr_spec+'$', 'i');
+    var qtext = '[^\\x0d\\x22\\x5c\\x80-\\xff]',
+        dtext = '[^\\x0d\\x5b-\\x5d\\x80-\\xff]',
+        atom = '[^\\x00-\\x20\\x22\\x28\\x29\\x2c\\x2e\\x3a-\\x3c\\x3e\\x40\\x5b-\\x5d\\x7f-\\xff]+',
+        quoted_pair = '\\x5c[\\x00-\\x7f]',
+        quoted_string = '\\x22('+qtext+'|'+quoted_pair+')*\\x22',
+        ipv4 = '\\[(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\\.(25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])){3}\\]',
+        ipv6 = '\\[IPv6:[0-9a-f:.]+\\]',
+        ip_addr = '(' + ipv4 + ')|(' + ipv6 + ')',
+        // Use simplified domain matching, because we need to allow Unicode characters here
+        // So, e-mail address should be validated also on server side after idn_to_ascii()
+        // Allow punycode/unicode top-level domains, allow extended domains (#5588)
+        // Allow a domain ending with .s (#8854)
+        domain = '(('+ip_addr+')|(([^@.]+\\.)+([^\\x00-\\x2f\\x3a-\\x40\\x5b-\\x60\\x7b-\\x7f]{2,}|s|xn--[a-z0-9]{2,})))',
+        // ICANN e-mail test (http://idn.icann.org/E-mail_test)
+        icann_domains = [
+            '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0625\\u062e\\u062a\\u0628\\u0627\\u0631',
+            '\\u4f8b\\u5b50\\x2e\\u6d4b\\u8bd5',
+            '\\u4f8b\\u5b50\\x2e\\u6e2c\\u8a66',
+            '\\u03c0\\u03b1\\u03c1\\u03ac\\u03b4\\u03b5\\u03b9\\u03b3\\u03bc\\u03b1\\x2e\\u03b4\\u03bf\\u03ba\\u03b9\\u03bc\\u03ae',
+            '\\u0909\\u0926\\u093e\\u0939\\u0930\\u0923\\x2e\\u092a\\u0930\\u0940\\u0915\\u094d\\u0937\\u093e',
+            '\\u4f8b\\u3048\\x2e\\u30c6\\u30b9\\u30c8',
+            '\\uc2e4\\ub840\\x2e\\ud14c\\uc2a4\\ud2b8',
+            '\\u0645\\u062b\\u0627\\u0644\\x2e\\u0622\\u0632\\u0645\\u0627\\u06cc\\u0634\\u06cc',
+            '\\u043f\\u0440\\u0438\\u043c\\u0435\\u0440\\x2e\\u0438\\u0441\\u043f\\u044b\\u0442\\u0430\\u043d\\u0438\\u0435',
+            '\\u0b89\\u0ba4\\u0bbe\\u0bb0\\u0ba3\\u0bae\\u0bcd\\x2e\\u0baa\\u0bb0\\u0bbf\\u0b9f\\u0bcd\\u0b9a\\u0bc8',
+            '\\u05d1\\u05f2\\u05b7\\u05e9\\u05e4\\u05bc\\u05d9\\u05dc\\x2e\\u05d8\\u05e2\\u05e1\\u05d8'
+        ],
+        icann_addr = 'mailtest\\x40('+icann_domains.join('|')+')',
+        word = strict ? '('+atom+'|'+quoted_string+')' : '[^\\u0000-\\u0020\\u002e\\u00a0\\u0040\\u007f\\u2028\\u2029]+',
+        delim = '[,;\\s\\n]',
+        local_part = word+'(\\x2e'+word+')*',
+        addr_spec = '(('+local_part+'\\x40'+domain+')|('+icann_addr+'))',
+        rx_flag = count ? 'ig' : 'i',
+        rx = inline ? new RegExp('(^|<|'+delim+')'+addr_spec+'($|>|'+delim+')', rx_flag) : new RegExp('^'+addr_spec+'$', 'i');
 
-  if (count) {
-    var re = input.match(rx);
-    return re ? re.length : 0;
-  }
+    if (count) {
+        var re = input.match(rx);
+        return re ? re.length : 0;
+    }
 
-  return rx.test(input);
+    return rx.test(input);
 };
 
 // recursively copy an object
 function rcube_clone_object(obj)
 {
-  var out = {};
+    var out = {};
 
-  for (var key in obj) {
-    if (obj[key] && typeof obj[key] === 'object')
-      out[key] = rcube_clone_object(obj[key]);
-    else
-      out[key] = obj[key];
-  }
+    for (var key in obj) {
+        if (obj[key] && typeof obj[key] === 'object')
+            out[key] = rcube_clone_object(obj[key]);
+        else
+            out[key] = obj[key];
+    }
 
-  return out;
+    return out;
 };
 
 // make a string URL safe (and compatible with PHP's rawurlencode())
 function urlencode(str)
 {
-  if (window.encodeURIComponent)
-    return encodeURIComponent(str).replace('*', '%2A');
+    if (window.encodeURIComponent)
+        return encodeURIComponent(str).replace('*', '%2A');
 
-  return escape(str)
-    .replace('+', '%2B')
-    .replace('*', '%2A')
-    .replace('/', '%2F')
-    .replace('@', '%40');
+    return escape(str)
+        .replace('+', '%2B')
+        .replace('*', '%2A')
+        .replace('/', '%2F')
+        .replace('@', '%40');
 };
 
 
 // get any type of html objects by id/name
 function rcube_find_object(id, d)
 {
-  var n, f, obj, e;
+    var n, f, obj, e;
 
-  if (!d) d = document;
+    if (!d) d = document;
 
-  if (d.getElementById)
-    if (obj = d.getElementById(id))
-      return obj;
+    if (d.getElementById)
+        if (obj = d.getElementById(id))
+            return obj;
 
-  if (!obj && d.getElementsByName && (e = d.getElementsByName(id)))
-    obj = e[0];
+    if (!obj && d.getElementsByName && (e = d.getElementsByName(id)))
+        obj = e[0];
 
-  if (!obj && d.all)
-    obj = d.all[id];
+    if (!obj && d.all)
+        obj = d.all[id];
 
-  if (!obj && d.images.length)
-    obj = d.images[id];
+    if (!obj && d.images.length)
+        obj = d.images[id];
 
-  if (!obj && d.forms.length) {
-    for (f=0; f<d.forms.length; f++) {
-      if (d.forms[f].name == id)
-        obj = d.forms[f];
-      else if(d.forms[f].elements[id])
-        obj = d.forms[f].elements[id];
+    if (!obj && d.forms.length) {
+        for (f=0; f<d.forms.length; f++) {
+            if (d.forms[f].name == id)
+                obj = d.forms[f];
+            else if(d.forms[f].elements[id])
+                obj = d.forms[f].elements[id];
+        }
     }
-  }
 
-  if (!obj && d.layers) {
-    if (d.layers[id])
-      obj = d.layers[id];
-    for (n=0; !obj && n<d.layers.length; n++)
-      obj = rcube_find_object(id, d.layers[n].document);
-  }
+    if (!obj && d.layers) {
+        if (d.layers[id])
+            obj = d.layers[id];
+        for (n=0; !obj && n<d.layers.length; n++)
+            obj = rcube_find_object(id, d.layers[n].document);
+    }
 
-  return obj;
+    return obj;
 };
 
 // determine whether the mouse is over the given object or not
 function rcube_mouse_is_over(ev, obj)
 {
-  var mouse = rcube_event.get_mouse_pos(ev),
-    pos = $(obj).offset();
+    var mouse = rcube_event.get_mouse_pos(ev),
+        pos = $(obj).offset();
 
-  return (mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
+    return (mouse.x >= pos.left) && (mouse.x < (pos.left + obj.offsetWidth)) &&
     (mouse.y >= pos.top) && (mouse.y < (pos.top + obj.offsetHeight));
 };
 
@@ -545,35 +545,35 @@ function rcube_mouse_is_over(ev, obj)
 // cookie functions by GoogieSpell
 function setCookie(name, value, expires, path, domain, secure)
 {
-  var curCookie = name + "=" + escape(value) +
+    var curCookie = name + "=" + escape(value) +
       (expires ? "; expires=" + expires.toGMTString() : "") +
       (path ? "; path=" + path : "") +
       (domain ? "; domain=" + domain : "") +
       (secure ? "; secure" : "") + '; SameSite=Lax';
 
-  document.cookie = curCookie;
+    document.cookie = curCookie;
 };
 
 function getCookie(name)
 {
-  var dc = document.cookie,
-    prefix = name + "=",
-    begin = dc.indexOf("; " + prefix);
+    var dc = document.cookie,
+        prefix = name + "=",
+        begin = dc.indexOf("; " + prefix);
 
-  if (begin == -1) {
-    begin = dc.indexOf(prefix);
-    if (begin != 0)
-      return null;
-  }
-  else {
-    begin += 2;
-  }
+    if (begin == -1) {
+        begin = dc.indexOf(prefix);
+        if (begin != 0)
+            return null;
+    }
+    else {
+        begin += 2;
+    }
 
-  var end = dc.indexOf(";", begin);
-  if (end == -1)
-    end = dc.length;
+    var end = dc.indexOf(";", begin);
+    if (end == -1)
+        end = dc.length;
 
-  return unescape(dc.substring(begin + prefix.length, end));
+    return unescape(dc.substring(begin + prefix.length, end));
 };
 
 // deprecated aliases, to be removed, use rcmail.set_cookie/rcmail.get_cookie
@@ -588,223 +588,223 @@ bw.set_html_class();
 // http://dev.rubyonrails.org/changeset/7271
 RegExp.escape = function(str)
 {
-  return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
+    return String(str).replace(/([.*+?^=!:${}()|[\]\/\\])/g, '\\$1');
 };
 
 // Extend Date prototype to detect Standard timezone without DST
 // from http://www.michaelapproved.com/articles/timezone-detect-and-ignore-daylight-saving-time-dst/
 Date.prototype.getStdTimezoneOffset = function()
 {
-  var m = 12,
-    d = new Date(null, m, 1),
-    tzo = d.getTimezoneOffset();
+    var m = 12,
+        d = new Date(null, m, 1),
+        tzo = d.getTimezoneOffset();
 
     while (--m) {
-      d.setUTCMonth(m);
-      if (tzo != d.getTimezoneOffset()) {
-        return Math.max(tzo, d.getTimezoneOffset());
+        d.setUTCMonth(m);
+        if (tzo != d.getTimezoneOffset()) {
+            return Math.max(tzo, d.getTimezoneOffset());
+        }
     }
-  }
 
-  return tzo;
-}
+    return tzo;
+};
 
 // define String's startsWith() method for old browsers
 if (!String.prototype.startsWith) {
-  String.prototype.startsWith = function(search, position) {
-    position = position || 0;
-    return this.slice(position, search.length) === search;
-  };
+    String.prototype.startsWith = function(search, position) {
+        position = position || 0;
+        return this.slice(position, search.length) === search;
+    };
 }
 
 if (!String.prototype.endsWith) {
-  String.prototype.endsWith = function(searchString, position) {
-    var subjectString = this.toString();
-    if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > subjectString.length) {
-      position = subjectString.length;
-    }
-    position -= searchString.length;
-    var lastIndex = subjectString.lastIndexOf(searchString, position);
-    return lastIndex !== -1 && lastIndex === position;
-  };
+    String.prototype.endsWith = function(searchString, position) {
+        var subjectString = this.toString();
+        if (typeof position !== 'number' || !isFinite(position) || Math.floor(position) !== position || position > subjectString.length) {
+            position = subjectString.length;
+        }
+        position -= searchString.length;
+        var lastIndex = subjectString.lastIndexOf(searchString, position);
+        return lastIndex !== -1 && lastIndex === position;
+    };
 }
 
 // array utility function
 jQuery.last = function(arr) {
-  return arr && arr.length ? arr[arr.length-1] : undefined;
-}
+    return arr && arr.length ? arr[arr.length-1] : undefined;
+};
 
 // jQuery plugin to set HTML5 placeholder and title attributes on input elements
 jQuery.fn.placeholder = function(text) {
-  return this.each(function() {
-    $(this).prop({title: text, placeholder: text});
-  });
+    return this.each(function() {
+        $(this).prop({title: text, placeholder: text});
+    });
 };
 
 // function to parse query string into an object
 var rcube_parse_query = function(query)
 {
-  if (!query)
-    return {};
+    if (!query)
+        return {};
 
-  var params = {}, e, k, v,
-    re = /([^&=]+)=?([^&]*)/g,
-    decodeRE = /\+/g, // Regex for replacing addition symbol with a space
-    decode = function (str) { return decodeURIComponent(str.replace(decodeRE, ' ')); };
+    var params = {}, e, k, v,
+        re = /([^&=]+)=?([^&]*)/g,
+        decodeRE = /\+/g, // Regex for replacing addition symbol with a space
+        decode = function (str) { return decodeURIComponent(str.replace(decodeRE, ' ')); };
 
-  query = query.replace(/\?/, '');
+    query = query.replace(/\?/, '');
 
-  while (e = re.exec(query)) {
-    k = decode(e[1]);
-    v = decode(e[2]);
+    while (e = re.exec(query)) {
+        k = decode(e[1]);
+        v = decode(e[2]);
 
-    if (k.substring(k.length - 2) === '[]') {
-      k = k.substring(0, k.length - 2);
-      (params[k] || (params[k] = [])).push(v);
+        if (k.substring(k.length - 2) === '[]') {
+            k = k.substring(0, k.length - 2);
+            (params[k] || (params[k] = [])).push(v);
+        }
+        else
+            params[k] = v;
     }
-    else
-      params[k] = v;
-  }
 
-  return params;
+    return params;
 };
 
 
 // Base64 code from Tyler Akins -- http://rumkin.com
 var Base64 = (function () {
-  var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+    var keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
 
-  // private method for UTF-8 encoding
-  var utf8_encode = function(string) {
-    string = string.replace(/\r\n/g, "\n");
-    var utftext = '';
+    // private method for UTF-8 encoding
+    var utf8_encode = function(string) {
+        string = string.replace(/\r\n/g, "\n");
+        var utftext = '';
 
-    for (var n = 0; n < string.length; n++) {
-      var c = string.charCodeAt(n);
+        for (var n = 0; n < string.length; n++) {
+            var c = string.charCodeAt(n);
 
-      if (c < 128) {
-        utftext += String.fromCharCode(c);
-      }
-      else if(c > 127 && c < 2048) {
-        utftext += String.fromCharCode((c >> 6) | 192);
-        utftext += String.fromCharCode((c & 63) | 128);
-      }
-      else {
-        utftext += String.fromCharCode((c >> 12) | 224);
-        utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-        utftext += String.fromCharCode((c & 63) | 128);
-      }
-    }
+            if (c < 128) {
+                utftext += String.fromCharCode(c);
+            }
+            else if(c > 127 && c < 2048) {
+                utftext += String.fromCharCode((c >> 6) | 192);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+            else {
+                utftext += String.fromCharCode((c >> 12) | 224);
+                utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+                utftext += String.fromCharCode((c & 63) | 128);
+            }
+        }
 
-    return utftext;
-  };
+        return utftext;
+    };
 
-  // private method for UTF-8 decoding
-  var utf8_decode = function (utftext) {
-    var i = 0, string = '', c = 0, c2 = 0, c3 = 0;
+    // private method for UTF-8 decoding
+    var utf8_decode = function (utftext) {
+        var i = 0, string = '', c = 0, c2 = 0, c3 = 0;
 
-    while (i < utftext.length) {
-      c = utftext.charCodeAt(i);
-      if (c < 128) {
-        string += String.fromCharCode(c);
-        i++;
-      }
-      else if (c > 191 && c < 224) {
-        c2 = utftext.charCodeAt(i + 1);
-        string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
-        i += 2;
-      }
-      else {
-        c2 = utftext.charCodeAt(i + 1);
-        c3 = utftext.charCodeAt(i + 2);
-        string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
-        i += 3;
-      }
-    }
+        while (i < utftext.length) {
+            c = utftext.charCodeAt(i);
+            if (c < 128) {
+                string += String.fromCharCode(c);
+                i++;
+            }
+            else if (c > 191 && c < 224) {
+                c2 = utftext.charCodeAt(i + 1);
+                string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+                i += 2;
+            }
+            else {
+                c2 = utftext.charCodeAt(i + 1);
+                c3 = utftext.charCodeAt(i + 2);
+                string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+                i += 3;
+            }
+        }
 
-    return string;
-  };
+        return string;
+    };
 
-  var obj = {
+    var obj = {
     /**
      * Encodes a string in base64
      * @param {String} input The string to encode in base64.
      */
-    encode: function (input) {
-      // encode UTF8 as btoa() may fail on some characters
-      input = utf8_encode(input);
+        encode: function (input) {
+            // encode UTF8 as btoa() may fail on some characters
+            input = utf8_encode(input);
 
-      if (typeof(window.btoa) === 'function') {
-        try {
-          return btoa(input);
-        }
-        catch (e) {};
-      }
+            if (typeof(window.btoa) === 'function') {
+                try {
+                    return btoa(input);
+                }
+                catch (e) {};
+            }
 
-      var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0, output = '', len = input.length;
+            var chr1, chr2, chr3, enc1, enc2, enc3, enc4, i = 0, output = '', len = input.length;
 
-      while (i < len) {
-        chr1 = input.charCodeAt(i++);
-        chr2 = input.charCodeAt(i++);
-        chr3 = input.charCodeAt(i++);
+            while (i < len) {
+                chr1 = input.charCodeAt(i++);
+                chr2 = input.charCodeAt(i++);
+                chr3 = input.charCodeAt(i++);
 
-        enc1 = chr1 >> 2;
-        enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-        enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-        enc4 = chr3 & 63;
+                enc1 = chr1 >> 2;
+                enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+                enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+                enc4 = chr3 & 63;
 
-        if (isNaN(chr2))
-          enc3 = enc4 = 64;
-        else if (isNaN(chr3))
-          enc4 = 64;
+                if (isNaN(chr2))
+                    enc3 = enc4 = 64;
+                else if (isNaN(chr3))
+                    enc4 = 64;
 
-        output = output
+                output = output
           + keyStr.charAt(enc1) + keyStr.charAt(enc2)
           + keyStr.charAt(enc3) + keyStr.charAt(enc4);
-      }
+            }
 
-      return output;
-    },
+            return output;
+        },
 
-    /**
+        /**
      * Decodes a base64 string.
      * @param {String} input The string to decode.
      */
-    decode: function (input) {
-      if (typeof(window.atob) === 'function') {
-        try {
-          return utf8_decode(atob(input));
+        decode: function (input) {
+            if (typeof(window.atob) === 'function') {
+                try {
+                    return utf8_decode(atob(input));
+                }
+                catch (e) {};
+            }
+
+            var chr1, chr2, chr3, enc1, enc2, enc3, enc4, len, i = 0, output = '';
+
+            // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
+            input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+            len = input.length;
+
+            while (i < len) {
+                enc1 = keyStr.indexOf(input.charAt(i++));
+                enc2 = keyStr.indexOf(input.charAt(i++));
+                enc3 = keyStr.indexOf(input.charAt(i++));
+                enc4 = keyStr.indexOf(input.charAt(i++));
+
+                chr1 = (enc1 << 2) | (enc2 >> 4);
+                chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+                chr3 = ((enc3 & 3) << 6) | enc4;
+
+                output = output + String.fromCharCode(chr1);
+
+                if (enc3 != 64)
+                    output = output + String.fromCharCode(chr2);
+                if (enc4 != 64)
+                    output = output + String.fromCharCode(chr3);
+            }
+
+            return utf8_decode(output);
         }
-        catch (e) {};
-      }
+    };
 
-      var chr1, chr2, chr3, enc1, enc2, enc3, enc4, len, i = 0, output = '';
-
-      // remove all characters that are not A-Z, a-z, 0-9, +, /, or =
-      input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-      len = input.length;
-
-      while (i < len) {
-        enc1 = keyStr.indexOf(input.charAt(i++));
-        enc2 = keyStr.indexOf(input.charAt(i++));
-        enc3 = keyStr.indexOf(input.charAt(i++));
-        enc4 = keyStr.indexOf(input.charAt(i++));
-
-        chr1 = (enc1 << 2) | (enc2 >> 4);
-        chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-        chr3 = ((enc3 & 3) << 6) | enc4;
-
-        output = output + String.fromCharCode(chr1);
-
-        if (enc3 != 64)
-          output = output + String.fromCharCode(chr2);
-        if (enc4 != 64)
-          output = output + String.fromCharCode(chr3);
-      }
-
-      return utf8_decode(output);
-    }
-  };
-
-  return obj;
+    return obj;
 })();
diff --git a/program/js/editor.js b/program/js/editor.js
index 8d871c339..d42a222e8 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -35,896 +35,896 @@
  */
 function rcube_text_editor(config, id)
 {
-  var ref = this,
-    editorElement = $('#' + id),
-    abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
-    conf = {
-      selector: '#' + (editorElement.is('.mce_editor') ? id : 'fake-editor-id'),
-      readonly: editorElement.is('[readonly],[disabled]'),
-      cache_suffix: 's=5080200',
-      theme: 'silver',
-      language: config.lang,
-      content_css: rcmail.assets_path(config.content_css),
-      content_style: config.content_style,
-      menubar: false,
-      statusbar: false,
-      // toolbar_sticky: true, // does not work in scrollable element: https://github.com/tinymce/tinymce/issues/5227
-      toolbar_drawer: 'sliding',
-      toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'
+    var ref = this,
+        editorElement = $('#' + id),
+        abs_url = location.href.replace(/[?#].*$/, '').replace(/\/$/, ''),
+        conf = {
+            selector: '#' + (editorElement.is('.mce_editor') ? id : 'fake-editor-id'),
+            readonly: editorElement.is('[readonly],[disabled]'),
+            cache_suffix: 's=5080200',
+            theme: 'silver',
+            language: config.lang,
+            content_css: rcmail.assets_path(config.content_css),
+            content_style: config.content_style,
+            menubar: false,
+            statusbar: false,
+            // toolbar_sticky: true, // does not work in scrollable element: https://github.com/tinymce/tinymce/issues/5227
+            toolbar_drawer: 'sliding',
+            toolbar: 'bold italic underline | alignleft aligncenter alignright alignjustify'
         + ' | $font | forecolor backcolor',
-      extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
-      // Allow style tag, have to be allowed inside body/div/blockquote (#7088)
-      valid_children: '+body[style],+blockquote[style],+div[style]',
-      relative_urls: false,
-      remove_script_host: false,
-      convert_urls: false, // #1486944
-      image_description: false,
-      paste_webkit_styles: "color font-size font-family font-weight background-color",
-      automatic_uploads: false, // allows to paste images
-      paste_data_images: true,
-      // Note: We disable contextmenu options specifically for browser_spellcheck:true.
-      //       Otherwise user would have to use Right-Click with CTRL to get to
-      //       the browser's spellchecker options. Should you disable browser_spellcheck
-      //       you can enable other contextmenu options (by removing these options below).
-      browser_spellcheck: true,
-      contextmenu: 'spellchecker',
-      anchor_bottom: false,
-      anchor_top: false,
-      file_picker_types: 'image media',
-      file_picker_callback: function(callback, value, meta) { ref.file_picker_callback(callback, value, meta); },
-      min_height: config.mode == 'identity' ? 100 : 400,
-      deprecation_warnings: false
-    };
+            extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
+            // Allow style tag, have to be allowed inside body/div/blockquote (#7088)
+            valid_children: '+body[style],+blockquote[style],+div[style]',
+            relative_urls: false,
+            remove_script_host: false,
+            convert_urls: false, // #1486944
+            image_description: false,
+            paste_webkit_styles: "color font-size font-family font-weight background-color",
+            automatic_uploads: false, // allows to paste images
+            paste_data_images: true,
+            // Note: We disable contextmenu options specifically for browser_spellcheck:true.
+            //       Otherwise user would have to use Right-Click with CTRL to get to
+            //       the browser's spellchecker options. Should you disable browser_spellcheck
+            //       you can enable other contextmenu options (by removing these options below).
+            browser_spellcheck: true,
+            contextmenu: 'spellchecker',
+            anchor_bottom: false,
+            anchor_top: false,
+            file_picker_types: 'image media',
+            file_picker_callback: function(callback, value, meta) { ref.file_picker_callback(callback, value, meta); },
+            min_height: config.mode == 'identity' ? 100 : 400,
+            deprecation_warnings: false
+        };
 
-  // register spellchecker for plain text editor
-  this.spellcheck_observer = function() {};
-  if (config.spellchecker) {
-    this.spellchecker = config.spellchecker;
-    if (config.spellcheck_observer) {
-      this.spellchecker.spelling_state_observer = this.spellcheck_observer = config.spellcheck_observer;
-    }
-  }
-
-  // Note: must be registered only once (#1490311)
-  if (!tinymce.registered_request_token) {
-    tinymce.registered_request_token = true;
-    tinymce.util.XHR.on('beforeSend', function(e) {
-      // secure spellchecker requests with Roundcube token
-      e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
-      // A hacky way of setting spellchecker language (there's no API for this in Tiny)
-      if (e.settings && e.settings.data)
-        e.settings.data = e.settings.data.replace(/^(method=[a-zA-Z]+&lang=)([^&]+)/, '$1' + rcmail.env.spell_lang);
-    });
-  }
-
-  // minimal editor
-  if (config.mode == 'identity' || config.mode == 'response') {
-    conf.toolbar += ' | charmap hr link unlink image code $extra';
-    $.extend(conf, {
-      plugins: 'autolink charmap code hr image link paste tabfocus',
-      file_picker_types: 'image'
-    });
-  }
-  // full-featured editor
-  else {
-    conf.toolbar += ' | bullist numlist outdent indent ltr rtl blockquote'
-        + ' | link unlink table | $extra charmap image media | code searchreplace undo redo',
-    $.extend(conf, {
-      plugins: 'autolink charmap code directionality link lists image media nonbreaking'
-        + ' paste table tabfocus searchreplace spellchecker',
-      spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',
-      spellchecker_language: rcmail.env.spell_lang
-    });
-  }
-
-  // add TinyMCE plugins/buttons from Roundcube plugin
-  $.each(config.extra_plugins || [], function() {
-    if (conf.plugins.indexOf(this) < 0)
-      conf.plugins = conf.plugins + ' ' + this;
-  });
-  $.each(config.extra_buttons || [], function() {
-    if (conf.toolbar.indexOf(this) < 0)
-      conf.toolbar = conf.toolbar.replace('$extra', '$extra ' + this);
-  });
-
-  // disable TinyMCE plugins/buttons from Roundcube plugin
-  $.each(config.disabled_plugins || [], function() {
-    conf.plugins = conf.plugins.replace(this, '');
-  });
-  $.each(config.disabled_buttons || [], function() {
-    conf.toolbar = conf.toolbar.replace(this, '');
-  });
-
-  // font list, convert to TinyMCE format
-  var fonts = [];
-  $.each(config.font_formats || [], function(key) {
-    fonts.push(key + '=' + this.replace(/"/g, '').toLowerCase());
-  });
-  conf.font_formats = fonts.join('; ');
-  if (fonts.length > 1) {
-    conf.toolbar = conf.toolbar.replace('$font', 'fontselect $font');
-  }
-
-  // font size list
-  conf.fontsize_formats = config.fontsize_formats.join(' ');
-  if (config.fontsize_formats.length > 1) {
-    conf.toolbar = conf.toolbar.replace('$font', 'fontsizeselect $font');
-  }
-
-  conf.toolbar = conf.toolbar.replace(/($extra|$font)/, '').replace(/\|\s+\|/g, '|');
-
-  // support external configuration settings e.g. from skin
-  if (window.rcmail_editor_settings)
-    $.extend(conf, window.rcmail_editor_settings);
-
-  conf.setup = function(ed) {
-    ed.on('init', function() { ref.init_callback(ed); });
-    // add handler for spellcheck button state update
-    ed.on('SpellcheckStart SpellcheckEnd', function(args) {
-      ref.spellcheck_active = args.type == 'spellcheckstart';
-      ref.spellcheck_observer();
-    });
-    ed.on('keypress', function() {
-      rcmail.compose_type_activity++;
-    });
-    ed.on('PastePostProcess', function(e) {
-      $(e.node).find('img').each(function() {
-        var id = 'i' + Date.now();
-
-        // No referrer for privacy
-        this.referrerPolicy = 'no-referrer';
-
-        // Need an attribute to find the image element after paste
-        this.setAttribute('data-img-id', id);
-
-        // Replace the 'src' with data: URI after the image has been loaded
-        // This way if we fetch the image again the browser will fetch it from cache
-        this.onload = function() { this.onload = null; ref.replace_img_src(this.src, id) };
-      });
-    });
-    // make links open on shift-click
-    ed.on('click', function(e) {
-      var link = $(e.target).closest('a');
-      if (link.length && e.shiftKey) {
-        window.open(link.get(0).href, '_blank');
-        return false;
-      }
-    });
-    ed.on('focus blur', function(e) {
-      $(ed.getContainer()).toggleClass('focused');
-    });
-
-    if (conf.setup_callback)
-      conf.setup_callback(ed);
-  };
-
-  rcmail.triggerEvent('editor-init', {config: conf, ref: ref, id: id});
-
-  // textarea identifier
-  this.id = id;
-  // reference to active editor (if in HTML mode)
-  this.editor = null;
-
-  tinymce.init(conf);
-
-  // react to real individual tinyMCE editor init
-  this.init_callback = function(editor)
-  {
-    this.editor = editor;
-
-    // Browsers have performance problems with rendering a lot of content in a textarea.
-    // To workaround that we create a separate hidden textarea for the content and copy it
-    // to the editor after the page is already loaded (#8108)
-    var content, editorContentElement = editorElement.data('html-editor-content-element');
-    if (editorContentElement && (content = $('#' + editorContentElement).val())) {
-      editor.setContent(content);
-      $('#' + editorContentElement).remove();
-    }
-
-    if (rcmail.env.action == 'compose') {
-      var area = $('#' + this.id),
-        height = $('div.tox-toolbar__group', area.parent()).first().height();
-
-      // the editor might be still not fully loaded, making the editing area
-      // inaccessible, wait and try again (#1490310)
-      if (height > 200 || height > area.height()) {
-        return setTimeout(function () { ref.init_callback(editor); }, 300);
-      }
-
-      var elem = rcube_find_object('_from'),
-        fe = rcmail.env.compose_focus_elem;
-
-      if (elem && elem.type == 'select-one') {
-        // insert signature (only for the first time)
-        if (!rcmail.env.identities_initialized)
-          rcmail.change_identity(elem);
-
-        // Focus previously focused element
-        if (fe && fe.id != this.id && fe.nodeName != 'BODY') {
-          window.focus(); // for WebKit (#1486674)
-          fe.focus();
-          rcmail.env.compose_focus_elem = null;
+    // register spellchecker for plain text editor
+    this.spellcheck_observer = function() {};
+    if (config.spellchecker) {
+        this.spellchecker = config.spellchecker;
+        if (config.spellcheck_observer) {
+            this.spellchecker.spelling_state_observer = this.spellcheck_observer = config.spellcheck_observer;
         }
-      }
     }
 
-    rcmail.triggerEvent('editor-load', {config: conf, ref: this});
-
-    // set tabIndex and set focus to element that was focused before
-    this.tabindex(this.force_focus || (fe && fe.id == this.id));
-
-    // Trigger resize (needed for proper editor resizing in some browsers)
-    $(window).resize();
-  };
-
-  // set tabIndex on tinymce editor
-  this.tabindex = function(focus)
-  {
-    if (rcmail.env.task == 'mail' && this.editor) {
-      var textarea = this.editor.getElement(),
-        node = this.editor.getContentAreaContainer().childNodes[0];
-
-      if (textarea && node)
-        node.tabIndex = textarea.tabIndex;
-
-      // find :prev and :next elements to get focus when tabbing away
-      if (textarea.tabIndex > 0) {
-        var x = null,
-          tabfocus_elements = [':prev',':next'],
-          el = tinymce.DOM.select('*[tabindex='+textarea.tabIndex+']:not(iframe)');
-
-        tinymce.each(el, function(e, i) { if (e.id == ref.id) { x = i; return false; } });
-        if (x !== null) {
-          if (el[x-1] && el[x-1].id) {
-            tabfocus_elements[0] = el[x-1].id;
-          }
-          if (el[x+1] && el[x+1].id) {
-            tabfocus_elements[1] = el[x+1].id;
-          }
-          this.editor.settings.tabfocus_elements = tabfocus_elements.join(',');
-        }
-      }
-
-      // ContentEditable reset fixes invisible cursor issue in Firefox < 25
-      if (bw.mz && bw.vendver < 25)
-        $(this.editor.getBody()).prop('contenteditable', false).prop('contenteditable', true);
-    }
-
-    if (focus)
-      this.focus();
-  };
-
-  // focus the editor
-  this.focus = function()
-  {
-    $(this.editor || ('#' + this.id)).focus();
-    this.force_focus = false;
-  };
-
-  // Returns current editor mode
-  this.is_html = function()
-  {
-    return !!this.editor;
-  };
-
-  // switch html/plain mode
-  this.toggle = function(ishtml, noconvert)
-  {
-    var curr, content, result,
-      // these non-printable chars are not removed on text2html and html2text
-      // we can use them as temp signature replacement
-      sig_mark = "\u0002\u0003",
-      input = $('#' + this.id),
-      signature = rcmail.env.identity ? rcmail.env.signatures[rcmail.env.identity] : null,
-      is_sig = signature && signature.text && signature.text.length > 1;
-
-    // apply spellcheck changes if spell checker is active
-    this.spellcheck_stop();
-
-    if (ishtml) {
-      content = input.val();
-
-      // replace current text signature with temp mark
-      if (is_sig) {
-        content = content.replace(/\r\n/, "\n");
-        content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark);
-      }
-
-      var init_editor = function(data) {
-        // replace signature mark with html version of the signature
-        if (is_sig)
-          data = data.replace(sig_mark, '<div id="_rc_sig">' + signature.html + '</div>');
-
-        ref.force_focus = true;
-        input.val(data);
-        tinymce.execCommand('mceAddEditor', false, ref.id);
-      };
-
-      // convert to html
-      if (!noconvert) {
-        result = rcmail.plain2html(content, init_editor);
-      }
-      else {
-        init_editor(content);
-        result = true;
-      }
-    }
-    else if (this.editor) {
-      if (is_sig) {
-        // get current version of signature, we'll need it in
-        // case of html2text conversion abort
-        if (curr = this.editor.dom.get('_rc_sig'))
-          curr = curr.innerHTML;
-
-        // replace current signature with some non-printable characters
-        // we use non-printable characters, because this replacement
-        // is visible to the user
-        // doing this after getContent() would be hard
-        this.editor.dom.setHTML('_rc_sig', sig_mark);
-      }
-
-      // get html content
-      content = this.editor.getContent();
-
-      var init_plaintext = function(data) {
-        tinymce.execCommand('mceRemoveEditor', false, ref.id);
-        ref.editor = null;
-
-        // replace signature mark with text version of the signature
-        if (is_sig)
-          data = data.replace(sig_mark, "\n" + signature.text);
-
-        input.val(data).focus().trigger('input');
-        rcmail.set_caret_pos(input.get(0), 0);
-      };
-
-      // convert html to text
-      if (!noconvert) {
-        result = rcmail.html2plain(content, init_plaintext);
-      }
-      else {
-        init_plaintext(input.val());
-        result = true;
-      }
-
-      // bring back current signature
-      if (!result && curr)
-        this.editor.dom.setHTML('_rc_sig', curr);
-    }
-
-    return result;
-  };
-
-  // start spellchecker
-  this.spellcheck_start = function()
-  {
-    if (this.editor) {
-      tinymce.execCommand('mceSpellCheck', true);
-      this.spellcheck_observer();
-    }
-    else if (this.spellchecker && this.spellchecker.spellCheck) {
-      this.spellchecker.spellCheck();
-    }
-  };
-
-  // stop spellchecker
-  this.spellcheck_stop = function()
-  {
-    var ed = this.editor;
-
-    if (ed) {
-      if (ed.plugins && ed.plugins.spellchecker && this.spellcheck_active) {
-        ed.execCommand('mceSpellCheck', false);
-        this.spellcheck_observer();
-      }
-    }
-    else if (ed = this.spellchecker) {
-      if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
-        $(ed.spell_span).trigger('click');
-    }
-  };
-
-  // spellchecker state
-  this.spellcheck_state = function()
-  {
-    var ed;
-
-    if (this.editor)
-      return this.spellcheck_active;
-    else if ((ed = this.spellchecker) && ed.state)
-      return ed.state != 'ready' && ed.state != 'no_error_found';
-  };
-
-  // resume spellchecking, highlight provided misspellings without a new ajax request
-  this.spellcheck_resume = function(data)
-  {
-    var ed = this.editor;
-
-    if (ed) {
-      ed.plugins.spellchecker.markErrors(data);
-    }
-    else if (ed = this.spellchecker) {
-      ed.prepare(false, true);
-      ed.processData(data);
-    }
-  };
-
-  // get selected (spellchecker) language
-  this.get_language = function()
-  {
-    return rcmail.env.spell_lang;
-  };
-
-  // set language for spellchecking
-  this.set_language = function(lang)
-  {
-    var ed = this.editor;
-
-    if (ed) {
-      // TODO: this has no effect in recent Tiny versions
-      ed.settings.spellchecker_language = lang;
-    }
-    if (ed = this.spellchecker) {
-      ed.setCurrentLanguage(lang);
-    }
-
-    rcmail.env.spell_lang = lang;
-  };
-
-  // replace selection with text snippet
-  // input can be a string or object with 'text' and 'html' properties
-  this.replace = function(input)
-  {
-    var format, ed = this.editor;
-
-    if (!input)
-      return false;
-
-    // insert into tinymce editor
-    if (ed) {
-      ed.getWin().focus(); // correct focus in IE & Chrome
-
-      if ($.type(input) == 'object' && ('html' in input)) {
-        input = input.html;
-        format = 'html';
-      }
-      else {
-        if ($.type(input) == 'object')
-          input = input.text || '';
-
-        input = rcmail.quote_html(input).replace(/\r?\n/g, '<br/>');
-        format = 'text';
-      }
-
-      ed.selection.setContent(input, {format: format});
-    }
-    // replace selection in compose textarea
-    else if (ed = rcube_find_object(this.id)) {
-      var selection = rcmail.get_input_selection(ed),
-        value = ed.value,
-        pre = value.substring(0, selection.start),
-        end = value.substring(selection.end, value.length);
-
-      if ($.type(input) == 'object')
-        input = input.text || '';
-
-      // insert response text
-      ed.value = pre + input + end;
-
-      // set caret after inserted text
-      rcmail.set_caret_pos(ed, selection.start + input.length);
-      ed.focus();
-    }
-  };
-
-  // Fill the editor with specified content
-  // TODO: support format conversion
-  this.set_content = function(content)
-  {
-    if (this.editor) {
-      this.editor.setContent(content);
-      this.editor.getWin().focus();
-    }
-    else if (ed = rcube_find_object(this.id)) {
-      $(ed).val(content).focus();
-    }
-  };
-
-  // get selected text (if no selection returns all text) from the editor
-  this.get_content = function(args)
-  {
-    var sigstart, ed = this.editor, text = '', strip = false,
-      defaults = {refresh: true, selection: false, nosig: false, format: 'html'};
-
-    if (!args)
-      args = defaults;
-    else
-      args = $.extend(defaults, args);
-
-    // apply spellcheck changes if spell checker is active
-    if (args.refresh) {
-      this.spellcheck_stop();
-    }
-
-    // get selected text from tinymce editor
-    if (ed) {
-      if (args.selection)
-        text = ed.selection.getContent({format: args.format});
-
-      if (!text) {
-        text = ed.getContent({format: args.format});
-        // @todo: strip signature in html mode
-        strip = args.format == 'text';
-      }
-    }
-    // get selected text from compose textarea
-    else if (ed = rcube_find_object(this.id)) {
-      if (args.selection) {
-        text = rcmail.get_input_selection(ed).text;
-      }
-
-      if (!text) {
-        text = ed.value;
-        strip = true;
-      }
-    }
-
-    // strip off signature
-    // @todo: make this optional
-    if (strip && args.nosig) {
-      sigstart = text.indexOf('-- \n');
-      if (sigstart > 0) {
-        text = text.substring(0, sigstart);
-      }
-    }
-
-    return text;
-  };
-
-  // change user signature text
-  this.change_signature = function(id, show_sig)
-  {
-    var position_element, cursor_pos, p = -1,
-      input_message = $('#' + this.id),
-      message = input_message.val(),
-      sig = rcmail.env.identity;
-
-    if (!this.editor) { // plain text mode
-      // remove the 'old' signature
-      if (show_sig && sig && rcmail.env.signatures && rcmail.env.signatures[sig]) {
-        sig = rcmail.env.signatures[sig].text;
-        sig = sig.replace(/\r\n/g, '\n');
-
-        p = rcmail.env.top_posting ? message.indexOf(sig) : message.lastIndexOf(sig);
-        if (p >= 0)
-          message = message.substring(0, p) + message.substring(p+sig.length, message.length);
-      }
-
-      // add the new signature string
-      if (show_sig && rcmail.env.signatures && rcmail.env.signatures[id]) {
-        sig = rcmail.env.signatures[id].text;
-        sig = sig.replace(/\r\n/g, '\n');
-
-        // in place of removed signature
-        if (p >= 0) {
-          message = message.substring(0, p) + sig + message.substring(p, message.length);
-          cursor_pos = p - 1;
-        }
-        // empty message or new-message mode
-        else if (!message || !rcmail.env.compose_mode) {
-          cursor_pos = message.length;
-          message += '\n\n' + sig;
-        }
-        else if (rcmail.env.top_posting && !rcmail.env.sig_below) {
-          // at cursor position
-          if (pos = rcmail.get_caret_pos(input_message.get(0))) {
-            message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
-            cursor_pos = pos;
-          }
-          // on top
-          else {
-            message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
-            cursor_pos = 0;
-          }
-        }
-        else {
-          message = message.replace(/[\r\n]+$/, '');
-          cursor_pos = !rcmail.env.top_posting && message.length ? message.length + 1 : 0;
-          message += '\n\n' + sig;
-        }
-      }
-      else {
-        cursor_pos = rcmail.env.top_posting ? 0 : message.length;
-      }
-
-      input_message.val(message);
-
-      // move cursor before the signature
-      rcmail.set_caret_pos(input_message.get(0), cursor_pos);
-    }
-    else if (show_sig && rcmail.env.signatures) {  // html
-      var sigElem = this.editor.dom.get('_rc_sig');
-
-      // Append the signature as a div within the body
-      if (!sigElem) {
-        var body = this.editor.getBody();
-
-        sigElem = $('<div id="_rc_sig"></div>').get(0);
-
-        // insert at start or at cursor position in top-posting mode
-        // (but not if the content is empty and not in new-message mode)
-        if (rcmail.env.top_posting && !rcmail.env.sig_below
-          && rcmail.env.compose_mode && (body.childNodes.length > 1 || $(body).text())
-        ) {
-          this.editor.getWin().focus(); // correct focus in IE & Chrome
-
-          var node = this.editor.selection.getNode();
-
-          $(sigElem).insertBefore(node.nodeName == 'BODY' ? body.firstChild : node.nextSibling);
-          $('<p>').append($('<br>')).insertBefore(sigElem);
-        }
-        else {
-          body.appendChild(sigElem);
-          position_element = rcmail.env.top_posting && rcmail.env.compose_mode ? body.firstChild : $(sigElem).prev();
-        }
-      }
-
-      sigElem.innerHTML = rcmail.env.signatures[id] ? rcmail.env.signatures[id].html : '';
-    }
-    else if (!rcmail.env.top_posting) {
-      position_element = $(this.editor.getBody()).children().last();
-    }
-
-    // put cursor before signature and scroll the window
-    if (this.editor && position_element && position_element.length) {
-      this.editor.selection.setCursorLocation(position_element.get(0));
-      this.editor.getWin().scroll(0, position_element.offset().top);
-    }
-  };
-
-  // trigger content save
-  this.save = function()
-  {
-    if (this.editor) {
-      this.editor.save();
-    }
-  };
-
-  // focus the editing area
-  this.focus = function()
-  {
-    (this.editor || rcube_find_object(this.id)).focus();
-  };
-
-  // image selector
-  this.file_picker_callback = function(callback, value, meta)
-  {
-    var i, button, elem, cancel, dialog, fn, hint, list = [],
-      type = meta.filetype,
-      form = $('.upload-form').clone();
-
-    // open image selector dialog
-    this.editor.windowManager.open({
-      title: rcmail.get_label('select' + type),
-      body: {
-        type: 'panel',
-        items: [{
-          type: 'htmlpanel',
-          html: '<div id="image-selector" class="image-selector file-upload"><ul id="image-selector-list" class="attachmentslist"></ul></div>',
-        }]
-      },
-      buttons: [{type: 'cancel', text: rcmail.get_label('close'), onclick: function() { ref.file_picker_close(); }}]
-    });
-
-    rcmail.env.file_picker_callback = callback;
-    rcmail.env.file_picker_type = type;
-
-    dialog = $('#image-selector');
-
-    if (!form.length)
-      form = this.file_upload_form(rcmail.gui_objects.uploadform);
-    else
-      form.find('button,a.button').slice(1).remove(); // need only the first button
-
-    button = dialog.prepend(form).find('button,a.button')
-      .text(rcmail.get_label('add' + type))
-      .focus();
-
-    if (!button.is('.btn'))
-      button.addClass('tox-button');
-
-    // fill images list with available images
-    for (i in rcmail.env.attachments) {
-      if (elem = ref.file_picker_entry(i, rcmail.env.attachments[i])) {
-        list.push(elem);
-      }
-    }
-
-    cancel = dialog.parents('.tox-dialog').find('button').last();
-
-    // Add custom Tab key handlers, tabindex does not work
-    list = $('#image-selector-list').append(list).on('keydown', 'li', function(e) {
-        if (e.which == 9) {
-          if (rcube_event.get_modifier(e) == SHIFT_KEY) {
-            if (!$(this).prev().focus().length) {
-              button.focus();
-            }
-          }
-          else if (!$(this).next().focus().length) {
-            cancel.focus();
-          }
-
-          return false;
-        }
-      });
-
-    button.keydown(function(e) {
-      if (e.which == 9) { // Tab
-        if (rcube_event.get_modifier(e) == SHIFT_KEY || !list.find('li').first().focus().length) {
-          cancel.focus();
-        }
-
-        return false;
-      }
-
-      if (e.which == 13) { // Enter
-        this.click();
-      }
-    });
-
-    cancel.keydown(function(e) {
-      if (e.which == 9) {
-        if (rcube_event.get_modifier(e) != SHIFT_KEY || !list.find('li').last().focus().length) {
-          button.focus();
-        }
-
-        return false;
-      }
-    });
-
-    // enable drag-n-drop area
-    if (window.FormData) {
-      if (!rcmail.env.filedrop) {
-        rcmail.env.filedrop = {};
-      }
-      if (rcmail.gui_objects.filedrop) {
-        rcmail.env.old_file_drop = rcmail.gui_objects.filedrop;
-      }
-
-      rcmail.gui_objects.filedrop = $('#image-selector');
-      rcmail.gui_objects.filedrop.addClass('droptarget')
-        .on('dragover dragleave', function(e) {
-          e.preventDefault();
-          e.stopPropagation();
-          $(this)[(e.type == 'dragover' ? 'addClass' : 'removeClass')]('hover');
-        })
-        .get(0).addEventListener('drop', function(e) { return rcmail.file_dropped(e); }, false);
-    }
-
-    // register handler for successful file upload
-    if (!rcmail.env['file_dialog_event_' + type]) {
-      rcmail.env['file_dialog_event+' + type] = true;
-      rcmail.addEventListener('fileuploaded', function(attr) {
-        var elem;
-        if (elem = ref.file_picker_entry(attr.name, attr.attachment)) {
-          list.prepend(elem);
-          elem.focus();
-        }
-      });
-    }
-
-    // @todo: upload progress indicator
-  };
-
-  // close file browser window
-  this.file_picker_close = function(url)
-  {
-    this.editor.windowManager.close();
-
-    if (url)
-      rcmail.env.file_picker_callback(url);
-
-    if (rcmail.env.old_file_drop)
-      rcmail.gui_objects.filedrop = rcmail.env.old_file_drop;
-  };
-
-  // creates file browser entry
-  this.file_picker_entry = function(file_id, file)
-  {
-    if (!file.complete || !file.mimetype) {
-      return;
-    }
-
-    if (rcmail.file_upload_id) {
-      rcmail.set_busy(false, null, rcmail.file_upload_id);
-    }
-
-    var rx, img_src;
-
-    switch (rcmail.env.file_picker_type) {
-      case 'image':
-        rx = /^image\//i;
-        break;
-
-      case 'media':
-        rx = /^video\//i;
-        img_src = rcmail.assets_path('program/resources/tinymce/video.png');
-        break;
-
-      default:
-        return;
-    }
-
-    if (rx.test(file.mimetype)) {
-      var path = rcmail.env.comm_path + '&_from=' + rcmail.env.action,
-        action = rcmail.env.compose_id ? '&_id=' + rcmail.env.compose_id + '&_action=display-attachment' : '&_action=upload-display',
-        href = path + action + '&_file=' + file_id,
-        img = $('<img>').attr({title: file.name, src: img_src ? img_src : href + '&_thumbnail=1'});
-
-      return $('<li>').attr({tabindex: 0})
-        .data('url', href)
-        .append($('<span class="img">').append(img))
-        .append($('<span class="name">').text(file.name))
-        .click(function() { ref.file_picker_close($(this).data('url')); })
-        .keydown(function(e) {
-          if (e.which == 13) {
-            ref.file_picker_close($(this).data('url'));
-          }
+    // Note: must be registered only once (#1490311)
+    if (!tinymce.registered_request_token) {
+        tinymce.registered_request_token = true;
+        tinymce.util.XHR.on('beforeSend', function(e) {
+            // secure spellchecker requests with Roundcube token
+            e.xhr.setRequestHeader('X-Roundcube-Request', rcmail.env.request_token);
+            // A hacky way of setting spellchecker language (there's no API for this in Tiny)
+            if (e.settings && e.settings.data)
+                e.settings.data = e.settings.data.replace(/^(method=[a-zA-Z]+&lang=)([^&]+)/, '$1' + rcmail.env.spell_lang);
         });
     }
-  };
 
-  this.file_upload_form = function(clone_form)
-  {
-    var hint = clone_form ? $(clone_form).find('.hint').text() : '',
-      form = $('<form id="imageuploadform">').attr({method: 'post', enctype: 'multipart/form-data'});
-      file = $('<input>').attr({name: '_file[]', type: 'file', multiple: true, style: 'opacity:0;height:1px;width:1px'})
-        .change(function() { rcmail.upload_file(form, 'upload'); }),
-      wrapper = $('<div class="upload-form">')
-        .append($('<button>').attr({'class': 'btn btn-secondary attach', href: '#', onclick: "rcmail.upload_input('imageuploadform')"}));
-
-    if (hint)
-      wrapper.prepend($('<div class="hint">').text(hint));
-
-    // clone existing upload form
-    if (clone_form) {
-      file.attr('name', $('input[type="file"]', clone_form).attr('name'));
-      form.attr('action', $(clone_form).attr('action'));
+    // minimal editor
+    if (config.mode == 'identity' || config.mode == 'response') {
+        conf.toolbar += ' | charmap hr link unlink image code $extra';
+        $.extend(conf, {
+            plugins: 'autolink charmap code hr image link paste tabfocus',
+            file_picker_types: 'image'
+        });
+    }
+    // full-featured editor
+    else {
+        conf.toolbar += ' | bullist numlist outdent indent ltr rtl blockquote'
+        + ' | link unlink table | $extra charmap image media | code searchreplace undo redo',
+        $.extend(conf, {
+            plugins: 'autolink charmap code directionality link lists image media nonbreaking'
+        + ' paste table tabfocus searchreplace spellchecker',
+            spellchecker_rpc_url: abs_url + '/?_task=utils&_action=spell_html&_remote=1',
+            spellchecker_language: rcmail.env.spell_lang
+        });
     }
 
-    form.append(file).append($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
+    // add TinyMCE plugins/buttons from Roundcube plugin
+    $.each(config.extra_plugins || [], function() {
+        if (conf.plugins.indexOf(this) < 0)
+            conf.plugins = conf.plugins + ' ' + this;
+    });
+    $.each(config.extra_buttons || [], function() {
+        if (conf.toolbar.indexOf(this) < 0)
+            conf.toolbar = conf.toolbar.replace('$extra', '$extra ' + this);
+    });
 
-    return wrapper.append(form);
-  };
+    // disable TinyMCE plugins/buttons from Roundcube plugin
+    $.each(config.disabled_plugins || [], function() {
+        conf.plugins = conf.plugins.replace(this, '');
+    });
+    $.each(config.disabled_buttons || [], function() {
+        conf.toolbar = conf.toolbar.replace(this, '');
+    });
 
-  // Replace pasted image src location with data: URI
-  this.replace_img_src = function(src, id)
-  {
-    if (!window.fetch || !src || !src.match(/^https?:\/\//)) {
-      return;
+    // font list, convert to TinyMCE format
+    var fonts = [];
+    $.each(config.font_formats || [], function(key) {
+        fonts.push(key + '=' + this.replace(/"/g, '').toLowerCase());
+    });
+    conf.font_formats = fonts.join('; ');
+    if (fonts.length > 1) {
+        conf.toolbar = conf.toolbar.replace('$font', 'fontselect $font');
     }
 
-    var fetch_params = {
-      referrerPolicy: 'no-referrer'
+    // font size list
+    conf.fontsize_formats = config.fontsize_formats.join(' ');
+    if (config.fontsize_formats.length > 1) {
+        conf.toolbar = conf.toolbar.replace('$font', 'fontsizeselect $font');
+    }
+
+    conf.toolbar = conf.toolbar.replace(/($extra|$font)/, '').replace(/\|\s+\|/g, '|');
+
+    // support external configuration settings e.g. from skin
+    if (window.rcmail_editor_settings)
+        $.extend(conf, window.rcmail_editor_settings);
+
+    conf.setup = function(ed) {
+        ed.on('init', function() { ref.init_callback(ed); });
+        // add handler for spellcheck button state update
+        ed.on('SpellcheckStart SpellcheckEnd', function(args) {
+            ref.spellcheck_active = args.type == 'spellcheckstart';
+            ref.spellcheck_observer();
+        });
+        ed.on('keypress', function() {
+            rcmail.compose_type_activity++;
+        });
+        ed.on('PastePostProcess', function(e) {
+            $(e.node).find('img').each(function() {
+                var id = 'i' + Date.now();
+
+                // No referrer for privacy
+                this.referrerPolicy = 'no-referrer';
+
+                // Need an attribute to find the image element after paste
+                this.setAttribute('data-img-id', id);
+
+                // Replace the 'src' with data: URI after the image has been loaded
+                // This way if we fetch the image again the browser will fetch it from cache
+                this.onload = function() { this.onload = null; ref.replace_img_src(this.src, id); };
+            });
+        });
+        // make links open on shift-click
+        ed.on('click', function(e) {
+            var link = $(e.target).closest('a');
+            if (link.length && e.shiftKey) {
+                window.open(link.get(0).href, '_blank');
+                return false;
+            }
+        });
+        ed.on('focus blur', function(e) {
+            $(ed.getContainer()).toggleClass('focused');
+        });
+
+        if (conf.setup_callback)
+            conf.setup_callback(ed);
     };
 
-    fetch(src, fetch_params).then(function(response) {
-      response.arrayBuffer().then(function(body) {
-        var url, ctype = response.headers.get('content-type'),
-          u8Buf = new Uint8Array(body),
-          latinBuf = '';
+    rcmail.triggerEvent('editor-init', {config: conf, ref: ref, id: id});
 
-        u8Buf.forEach(function(byte) { latinBuf += String.fromCharCode(byte); });
+    // textarea identifier
+    this.id = id;
+    // reference to active editor (if in HTML mode)
+    this.editor = null;
 
-        if (ctype && latinBuf) {
-          url = 'data:' + ctype + ';base64,' + btoa(latinBuf);
-          $(ref.editor.getBody()).find('img[data-img-id="' + id + '"]').attr({
-            src: url,
-            'data-mce-src': url,
-            'data-img-id': null
-          });
+    tinymce.init(conf);
+
+    // react to real individual tinyMCE editor init
+    this.init_callback = function(editor)
+    {
+        this.editor = editor;
+
+        // Browsers have performance problems with rendering a lot of content in a textarea.
+        // To workaround that we create a separate hidden textarea for the content and copy it
+        // to the editor after the page is already loaded (#8108)
+        var content, editorContentElement = editorElement.data('html-editor-content-element');
+        if (editorContentElement && (content = $('#' + editorContentElement).val())) {
+            editor.setContent(content);
+            $('#' + editorContentElement).remove();
         }
-      });
-    });
-  };
+
+        if (rcmail.env.action == 'compose') {
+            var area = $('#' + this.id),
+                height = $('div.tox-toolbar__group', area.parent()).first().height();
+
+            // the editor might be still not fully loaded, making the editing area
+            // inaccessible, wait and try again (#1490310)
+            if (height > 200 || height > area.height()) {
+                return setTimeout(function () { ref.init_callback(editor); }, 300);
+            }
+
+            var elem = rcube_find_object('_from'),
+                fe = rcmail.env.compose_focus_elem;
+
+            if (elem && elem.type == 'select-one') {
+                // insert signature (only for the first time)
+                if (!rcmail.env.identities_initialized)
+                    rcmail.change_identity(elem);
+
+                // Focus previously focused element
+                if (fe && fe.id != this.id && fe.nodeName != 'BODY') {
+                    window.focus(); // for WebKit (#1486674)
+                    fe.focus();
+                    rcmail.env.compose_focus_elem = null;
+                }
+            }
+        }
+
+        rcmail.triggerEvent('editor-load', {config: conf, ref: this});
+
+        // set tabIndex and set focus to element that was focused before
+        this.tabindex(this.force_focus || (fe && fe.id == this.id));
+
+        // Trigger resize (needed for proper editor resizing in some browsers)
+        $(window).resize();
+    };
+
+    // set tabIndex on tinymce editor
+    this.tabindex = function(focus)
+    {
+        if (rcmail.env.task == 'mail' && this.editor) {
+            var textarea = this.editor.getElement(),
+                node = this.editor.getContentAreaContainer().childNodes[0];
+
+            if (textarea && node)
+                node.tabIndex = textarea.tabIndex;
+
+            // find :prev and :next elements to get focus when tabbing away
+            if (textarea.tabIndex > 0) {
+                var x = null,
+                    tabfocus_elements = [':prev', ':next'],
+                    el = tinymce.DOM.select('*[tabindex='+textarea.tabIndex+']:not(iframe)');
+
+                tinymce.each(el, function(e, i) { if (e.id == ref.id) { x = i; return false; } });
+                if (x !== null) {
+                    if (el[x-1] && el[x-1].id) {
+                        tabfocus_elements[0] = el[x-1].id;
+                    }
+                    if (el[x+1] && el[x+1].id) {
+                        tabfocus_elements[1] = el[x+1].id;
+                    }
+                    this.editor.settings.tabfocus_elements = tabfocus_elements.join(',');
+                }
+            }
+
+            // ContentEditable reset fixes invisible cursor issue in Firefox < 25
+            if (bw.mz && bw.vendver < 25)
+                $(this.editor.getBody()).prop('contenteditable', false).prop('contenteditable', true);
+        }
+
+        if (focus)
+            this.focus();
+    };
+
+    // focus the editor
+    this.focus = function()
+    {
+        $(this.editor || ('#' + this.id)).focus();
+        this.force_focus = false;
+    };
+
+    // Returns current editor mode
+    this.is_html = function()
+    {
+        return !!this.editor;
+    };
+
+    // switch html/plain mode
+    this.toggle = function(ishtml, noconvert)
+    {
+        var curr, content, result,
+            // these non-printable chars are not removed on text2html and html2text
+            // we can use them as temp signature replacement
+            sig_mark = "\u0002\u0003",
+            input = $('#' + this.id),
+            signature = rcmail.env.identity ? rcmail.env.signatures[rcmail.env.identity] : null,
+            is_sig = signature && signature.text && signature.text.length > 1;
+
+        // apply spellcheck changes if spell checker is active
+        this.spellcheck_stop();
+
+        if (ishtml) {
+            content = input.val();
+
+            // replace current text signature with temp mark
+            if (is_sig) {
+                content = content.replace(/\r\n/, "\n");
+                content = content.replace(signature.text.replace(/\r\n/, "\n"), sig_mark);
+            }
+
+            var init_editor = function(data) {
+                // replace signature mark with html version of the signature
+                if (is_sig)
+                    data = data.replace(sig_mark, '<div id="_rc_sig">' + signature.html + '</div>');
+
+                ref.force_focus = true;
+                input.val(data);
+                tinymce.execCommand('mceAddEditor', false, ref.id);
+            };
+
+            // convert to html
+            if (!noconvert) {
+                result = rcmail.plain2html(content, init_editor);
+            }
+            else {
+                init_editor(content);
+                result = true;
+            }
+        }
+        else if (this.editor) {
+            if (is_sig) {
+                // get current version of signature, we'll need it in
+                // case of html2text conversion abort
+                if (curr = this.editor.dom.get('_rc_sig'))
+                    curr = curr.innerHTML;
+
+                // replace current signature with some non-printable characters
+                // we use non-printable characters, because this replacement
+                // is visible to the user
+                // doing this after getContent() would be hard
+                this.editor.dom.setHTML('_rc_sig', sig_mark);
+            }
+
+            // get html content
+            content = this.editor.getContent();
+
+            var init_plaintext = function(data) {
+                tinymce.execCommand('mceRemoveEditor', false, ref.id);
+                ref.editor = null;
+
+                // replace signature mark with text version of the signature
+                if (is_sig)
+                    data = data.replace(sig_mark, "\n" + signature.text);
+
+                input.val(data).focus().trigger('input');
+                rcmail.set_caret_pos(input.get(0), 0);
+            };
+
+            // convert html to text
+            if (!noconvert) {
+                result = rcmail.html2plain(content, init_plaintext);
+            }
+            else {
+                init_plaintext(input.val());
+                result = true;
+            }
+
+            // bring back current signature
+            if (!result && curr)
+                this.editor.dom.setHTML('_rc_sig', curr);
+        }
+
+        return result;
+    };
+
+    // start spellchecker
+    this.spellcheck_start = function()
+    {
+        if (this.editor) {
+            tinymce.execCommand('mceSpellCheck', true);
+            this.spellcheck_observer();
+        }
+        else if (this.spellchecker && this.spellchecker.spellCheck) {
+            this.spellchecker.spellCheck();
+        }
+    };
+
+    // stop spellchecker
+    this.spellcheck_stop = function()
+    {
+        var ed = this.editor;
+
+        if (ed) {
+            if (ed.plugins && ed.plugins.spellchecker && this.spellcheck_active) {
+                ed.execCommand('mceSpellCheck', false);
+                this.spellcheck_observer();
+            }
+        }
+        else if (ed = this.spellchecker) {
+            if (ed.state && ed.state != 'ready' && ed.state != 'no_error_found')
+                $(ed.spell_span).trigger('click');
+        }
+    };
+
+    // spellchecker state
+    this.spellcheck_state = function()
+    {
+        var ed;
+
+        if (this.editor)
+            return this.spellcheck_active;
+        else if ((ed = this.spellchecker) && ed.state)
+            return ed.state != 'ready' && ed.state != 'no_error_found';
+    };
+
+    // resume spellchecking, highlight provided misspellings without a new ajax request
+    this.spellcheck_resume = function(data)
+    {
+        var ed = this.editor;
+
+        if (ed) {
+            ed.plugins.spellchecker.markErrors(data);
+        }
+        else if (ed = this.spellchecker) {
+            ed.prepare(false, true);
+            ed.processData(data);
+        }
+    };
+
+    // get selected (spellchecker) language
+    this.get_language = function()
+    {
+        return rcmail.env.spell_lang;
+    };
+
+    // set language for spellchecking
+    this.set_language = function(lang)
+    {
+        var ed = this.editor;
+
+        if (ed) {
+            // TODO: this has no effect in recent Tiny versions
+            ed.settings.spellchecker_language = lang;
+        }
+        if (ed = this.spellchecker) {
+            ed.setCurrentLanguage(lang);
+        }
+
+        rcmail.env.spell_lang = lang;
+    };
+
+    // replace selection with text snippet
+    // input can be a string or object with 'text' and 'html' properties
+    this.replace = function(input)
+    {
+        var format, ed = this.editor;
+
+        if (!input)
+            return false;
+
+        // insert into tinymce editor
+        if (ed) {
+            ed.getWin().focus(); // correct focus in IE & Chrome
+
+            if ($.type(input) == 'object' && ('html' in input)) {
+                input = input.html;
+                format = 'html';
+            }
+            else {
+                if ($.type(input) == 'object')
+                    input = input.text || '';
+
+                input = rcmail.quote_html(input).replace(/\r?\n/g, '<br/>');
+                format = 'text';
+            }
+
+            ed.selection.setContent(input, {format: format});
+        }
+        // replace selection in compose textarea
+        else if (ed = rcube_find_object(this.id)) {
+            var selection = rcmail.get_input_selection(ed),
+                value = ed.value,
+                pre = value.substring(0, selection.start),
+                end = value.substring(selection.end, value.length);
+
+            if ($.type(input) == 'object')
+                input = input.text || '';
+
+            // insert response text
+            ed.value = pre + input + end;
+
+            // set caret after inserted text
+            rcmail.set_caret_pos(ed, selection.start + input.length);
+            ed.focus();
+        }
+    };
+
+    // Fill the editor with specified content
+    // TODO: support format conversion
+    this.set_content = function(content)
+    {
+        if (this.editor) {
+            this.editor.setContent(content);
+            this.editor.getWin().focus();
+        }
+        else if (ed = rcube_find_object(this.id)) {
+            $(ed).val(content).focus();
+        }
+    };
+
+    // get selected text (if no selection returns all text) from the editor
+    this.get_content = function(args)
+    {
+        var sigstart, ed = this.editor, text = '', strip = false,
+            defaults = {refresh: true, selection: false, nosig: false, format: 'html'};
+
+        if (!args)
+            args = defaults;
+        else
+            args = $.extend(defaults, args);
+
+        // apply spellcheck changes if spell checker is active
+        if (args.refresh) {
+            this.spellcheck_stop();
+        }
+
+        // get selected text from tinymce editor
+        if (ed) {
+            if (args.selection)
+                text = ed.selection.getContent({format: args.format});
+
+            if (!text) {
+                text = ed.getContent({format: args.format});
+                // @todo: strip signature in html mode
+                strip = args.format == 'text';
+            }
+        }
+        // get selected text from compose textarea
+        else if (ed = rcube_find_object(this.id)) {
+            if (args.selection) {
+                text = rcmail.get_input_selection(ed).text;
+            }
+
+            if (!text) {
+                text = ed.value;
+                strip = true;
+            }
+        }
+
+        // strip off signature
+        // @todo: make this optional
+        if (strip && args.nosig) {
+            sigstart = text.indexOf('-- \n');
+            if (sigstart > 0) {
+                text = text.substring(0, sigstart);
+            }
+        }
+
+        return text;
+    };
+
+    // change user signature text
+    this.change_signature = function(id, show_sig)
+    {
+        var position_element, cursor_pos, p = -1,
+            input_message = $('#' + this.id),
+            message = input_message.val(),
+            sig = rcmail.env.identity;
+
+        if (!this.editor) { // plain text mode
+            // remove the 'old' signature
+            if (show_sig && sig && rcmail.env.signatures && rcmail.env.signatures[sig]) {
+                sig = rcmail.env.signatures[sig].text;
+                sig = sig.replace(/\r\n/g, '\n');
+
+                p = rcmail.env.top_posting ? message.indexOf(sig) : message.lastIndexOf(sig);
+                if (p >= 0)
+                    message = message.substring(0, p) + message.substring(p+sig.length, message.length);
+            }
+
+            // add the new signature string
+            if (show_sig && rcmail.env.signatures && rcmail.env.signatures[id]) {
+                sig = rcmail.env.signatures[id].text;
+                sig = sig.replace(/\r\n/g, '\n');
+
+                // in place of removed signature
+                if (p >= 0) {
+                    message = message.substring(0, p) + sig + message.substring(p, message.length);
+                    cursor_pos = p - 1;
+                }
+                // empty message or new-message mode
+                else if (!message || !rcmail.env.compose_mode) {
+                    cursor_pos = message.length;
+                    message += '\n\n' + sig;
+                }
+                else if (rcmail.env.top_posting && !rcmail.env.sig_below) {
+                    // at cursor position
+                    if (pos = rcmail.get_caret_pos(input_message.get(0))) {
+                        message = message.substring(0, pos) + '\n' + sig + '\n\n' + message.substring(pos, message.length);
+                        cursor_pos = pos;
+                    }
+                    // on top
+                    else {
+                        message = '\n\n' + sig + '\n\n' + message.replace(/^[\r\n]+/, '');
+                        cursor_pos = 0;
+                    }
+                }
+                else {
+                    message = message.replace(/[\r\n]+$/, '');
+                    cursor_pos = !rcmail.env.top_posting && message.length ? message.length + 1 : 0;
+                    message += '\n\n' + sig;
+                }
+            }
+            else {
+                cursor_pos = rcmail.env.top_posting ? 0 : message.length;
+            }
+
+            input_message.val(message);
+
+            // move cursor before the signature
+            rcmail.set_caret_pos(input_message.get(0), cursor_pos);
+        }
+        else if (show_sig && rcmail.env.signatures) {  // html
+            var sigElem = this.editor.dom.get('_rc_sig');
+
+            // Append the signature as a div within the body
+            if (!sigElem) {
+                var body = this.editor.getBody();
+
+                sigElem = $('<div id="_rc_sig"></div>').get(0);
+
+                // insert at start or at cursor position in top-posting mode
+                // (but not if the content is empty and not in new-message mode)
+                if (rcmail.env.top_posting && !rcmail.env.sig_below
+          && rcmail.env.compose_mode && (body.childNodes.length > 1 || $(body).text())
+                ) {
+                    this.editor.getWin().focus(); // correct focus in IE & Chrome
+
+                    var node = this.editor.selection.getNode();
+
+                    $(sigElem).insertBefore(node.nodeName == 'BODY' ? body.firstChild : node.nextSibling);
+                    $('<p>').append($('<br>')).insertBefore(sigElem);
+                }
+                else {
+                    body.appendChild(sigElem);
+                    position_element = rcmail.env.top_posting && rcmail.env.compose_mode ? body.firstChild : $(sigElem).prev();
+                }
+            }
+
+            sigElem.innerHTML = rcmail.env.signatures[id] ? rcmail.env.signatures[id].html : '';
+        }
+        else if (!rcmail.env.top_posting) {
+            position_element = $(this.editor.getBody()).children().last();
+        }
+
+        // put cursor before signature and scroll the window
+        if (this.editor && position_element && position_element.length) {
+            this.editor.selection.setCursorLocation(position_element.get(0));
+            this.editor.getWin().scroll(0, position_element.offset().top);
+        }
+    };
+
+    // trigger content save
+    this.save = function()
+    {
+        if (this.editor) {
+            this.editor.save();
+        }
+    };
+
+    // focus the editing area
+    this.focus = function()
+    {
+        (this.editor || rcube_find_object(this.id)).focus();
+    };
+
+    // image selector
+    this.file_picker_callback = function(callback, value, meta)
+    {
+        var i, button, elem, cancel, dialog, fn, hint, list = [],
+            type = meta.filetype,
+            form = $('.upload-form').clone();
+
+        // open image selector dialog
+        this.editor.windowManager.open({
+            title: rcmail.get_label('select' + type),
+            body: {
+                type: 'panel',
+                items: [{
+                    type: 'htmlpanel',
+                    html: '<div id="image-selector" class="image-selector file-upload"><ul id="image-selector-list" class="attachmentslist"></ul></div>',
+                }]
+            },
+            buttons: [{type: 'cancel', text: rcmail.get_label('close'), onclick: function() { ref.file_picker_close(); }}]
+        });
+
+        rcmail.env.file_picker_callback = callback;
+        rcmail.env.file_picker_type = type;
+
+        dialog = $('#image-selector');
+
+        if (!form.length)
+            form = this.file_upload_form(rcmail.gui_objects.uploadform);
+        else
+            form.find('button,a.button').slice(1).remove(); // need only the first button
+
+        button = dialog.prepend(form).find('button,a.button')
+            .text(rcmail.get_label('add' + type))
+            .focus();
+
+        if (!button.is('.btn'))
+            button.addClass('tox-button');
+
+        // fill images list with available images
+        for (i in rcmail.env.attachments) {
+            if (elem = ref.file_picker_entry(i, rcmail.env.attachments[i])) {
+                list.push(elem);
+            }
+        }
+
+        cancel = dialog.parents('.tox-dialog').find('button').last();
+
+        // Add custom Tab key handlers, tabindex does not work
+        list = $('#image-selector-list').append(list).on('keydown', 'li', function(e) {
+            if (e.which == 9) {
+                if (rcube_event.get_modifier(e) == SHIFT_KEY) {
+                    if (!$(this).prev().focus().length) {
+                        button.focus();
+                    }
+                }
+                else if (!$(this).next().focus().length) {
+                    cancel.focus();
+                }
+
+                return false;
+            }
+        });
+
+        button.keydown(function(e) {
+            if (e.which == 9) { // Tab
+                if (rcube_event.get_modifier(e) == SHIFT_KEY || !list.find('li').first().focus().length) {
+                    cancel.focus();
+                }
+
+                return false;
+            }
+
+            if (e.which == 13) { // Enter
+                this.click();
+            }
+        });
+
+        cancel.keydown(function(e) {
+            if (e.which == 9) {
+                if (rcube_event.get_modifier(e) != SHIFT_KEY || !list.find('li').last().focus().length) {
+                    button.focus();
+                }
+
+                return false;
+            }
+        });
+
+        // enable drag-n-drop area
+        if (window.FormData) {
+            if (!rcmail.env.filedrop) {
+                rcmail.env.filedrop = {};
+            }
+            if (rcmail.gui_objects.filedrop) {
+                rcmail.env.old_file_drop = rcmail.gui_objects.filedrop;
+            }
+
+            rcmail.gui_objects.filedrop = $('#image-selector');
+            rcmail.gui_objects.filedrop.addClass('droptarget')
+                .on('dragover dragleave', function(e) {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    $(this)[(e.type == 'dragover' ? 'addClass' : 'removeClass')]('hover');
+                })
+                .get(0).addEventListener('drop', function(e) { return rcmail.file_dropped(e); }, false);
+        }
+
+        // register handler for successful file upload
+        if (!rcmail.env['file_dialog_event_' + type]) {
+            rcmail.env['file_dialog_event+' + type] = true;
+            rcmail.addEventListener('fileuploaded', function(attr) {
+                var elem;
+                if (elem = ref.file_picker_entry(attr.name, attr.attachment)) {
+                    list.prepend(elem);
+                    elem.focus();
+                }
+            });
+        }
+
+    // @todo: upload progress indicator
+    };
+
+    // close file browser window
+    this.file_picker_close = function(url)
+    {
+        this.editor.windowManager.close();
+
+        if (url)
+            rcmail.env.file_picker_callback(url);
+
+        if (rcmail.env.old_file_drop)
+            rcmail.gui_objects.filedrop = rcmail.env.old_file_drop;
+    };
+
+    // creates file browser entry
+    this.file_picker_entry = function(file_id, file)
+    {
+        if (!file.complete || !file.mimetype) {
+            return;
+        }
+
+        if (rcmail.file_upload_id) {
+            rcmail.set_busy(false, null, rcmail.file_upload_id);
+        }
+
+        var rx, img_src;
+
+        switch (rcmail.env.file_picker_type) {
+            case 'image':
+                rx = /^image\//i;
+                break;
+
+            case 'media':
+                rx = /^video\//i;
+                img_src = rcmail.assets_path('program/resources/tinymce/video.png');
+                break;
+
+            default:
+                return;
+        }
+
+        if (rx.test(file.mimetype)) {
+            var path = rcmail.env.comm_path + '&_from=' + rcmail.env.action,
+                action = rcmail.env.compose_id ? '&_id=' + rcmail.env.compose_id + '&_action=display-attachment' : '&_action=upload-display',
+                href = path + action + '&_file=' + file_id,
+                img = $('<img>').attr({title: file.name, src: img_src ? img_src : href + '&_thumbnail=1'});
+
+            return $('<li>').attr({tabindex: 0})
+                .data('url', href)
+                .append($('<span class="img">').append(img))
+                .append($('<span class="name">').text(file.name))
+                .click(function() { ref.file_picker_close($(this).data('url')); })
+                .keydown(function(e) {
+                    if (e.which == 13) {
+                        ref.file_picker_close($(this).data('url'));
+                    }
+                });
+        }
+    };
+
+    this.file_upload_form = function(clone_form)
+    {
+        var hint = clone_form ? $(clone_form).find('.hint').text() : '',
+            form = $('<form id="imageuploadform">').attr({method: 'post', enctype: 'multipart/form-data'});
+        file = $('<input>').attr({name: '_file[]', type: 'file', multiple: true, style: 'opacity:0;height:1px;width:1px'})
+            .change(function() { rcmail.upload_file(form, 'upload'); }),
+        wrapper = $('<div class="upload-form">')
+            .append($('<button>').attr({'class': 'btn btn-secondary attach', href: '#', onclick: "rcmail.upload_input('imageuploadform')"}));
+
+        if (hint)
+            wrapper.prepend($('<div class="hint">').text(hint));
+
+        // clone existing upload form
+        if (clone_form) {
+            file.attr('name', $('input[type="file"]', clone_form).attr('name'));
+            form.attr('action', $(clone_form).attr('action'));
+        }
+
+        form.append(file).append($('<input>').attr({type: 'hidden', name: '_token', value: rcmail.env.request_token}));
+
+        return wrapper.append(form);
+    };
+
+    // Replace pasted image src location with data: URI
+    this.replace_img_src = function(src, id)
+    {
+        if (!window.fetch || !src || !src.match(/^https?:\/\//)) {
+            return;
+        }
+
+        var fetch_params = {
+            referrerPolicy: 'no-referrer'
+        };
+
+        fetch(src, fetch_params).then(function(response) {
+            response.arrayBuffer().then(function(body) {
+                var url, ctype = response.headers.get('content-type'),
+                    u8Buf = new Uint8Array(body),
+                    latinBuf = '';
+
+                u8Buf.forEach(function(byte) { latinBuf += String.fromCharCode(byte); });
+
+                if (ctype && latinBuf) {
+                    url = 'data:' + ctype + ';base64,' + btoa(latinBuf);
+                    $(ref.editor.getBody()).find('img[data-img-id="' + id + '"]').attr({
+                        src: url,
+                        'data-mce-src': url,
+                        'data-img-id': null
+                    });
+                }
+            });
+        });
+    };
 }
diff --git a/program/js/googiespell.js b/program/js/googiespell.js
index 097f494dd..0074aa2a1 100644
--- a/program/js/googiespell.js
+++ b/program/js/googiespell.js
@@ -46,7 +46,7 @@ function GoogieSpell(img_dir, server_url, has_dict)
         var res = [];
         for (var key in arr) { res.push([key]); }
         return res;
-    }
+    };
 
     this.img_dir = img_dir;
     this.server_url = server_url;
@@ -112,841 +112,841 @@ function GoogieSpell(img_dir, server_url, has_dict)
     });
 
 
-this.decorateTextarea = function(id)
-{
-    this.text_area = typeof id === 'string' ? document.getElementById(id) : id;
+    this.decorateTextarea = function(id)
+    {
+        this.text_area = typeof id === 'string' ? document.getElementById(id) : id;
 
-    if (this.text_area) {
-        if (!this.spell_container && this.decoration) {
-            var table = document.createElement('table'),
-                tbody = document.createElement('tbody'),
-                tr = document.createElement('tr'),
-                spell_container = document.createElement('td'),
-                r_width = this.isDefined(this.force_width) ? this.force_width : this.text_area.offsetWidth,
-                r_height = this.isDefined(this.force_height) ? this.force_height : 16;
+        if (this.text_area) {
+            if (!this.spell_container && this.decoration) {
+                var table = document.createElement('table'),
+                    tbody = document.createElement('tbody'),
+                    tr = document.createElement('tr'),
+                    spell_container = document.createElement('td'),
+                    r_width = this.isDefined(this.force_width) ? this.force_width : this.text_area.offsetWidth,
+                    r_height = this.isDefined(this.force_height) ? this.force_height : 16;
 
-            tr.appendChild(spell_container);
-            tbody.appendChild(tr);
-            $(table).append(tbody).insertBefore(this.text_area).width('100%').height(r_height);
-            $(spell_container).height(r_height).width(r_width).css('text-align', 'right');
+                tr.appendChild(spell_container);
+                tbody.appendChild(tr);
+                $(table).append(tbody).insertBefore(this.text_area).width('100%').height(r_height);
+                $(spell_container).height(r_height).width(r_width).css('text-align', 'right');
 
-            this.spell_container = spell_container;
+                this.spell_container = spell_container;
+            }
+
+            this.checkSpellingState();
         }
+        else if (this.report_ta_not_found) {
+            rcmail.alert_dialog('Text area not found');
+        }
+    };
 
-        this.checkSpellingState();
-    }
-    else if (this.report_ta_not_found) {
-        rcmail.alert_dialog('Text area not found');
-    }
-};
+    //////
+    // API Functions (the ones that you can call)
+    /////
+    this.setSpellContainer = function(id)
+    {
+        this.spell_container = typeof id === 'string' ? document.getElementById(id) : id;
+    };
 
-//////
-// API Functions (the ones that you can call)
-/////
-this.setSpellContainer = function(id)
-{
-    this.spell_container = typeof id === 'string' ? document.getElementById(id) : id;
-};
+    this.setLanguages = function(lang_dict)
+    {
+        this.lang_to_word = lang_dict;
+        this.langlist_codes = this.array_keys(lang_dict);
+    };
 
-this.setLanguages = function(lang_dict)
-{
-    this.lang_to_word = lang_dict;
-    this.langlist_codes = this.array_keys(lang_dict);
-};
+    this.setCurrentLanguage = function(lan_code)
+    {
+        GOOGIE_CUR_LANG = lan_code;
 
-this.setCurrentLanguage = function(lan_code)
-{
-    GOOGIE_CUR_LANG = lan_code;
+        //Set cookie
+        rcmail.set_cookie('language', lan_code, false);
+    };
 
-    //Set cookie
-    rcmail.set_cookie('language', lan_code, false);
-};
-
-this.setForceWidthHeight = function(width, height)
-{
+    this.setForceWidthHeight = function(width, height)
+    {
     // Set to null if you want to use one of them
-    this.force_width = width;
-    this.force_height = height;
-};
+        this.force_width = width;
+        this.force_height = height;
+    };
 
-this.setDecoration = function(bool)
-{
-    this.decoration = bool;
-};
+    this.setDecoration = function(bool)
+    {
+        this.decoration = bool;
+    };
 
-this.dontUseCloseButtons = function()
-{
-    this.use_close_btn = false;
-};
+    this.dontUseCloseButtons = function()
+    {
+        this.use_close_btn = false;
+    };
 
-this.appendNewMenuItem = function(name, call_back_fn, checker)
-{
-    this.extra_menu_items.push([name, call_back_fn, checker]);
-};
+    this.appendNewMenuItem = function(name, call_back_fn, checker)
+    {
+        this.extra_menu_items.push([name, call_back_fn, checker]);
+    };
 
-this.setFocus = function()
-{
-    try {
-        this.focus_link_b.focus();
-        this.focus_link_t.focus();
-        return true;
-    }
-    catch(e) {
-        return false;
-    }
-};
+    this.setFocus = function()
+    {
+        try {
+            this.focus_link_b.focus();
+            this.focus_link_t.focus();
+            return true;
+        }
+        catch(e) {
+            return false;
+        }
+    };
 
 
-//////
-// Set functions (internal)
-/////
-this.setStateChanged = function(current_state)
-{
-    this.state = current_state;
-    if (this.spelling_state_observer != null && this.report_state_change)
-        this.spelling_state_observer(current_state, this);
-};
+    //////
+    // Set functions (internal)
+    /////
+    this.setStateChanged = function(current_state)
+    {
+        this.state = current_state;
+        if (this.spelling_state_observer != null && this.report_state_change)
+            this.spelling_state_observer(current_state, this);
+    };
 
-this.setReportStateChange = function(bool)
-{
-    this.report_state_change = bool;
-};
+    this.setReportStateChange = function(bool)
+    {
+        this.report_state_change = bool;
+    };
 
 
-//////
-// Request functions
-/////
-this.getUrl = function()
-{
-    return this.server_url + GOOGIE_CUR_LANG;
-};
+    //////
+    // Request functions
+    /////
+    this.getUrl = function()
+    {
+        return this.server_url + GOOGIE_CUR_LANG;
+    };
 
-this.escapeSpecial = function(val)
-{
-    return val ? val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") : '';
-};
+    this.escapeSpecial = function(val)
+    {
+        return val ? val.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;") : '';
+    };
 
-this.createXMLReq = function (text)
-{
-    return '<?xml version="1.0" encoding="utf-8" ?>'
+    this.createXMLReq = function (text)
+    {
+        return '<?xml version="1.0" encoding="utf-8" ?>'
         + '<spellrequest textalreadyclipped="0" ignoredups="0" ignoredigits="1" ignoreallcaps="1">'
         + '<text>' + text + '</text></spellrequest>';
-};
+    };
 
-this.spellCheck = function(ignore)
-{
-    this.prepare(ignore);
+    this.spellCheck = function(ignore)
+    {
+        this.prepare(ignore);
 
-    var req_text = this.escapeSpecial(this.original_text),
-        ref = this;
+        var req_text = this.escapeSpecial(this.original_text),
+            ref = this;
 
-    $.ajax({ type: 'POST', url: this.getUrl(), data: this.createXMLReq(req_text), dataType: 'text',
-        error: function(o) {
-            if (ref.custom_ajax_error) {
-                ref.custom_ajax_error(ref);
-            }
-            else {
-                rcmail.alert_dialog('An error was encountered on the server. Please try again later.');
-            }
-            if (ref.main_controller) {
-                $(ref.spell_span).remove();
+        $.ajax({ type: 'POST', url: this.getUrl(), data: this.createXMLReq(req_text), dataType: 'text',
+            error: function(o) {
+                if (ref.custom_ajax_error) {
+                    ref.custom_ajax_error(ref);
+                }
+                else {
+                    rcmail.alert_dialog('An error was encountered on the server. Please try again later.');
+                }
+                if (ref.main_controller) {
+                    $(ref.spell_span).remove();
+                    ref.removeIndicator();
+                }
+                ref.checkSpellingState();
+            },
+            success: function(data) {
+                ref.processData(data);
+                if (!ref.results.length) {
+                    if (!ref.custom_no_spelling_error)
+                        ref.flashNoSpellingErrorState();
+                    else
+                        ref.custom_no_spelling_error(ref);
+                }
                 ref.removeIndicator();
             }
-            ref.checkSpellingState();
-        },
-        success: function(data) {
-            ref.processData(data);
-            if (!ref.results.length) {
-                if (!ref.custom_no_spelling_error)
-                    ref.flashNoSpellingErrorState();
-                else
-                    ref.custom_no_spelling_error(ref);
-            }
-            ref.removeIndicator();
-        }
-    });
-};
-
-this.learnWord = function(word, id)
-{
-    word = this.escapeSpecial(word.innerHTML);
-
-    var ref = this,
-        req_text = '<?xml version="1.0" encoding="utf-8" ?><learnword><text>' + word + '</text></learnword>';
-
-    $.ajax({ type: 'POST', url: this.getUrl(), data: req_text, dataType: 'text',
-        error: function(o) {
-            if (ref.custom_ajax_error) {
-                ref.custom_ajax_error(ref);
-            }
-            else {
-                rcmail.alert_dialog('An error was encountered on the server. Please try again later.');
-            }
-        },
-        success: function(data) {
-        }
-    });
-};
-
-
-//////
-// Spell checking functions
-/////
-this.prepare = function(ignore, no_indicator)
-{
-    this.cnt_errors_fixed = 0;
-    this.cnt_errors = 0;
-    this.setStateChanged('checking_spell');
-    this.original_text = '';
-
-    if (!no_indicator && this.main_controller)
-        this.appendIndicator(this.spell_span);
-
-    this.error_links = [];
-    this.ta_scroll_top = this.text_area.scrollTop;
-    this.ignore = ignore;
-
-    var area = $(this.text_area);
-
-    if (area.val() == '' || ignore) {
-        if (!this.custom_no_spelling_error)
-            this.flashNoSpellingErrorState();
-        else
-            this.custom_no_spelling_error(this);
-        this.removeIndicator();
-        return;
-    }
-
-    var height = $(area).css('box-sizing') == 'border-box' ? this.text_area.offsetHeight : $(area).height();
-
-    this.createEditLayer(area.width(), height);
-    this.createErrorWindow();
-
-    $('body').append(this.error_window);
-
-    if (this.main_controller)
-        $(this.spell_span).off('click');
-
-    this.original_text = area.val();
-};
-
-this.parseResult = function(r_text)
-{
-    // Returns an array: result[item] -> ['attrs'], ['suggestions']
-    var re_split_attr_c = /\w+="(\d+|true)"/g,
-        re_split_text = /\t/g,
-        matched_c = r_text.match(/<c[^>]*>[^<]*<\/c>/g),
-        results = [];
-
-    if (matched_c == null)
-        return results;
-
-    for (var i=0, len=matched_c.length; i < len; i++) {
-        var item = [];
-        this.errorFound();
-
-        // Get attributes
-        item['attrs'] = [];
-        var c_attr, val,
-            split_c = matched_c[i].match(re_split_attr_c);
-        for (var j=0; j < split_c.length; j++) {
-            c_attr = split_c[j].split(/=/);
-            val = c_attr[1].replace(/"/g, '');
-            item['attrs'][c_attr[0]] = val != 'true' ? parseInt(val) : val;
-        }
-
-        // Get suggestions
-        item['suggestions'] = [];
-        var only_text = matched_c[i].replace(/<[^>]*>/g, ''),
-            split_t = only_text.split(re_split_text);
-        for (var k=0; k < split_t.length; k++) {
-            if(split_t[k] != '')
-            item['suggestions'].push(split_t[k]);
-        }
-        results.push(item);
-    }
-
-    return results;
-};
-
-this.processData = function(data)
-{
-    this.results = this.parseResult(data);
-    if (this.results.length) {
-        this.showErrorsInIframe();
-        this.resumeEditingState();
-    }
-};
-
-//////
-// Error menu functions
-/////
-this.createErrorWindow = function()
-{
-    this.error_window = document.createElement('div');
-    $(this.error_window).addClass('googie_window popupmenu').attr('googie_action_btn', '1');
-};
-
-this.isErrorWindowShown = function()
-{
-    return $(this.error_window).is(':visible');
-};
-
-this.hideErrorWindow = function()
-{
-    $(this.error_window).hide();
-    $(this.error_window_iframe).hide();
-};
-
-this.updateOriginalText = function(offset, old_value, new_value, id)
-{
-    var part_1 = this.original_text.substring(0, offset),
-        part_2 = this.original_text.substring(offset+old_value.length),
-        add_2_offset = new_value.length - old_value.length;
-
-    this.original_text = part_1 + new_value + part_2;
-    $(this.text_area).val(this.original_text);
-    for (var j=0, len=this.results.length; j<len; j++) {
-        // Don't edit the offset of the current item
-        if (j != id && j > id)
-            this.results[j]['attrs']['o'] += add_2_offset;
-    }
-};
-
-this.saveOldValue = function(elm, old_value) {
-    elm.is_changed = true;
-    elm.old_value = old_value;
-};
-
-this.createListSeparator = function()
-{
-    return $('<li>').html('&nbsp;').attr('googie_action_btn', '1')
-        .css({'cursor': 'default', 'font-size': '3px', 'border-top': '1px solid #ccc', 'padding-top': '3px'})
-        .get(0);
-};
-
-this.correctError = function(id, elm, l_elm, rm_pre_space)
-{
-    var old_value = elm.innerHTML,
-        new_value = l_elm.nodeType == 3 ? l_elm.nodeValue : l_elm.innerHTML,
-        offset = this.results[id]['attrs']['o'];
-
-    if (rm_pre_space) {
-        var pre_length = elm.previousSibling.innerHTML;
-        elm.previousSibling.innerHTML = pre_length.slice(0, pre_length.length-1);
-        old_value = " " + old_value;
-        offset--;
-    }
-
-    this.hideErrorWindow();
-    this.updateOriginalText(offset, old_value, new_value, id);
-
-    $(elm).html(new_value).css('color', 'green').attr('is_corrected', true);
-
-    this.results[id]['attrs']['l'] = new_value.length;
-
-    if (!this.isDefined(elm.old_value))
-        this.saveOldValue(elm, old_value);
-
-    this.errorFixed();
-};
-
-this.ignoreError = function(elm, id)
-{
-    // @TODO: ignore all same words
-    $(elm).removeAttr('class').css('color', '').off();
-    this.hideErrorWindow();
-};
-
-this.showErrorWindow = function(elm, id)
-{
-    if (this.show_menu_observer)
-        this.show_menu_observer(this);
-
-    var ref = this,
-        pos = $(elm).offset(),
-        list = document.createElement('ul');
-
-    $(this.error_window).html('');
-    $(list).addClass('googie_list toolbarmenu').attr('googie_action_btn', '1');
-
-    // Build up the result list
-    var suggestions = this.results[id]['suggestions'],
-        offset = this.results[id]['attrs']['o'],
-        len = this.results[id]['attrs']['l'],
-        item, dummy;
-
-    // [Add to dictionary] button
-    if (this.has_dictionary && !$(elm).attr('is_corrected')) {
-        dummy = $('<a>').text(this.lang_learn_word).addClass('googie_add_to_dict active');
-
-        $('<li>').attr('googie_action_btn', '1').css('cursor', 'default')
-            .mouseover(ref.item_onmouseover)
-            .mouseout(ref.item_onmouseout)
-            .click(function(e) {
-                ref.learnWord(elm, id);
-                ref.ignoreError(elm, id);
-            })
-            .append(dummy)
-            .appendTo(list);
-    }
-
-    for (var i=0, len=suggestions.length; i < len; i++) {
-        dummy = $('<a>').html(suggestions[i]).addClass('active');
-
-        $('<li>').mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
-            .click(function(e) { ref.correctError(id, elm, e.target.firstChild); })
-            .append(dummy)
-            .appendTo(list);
-    }
-
-    // The element is changed, append the revert
-    if (elm.is_changed && elm.innerHTML != elm.old_value) {
-        var old_value = elm.old_value;
-
-        dummy = $('<a>').addClass('googie_list_revert active').html(this.lang_revert + ' ' + old_value);
-
-        $('<li>').mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
-            .click(function(e) {
-                ref.updateOriginalText(offset, elm.innerHTML, old_value, id);
-                $(elm).removeAttr('is_corrected').css('color', '#b91414').html(old_value);
-                ref.hideErrorWindow();
-            })
-            .append(dummy)
-            .appendTo(list);
-    }
-
-    // Append the edit box
-    var edit_row = document.createElement('li'),
-        edit_input = document.createElement('input'),
-        ok_pic = document.createElement('button'),
-        edit_form = document.createElement('form');
-
-    var onsub = function () {
-        if (edit_input.value != '') {
-            if (!ref.isDefined(elm.old_value))
-                ref.saveOldValue(elm, elm.innerHTML);
-
-            ref.updateOriginalText(offset, elm.innerHTML, edit_input.value, id);
-            $(elm).attr('is_corrected', true).css('color', 'green').text(edit_input.value);
-            ref.hideErrorWindow();
-        }
-        return false;
-    };
-
-    $(edit_input).width(120).val($(elm).text()).attr('googie_action_btn', '1');
-    $(edit_row).css('cursor', 'default').attr('googie_action_btn', '1')
-        .on('click', function() { return false; });
-
-    // roundcube modified image use
-    if (this.use_ok_pic) {
-        $('<img>').attr('src', this.img_dir + 'ok.gif')
-            .width(32).height(16)
-            .css({cursor: 'pointer', 'margin-left': '2px', 'margin-right': '2px'})
-            .appendTo(ok_pic);
-    }
-    else {
-        $(ok_pic).text('OK');
-    }
-
-    $(ok_pic).addClass('mainaction save googie_ok_button btn-sm').click(onsub);
-
-    $(edit_form).attr('googie_action_btn', '1')
-        .css({'cursor': 'default', 'white-space': 'nowrap'})
-        .submit(onsub)
-        .append(edit_input)
-        .append(ok_pic)
-        .appendTo(edit_row);
-
-    list.appendChild(edit_row);
-
-    // Append extra menu items
-    if (this.extra_menu_items.length > 0)
-        list.appendChild(this.createListSeparator());
-
-    var loop = function(i) {
-        if (i < ref.extra_menu_items.length) {
-            var e_elm = ref.extra_menu_items[i];
-
-            if (!e_elm[2] || e_elm[2](elm, ref)) {
-                var e_row = document.createElement('tr'),
-                  e_col = document.createElement('td');
-
-                $(e_col).html(e_elm[0])
-                    .mouseover(ref.item_onmouseover)
-                    .mouseout(ref.item_onmouseout)
-                    .click(function() { return e_elm[1](elm, ref) });
-
-                e_row.appendChild(e_col);
-                list.appendChild(e_row);
-            }
-            loop(i+1);
-        }
-    };
-
-    loop(0);
-    loop = null;
-
-    //Close button
-    if (this.use_close_btn) {
-        list.appendChild(this.createCloseButton(this.hideErrorWindow));
-    }
-
-    this.error_window.appendChild(list);
-
-    // roundcube plugin api hook
-    rcmail.triggerEvent('googiespell_create', {obj: this.error_window});
-
-    // calculate and set position
-    var height = $(this.error_window).height(),
-        width = $(this.error_window).width(),
-        pageheight = $(document).height(),
-        pagewidth = $(document).width(),
-        top = pos.top + height + 20 < pageheight ? pos.top + 20 : pos.top - height,
-        left = pos.left + width < pagewidth ? pos.left : pos.left - width;
-
-    if (left < 0) left = 0;
-    if (top < 0) top = 0;
-
-    $(this.error_window).css({'top': top+'px', 'left': left+'px', position: 'absolute'}).show();
-
-    // Dummy for IE - dropdown bug fix
-    if (document.all && !window.opera) {
-        if (!this.error_window_iframe) {
-            var iframe = $('<iframe>').css({'position': 'absolute', 'z-index': -1});
-            $('body').append(iframe);
-            this.error_window_iframe = iframe;
-        }
-
-        $(this.error_window_iframe)
-            .css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft,
-                'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight})
-            .show();
-    }
-};
-
-
-//////
-// Edit layer (the layer where the suggestions are stored)
-//////
-this.createEditLayer = function(width, height)
-{
-    this.edit_layer = document.createElement('div');
-    $(this.edit_layer).addClass('googie_edit_layer').attr('id', 'googie_edit_layer')
-        .width(width).height(height);
-
-    if (this.text_area.nodeName.toLowerCase() != 'input' || $(this.text_area).val() == '') {
-        $(this.edit_layer).css('overflow', 'auto');
-    } else {
-        $(this.edit_layer).css('overflow', 'hidden');
-    }
-
-    var ref = this;
-
-    if (this.edit_layer_dbl_click) {
-        $(this.edit_layer).dblclick(function(e) {
-            if (e.target.className != 'googie_link' && !ref.isErrorWindowShown()) {
-                ref.resumeEditing();
-                var fn1 = function() {
-                    $(ref.text_area).focus();
-                    fn1 = null;
-                };
-                setTimeout(fn1, 10);
-            }
-            return false;
         });
-    }
-};
+    };
 
-this.resumeEditing = function()
-{
-    this.setStateChanged('ready');
+    this.learnWord = function(word, id)
+    {
+        word = this.escapeSpecial(word.innerHTML);
 
-    if (this.edit_layer)
-        this.el_scroll_top = this.edit_layer.scrollTop;
+        var ref = this,
+            req_text = '<?xml version="1.0" encoding="utf-8" ?><learnword><text>' + word + '</text></learnword>';
 
-    this.hideErrorWindow();
+        $.ajax({ type: 'POST', url: this.getUrl(), data: req_text, dataType: 'text',
+            error: function(o) {
+                if (ref.custom_ajax_error) {
+                    ref.custom_ajax_error(ref);
+                }
+                else {
+                    rcmail.alert_dialog('An error was encountered on the server. Please try again later.');
+                }
+            },
+            success: function(data) {
+            }
+        });
+    };
 
-    if (this.main_controller)
-        $(this.spell_span).removeClass().addClass('googie_no_style');
 
-    if (!this.ignore) {
-        if (this.use_focus) {
-            $(this.focus_link_t).remove();
-            $(this.focus_link_b).remove();
+    //////
+    // Spell checking functions
+    /////
+    this.prepare = function(ignore, no_indicator)
+    {
+        this.cnt_errors_fixed = 0;
+        this.cnt_errors = 0;
+        this.setStateChanged('checking_spell');
+        this.original_text = '';
+
+        if (!no_indicator && this.main_controller)
+            this.appendIndicator(this.spell_span);
+
+        this.error_links = [];
+        this.ta_scroll_top = this.text_area.scrollTop;
+        this.ignore = ignore;
+
+        var area = $(this.text_area);
+
+        if (area.val() == '' || ignore) {
+            if (!this.custom_no_spelling_error)
+                this.flashNoSpellingErrorState();
+            else
+                this.custom_no_spelling_error(this);
+            this.removeIndicator();
+            return;
         }
 
-        $(this.edit_layer).remove();
-        $(this.text_area).show();
+        var height = $(area).css('box-sizing') == 'border-box' ? this.text_area.offsetHeight : $(area).height();
 
-        if (this.el_scroll_top != undefined)
-            this.text_area.scrollTop = this.el_scroll_top;
-    }
-    this.checkSpellingState(false);
-};
+        this.createEditLayer(area.width(), height);
+        this.createErrorWindow();
 
-this.createErrorLink = function(text, id)
-{
-    var elm = document.createElement('span'),
-        ref = this,
-        d = function (e) {
-            ref.showErrorWindow(elm, id);
-            d = null;
+        $('body').append(this.error_window);
+
+        if (this.main_controller)
+            $(this.spell_span).off('click');
+
+        this.original_text = area.val();
+    };
+
+    this.parseResult = function(r_text)
+    {
+    // Returns an array: result[item] -> ['attrs'], ['suggestions']
+        var re_split_attr_c = /\w+="(\d+|true)"/g,
+            re_split_text = /\t/g,
+            matched_c = r_text.match(/<c[^>]*>[^<]*<\/c>/g),
+            results = [];
+
+        if (matched_c == null)
+            return results;
+
+        for (var i=0, len=matched_c.length; i < len; i++) {
+            var item = [];
+            this.errorFound();
+
+            // Get attributes
+            item['attrs'] = [];
+            var c_attr, val,
+                split_c = matched_c[i].match(re_split_attr_c);
+            for (var j=0; j < split_c.length; j++) {
+                c_attr = split_c[j].split(/=/);
+                val = c_attr[1].replace(/"/g, '');
+                item['attrs'][c_attr[0]] = val != 'true' ? parseInt(val) : val;
+            }
+
+            // Get suggestions
+            item['suggestions'] = [];
+            var only_text = matched_c[i].replace(/<[^>]*>/g, ''),
+                split_t = only_text.split(re_split_text);
+            for (var k=0; k < split_t.length; k++) {
+                if(split_t[k] != '')
+                    item['suggestions'].push(split_t[k]);
+            }
+            results.push(item);
+        }
+
+        return results;
+    };
+
+    this.processData = function(data)
+    {
+        this.results = this.parseResult(data);
+        if (this.results.length) {
+            this.showErrorsInIframe();
+            this.resumeEditingState();
+        }
+    };
+
+    //////
+    // Error menu functions
+    /////
+    this.createErrorWindow = function()
+    {
+        this.error_window = document.createElement('div');
+        $(this.error_window).addClass('googie_window popupmenu').attr('googie_action_btn', '1');
+    };
+
+    this.isErrorWindowShown = function()
+    {
+        return $(this.error_window).is(':visible');
+    };
+
+    this.hideErrorWindow = function()
+    {
+        $(this.error_window).hide();
+        $(this.error_window_iframe).hide();
+    };
+
+    this.updateOriginalText = function(offset, old_value, new_value, id)
+    {
+        var part_1 = this.original_text.substring(0, offset),
+            part_2 = this.original_text.substring(offset+old_value.length),
+            add_2_offset = new_value.length - old_value.length;
+
+        this.original_text = part_1 + new_value + part_2;
+        $(this.text_area).val(this.original_text);
+        for (var j=0, len=this.results.length; j<len; j++) {
+        // Don't edit the offset of the current item
+            if (j != id && j > id)
+                this.results[j]['attrs']['o'] += add_2_offset;
+        }
+    };
+
+    this.saveOldValue = function(elm, old_value) {
+        elm.is_changed = true;
+        elm.old_value = old_value;
+    };
+
+    this.createListSeparator = function()
+    {
+        return $('<li>').html('&nbsp;').attr('googie_action_btn', '1')
+            .css({'cursor': 'default', 'font-size': '3px', 'border-top': '1px solid #ccc', 'padding-top': '3px'})
+            .get(0);
+    };
+
+    this.correctError = function(id, elm, l_elm, rm_pre_space)
+    {
+        var old_value = elm.innerHTML,
+            new_value = l_elm.nodeType == 3 ? l_elm.nodeValue : l_elm.innerHTML,
+            offset = this.results[id]['attrs']['o'];
+
+        if (rm_pre_space) {
+            var pre_length = elm.previousSibling.innerHTML;
+            elm.previousSibling.innerHTML = pre_length.slice(0, pre_length.length-1);
+            old_value = " " + old_value;
+            offset--;
+        }
+
+        this.hideErrorWindow();
+        this.updateOriginalText(offset, old_value, new_value, id);
+
+        $(elm).html(new_value).css('color', 'green').attr('is_corrected', true);
+
+        this.results[id]['attrs']['l'] = new_value.length;
+
+        if (!this.isDefined(elm.old_value))
+            this.saveOldValue(elm, old_value);
+
+        this.errorFixed();
+    };
+
+    this.ignoreError = function(elm, id)
+    {
+    // @TODO: ignore all same words
+        $(elm).removeAttr('class').css('color', '').off();
+        this.hideErrorWindow();
+    };
+
+    this.showErrorWindow = function(elm, id)
+    {
+        if (this.show_menu_observer)
+            this.show_menu_observer(this);
+
+        var ref = this,
+            pos = $(elm).offset(),
+            list = document.createElement('ul');
+
+        $(this.error_window).html('');
+        $(list).addClass('googie_list toolbarmenu').attr('googie_action_btn', '1');
+
+        // Build up the result list
+        var suggestions = this.results[id]['suggestions'],
+            offset = this.results[id]['attrs']['o'],
+            len = this.results[id]['attrs']['l'],
+            item, dummy;
+
+        // [Add to dictionary] button
+        if (this.has_dictionary && !$(elm).attr('is_corrected')) {
+            dummy = $('<a>').text(this.lang_learn_word).addClass('googie_add_to_dict active');
+
+            $('<li>').attr('googie_action_btn', '1').css('cursor', 'default')
+                .mouseover(ref.item_onmouseover)
+                .mouseout(ref.item_onmouseout)
+                .click(function(e) {
+                    ref.learnWord(elm, id);
+                    ref.ignoreError(elm, id);
+                })
+                .append(dummy)
+                .appendTo(list);
+        }
+
+        for (var i=0, len=suggestions.length; i < len; i++) {
+            dummy = $('<a>').html(suggestions[i]).addClass('active');
+
+            $('<li>').mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
+                .click(function(e) { ref.correctError(id, elm, e.target.firstChild); })
+                .append(dummy)
+                .appendTo(list);
+        }
+
+        // The element is changed, append the revert
+        if (elm.is_changed && elm.innerHTML != elm.old_value) {
+            var old_value = elm.old_value;
+
+            dummy = $('<a>').addClass('googie_list_revert active').html(this.lang_revert + ' ' + old_value);
+
+            $('<li>').mouseover(this.item_onmouseover).mouseout(this.item_onmouseout)
+                .click(function(e) {
+                    ref.updateOriginalText(offset, elm.innerHTML, old_value, id);
+                    $(elm).removeAttr('is_corrected').css('color', '#b91414').html(old_value);
+                    ref.hideErrorWindow();
+                })
+                .append(dummy)
+                .appendTo(list);
+        }
+
+        // Append the edit box
+        var edit_row = document.createElement('li'),
+            edit_input = document.createElement('input'),
+            ok_pic = document.createElement('button'),
+            edit_form = document.createElement('form');
+
+        var onsub = function () {
+            if (edit_input.value != '') {
+                if (!ref.isDefined(elm.old_value))
+                    ref.saveOldValue(elm, elm.innerHTML);
+
+                ref.updateOriginalText(offset, elm.innerHTML, edit_input.value, id);
+                $(elm).attr('is_corrected', true).css('color', 'green').text(edit_input.value);
+                ref.hideErrorWindow();
+            }
             return false;
         };
 
-    $(elm).html(text).addClass('googie_link').click(d).removeAttr('is_corrected')
-        .attr({'googie_action_btn' : '1', 'g_id' : id});
+        $(edit_input).width(120).val($(elm).text()).attr('googie_action_btn', '1');
+        $(edit_row).css('cursor', 'default').attr('googie_action_btn', '1')
+            .on('click', function() { return false; });
 
-    return elm;
-};
-
-this.createPart = function(txt_part)
-{
-    if (txt_part == " ")
-        return document.createTextNode(" ");
-
-    txt_part = this.escapeSpecial(txt_part);
-    txt_part = txt_part.replace(/\n/g, "<br>");
-    txt_part = txt_part.replace(/    /g, " &nbsp;");
-    txt_part = txt_part.replace(/^ /g, "&nbsp;");
-    txt_part = txt_part.replace(/ $/g, "&nbsp;");
-
-    var span = document.createElement('span');
-    $(span).html(txt_part);
-    return span;
-};
-
-this.showErrorsInIframe = function()
-{
-    var output = document.createElement('div'),
-        pointer = 0,
-        results = this.results;
-
-    if (results.length > 0) {
-        for (var i=0, length=results.length; i < length; i++) {
-            var offset = results[i]['attrs']['o'],
-                len = results[i]['attrs']['l'],
-                part_1_text = this.original_text.substring(pointer, offset),
-                part_1 = this.createPart(part_1_text);
-
-            output.appendChild(part_1);
-            pointer += offset - pointer;
-
-            // If the last child was an error, then insert some space
-            var err_link = this.createErrorLink(this.original_text.substr(offset, len), i);
-            this.error_links.push(err_link);
-            output.appendChild(err_link);
-            pointer += len;
-        }
-
-        // Insert the rest of the original text
-        var part_2_text = this.original_text.substr(pointer, this.original_text.length),
-            part_2 = this.createPart(part_2_text);
-
-        output.appendChild(part_2);
-    }
-    else
-        output.innerHTML = this.original_text;
-
-    $(output).css('text-align', 'left');
-
-    var me = this;
-    if (this.custom_item_evaluator)
-        $.map(this.error_links, function(elm){me.custom_item_evaluator(me, elm)});
-
-    $(this.edit_layer).append(output);
-
-    // Hide text area and show edit layer
-    $(this.text_area).hide();
-    $(this.edit_layer).insertBefore(this.text_area);
-
-    if (this.use_focus) {
-        this.focus_link_t = this.createFocusLink('focus_t');
-        this.focus_link_b = this.createFocusLink('focus_b');
-
-        $(this.focus_link_t).insertBefore(this.edit_layer);
-        $(this.focus_link_b).insertAfter(this.edit_layer);
-    }
-
-//    this.edit_layer.scrollTop = this.ta_scroll_top;
-};
-
-this.deHighlightCurSel = function()
-{
-    $(this.lang_cur_elm).removeClass().addClass('googie_list_onout');
-};
-
-this.highlightCurSel = function()
-{
-    if (GOOGIE_CUR_LANG == null)
-        GOOGIE_CUR_LANG = GOOGIE_DEFAULT_LANG;
-    for (var i=0; i < this.lang_elms.length; i++) {
-        if ($(this.lang_elms[i]).attr('googieId') == GOOGIE_CUR_LANG) {
-            this.lang_elms[i].className = 'googie_list_selected';
-            this.lang_cur_elm = this.lang_elms[i];
+        // roundcube modified image use
+        if (this.use_ok_pic) {
+            $('<img>').attr('src', this.img_dir + 'ok.gif')
+                .width(32).height(16)
+                .css({cursor: 'pointer', 'margin-left': '2px', 'margin-right': '2px'})
+                .appendTo(ok_pic);
         }
         else {
-            this.lang_elms[i].className = 'googie_list_onout';
+            $(ok_pic).text('OK');
         }
-    }
-};
 
-this.createSpellDiv = function()
-{
-    var span = document.createElement('span');
+        $(ok_pic).addClass('mainaction save googie_ok_button btn-sm').click(onsub);
 
-    $(span).addClass('googie_check_spelling_link').text(this.lang_chck_spell);
+        $(edit_form).attr('googie_action_btn', '1')
+            .css({'cursor': 'default', 'white-space': 'nowrap'})
+            .submit(onsub)
+            .append(edit_input)
+            .append(ok_pic)
+            .appendTo(edit_row);
 
-    if (this.show_spell_img) {
-        $(span).append(' ').append($('<img>').attr('src', this.img_dir + 'spellc.gif'));
-    }
-    return span;
-};
+        list.appendChild(edit_row);
 
+        // Append extra menu items
+        if (this.extra_menu_items.length > 0)
+            list.appendChild(this.createListSeparator());
 
-//////
-// State functions
-/////
-this.flashNoSpellingErrorState = function(on_finish)
-{
-    this.setStateChanged('no_error_found');
+        var loop = function(i) {
+            if (i < ref.extra_menu_items.length) {
+                var e_elm = ref.extra_menu_items[i];
 
-    var ref = this;
-    if (this.main_controller) {
-        var no_spell_errors;
-        if (on_finish) {
-            var fn = function() {
-                on_finish();
-                ref.checkSpellingState();
-            };
-            no_spell_errors = fn;
+                if (!e_elm[2] || e_elm[2](elm, ref)) {
+                    var e_row = document.createElement('tr'),
+                        e_col = document.createElement('td');
+
+                    $(e_col).html(e_elm[0])
+                        .mouseover(ref.item_onmouseover)
+                        .mouseout(ref.item_onmouseout)
+                        .click(function() { return e_elm[1](elm, ref); });
+
+                    e_row.appendChild(e_col);
+                    list.appendChild(e_row);
+                }
+                loop(i+1);
+            }
+        };
+
+        loop(0);
+        loop = null;
+
+        //Close button
+        if (this.use_close_btn) {
+            list.appendChild(this.createCloseButton(this.hideErrorWindow));
         }
-        else
-            no_spell_errors = function () { ref.checkSpellingState() };
 
-        var rsm = $('<span>').text(this.lang_no_error_found);
+        this.error_window.appendChild(list);
 
-        $(this.switch_lan_pic).hide();
-        $(this.spell_span).empty().append(rsm)
-        .removeClass().addClass('googie_check_spelling_ok');
+        // roundcube plugin api hook
+        rcmail.triggerEvent('googiespell_create', {obj: this.error_window});
 
-        setTimeout(no_spell_errors, 1000);
-    }
-};
+        // calculate and set position
+        var height = $(this.error_window).height(),
+            width = $(this.error_window).width(),
+            pageheight = $(document).height(),
+            pagewidth = $(document).width(),
+            top = pos.top + height + 20 < pageheight ? pos.top + 20 : pos.top - height,
+            left = pos.left + width < pagewidth ? pos.left : pos.left - width;
 
-this.resumeEditingState = function()
-{
-    this.setStateChanged('resume_editing');
+        if (left < 0) left = 0;
+        if (top < 0) top = 0;
 
-    //Change link text to resume
-    if (this.main_controller) {
-        var rsm = $('<span>').text(this.lang_rsm_edt);
-    var ref = this;
+        $(this.error_window).css({'top': top+'px', 'left': left+'px', position: 'absolute'}).show();
 
-        $(this.switch_lan_pic).hide();
-        $(this.spell_span).empty().off().append(rsm)
-            .click(function() { ref.resumeEditing(); })
-            .removeClass().addClass('googie_resume_editing');
-    }
+        // Dummy for IE - dropdown bug fix
+        if (document.all && !window.opera) {
+            if (!this.error_window_iframe) {
+                var iframe = $('<iframe>').css({'position': 'absolute', 'z-index': -1});
+                $('body').append(iframe);
+                this.error_window_iframe = iframe;
+            }
 
-    try { this.edit_layer.scrollTop = this.ta_scroll_top; }
-    catch (e) {};
-};
+            $(this.error_window_iframe)
+                .css({'top': this.error_window.offsetTop, 'left': this.error_window.offsetLeft,
+                    'width': this.error_window.offsetWidth, 'height': this.error_window.offsetHeight})
+                .show();
+        }
+    };
 
-this.checkSpellingState = function(fire)
-{
-    if (fire)
+
+    //////
+    // Edit layer (the layer where the suggestions are stored)
+    //////
+    this.createEditLayer = function(width, height)
+    {
+        this.edit_layer = document.createElement('div');
+        $(this.edit_layer).addClass('googie_edit_layer').attr('id', 'googie_edit_layer')
+            .width(width).height(height);
+
+        if (this.text_area.nodeName.toLowerCase() != 'input' || $(this.text_area).val() == '') {
+            $(this.edit_layer).css('overflow', 'auto');
+        } else {
+            $(this.edit_layer).css('overflow', 'hidden');
+        }
+
+        var ref = this;
+
+        if (this.edit_layer_dbl_click) {
+            $(this.edit_layer).dblclick(function(e) {
+                if (e.target.className != 'googie_link' && !ref.isErrorWindowShown()) {
+                    ref.resumeEditing();
+                    var fn1 = function() {
+                        $(ref.text_area).focus();
+                        fn1 = null;
+                    };
+                    setTimeout(fn1, 10);
+                }
+                return false;
+            });
+        }
+    };
+
+    this.resumeEditing = function()
+    {
         this.setStateChanged('ready');
 
-    this.switch_lan_pic = document.createElement('span');
+        if (this.edit_layer)
+            this.el_scroll_top = this.edit_layer.scrollTop;
 
-    var span_chck = this.createSpellDiv(),
-        ref = this;
+        this.hideErrorWindow();
 
-    if (this.custom_spellcheck_starter)
-        $(span_chck).click(function(e) { ref.custom_spellcheck_starter(); });
-    else {
-        $(span_chck).click(function(e) { ref.spellCheck(); });
-    }
+        if (this.main_controller)
+            $(this.spell_span).removeClass().addClass('googie_no_style');
 
-    if (this.main_controller) {
-        if (this.change_lang_pic_placement == 'left') {
-            $(this.spell_container).empty().append(this.switch_lan_pic).append(' ').append(span_chck);
+        if (!this.ignore) {
+            if (this.use_focus) {
+                $(this.focus_link_t).remove();
+                $(this.focus_link_b).remove();
+            }
+
+            $(this.edit_layer).remove();
+            $(this.text_area).show();
+
+            if (this.el_scroll_top != undefined)
+                this.text_area.scrollTop = this.el_scroll_top;
+        }
+        this.checkSpellingState(false);
+    };
+
+    this.createErrorLink = function(text, id)
+    {
+        var elm = document.createElement('span'),
+            ref = this,
+            d = function (e) {
+                ref.showErrorWindow(elm, id);
+                d = null;
+                return false;
+            };
+
+        $(elm).html(text).addClass('googie_link').click(d).removeAttr('is_corrected')
+            .attr({'googie_action_btn' : '1', 'g_id' : id});
+
+        return elm;
+    };
+
+    this.createPart = function(txt_part)
+    {
+        if (txt_part == " ")
+            return document.createTextNode(" ");
+
+        txt_part = this.escapeSpecial(txt_part);
+        txt_part = txt_part.replace(/\n/g, "<br>");
+        txt_part = txt_part.replace(/    /g, " &nbsp;");
+        txt_part = txt_part.replace(/^ /g, "&nbsp;");
+        txt_part = txt_part.replace(/ $/g, "&nbsp;");
+
+        var span = document.createElement('span');
+        $(span).html(txt_part);
+        return span;
+    };
+
+    this.showErrorsInIframe = function()
+    {
+        var output = document.createElement('div'),
+            pointer = 0,
+            results = this.results;
+
+        if (results.length > 0) {
+            for (var i=0, length=results.length; i < length; i++) {
+                var offset = results[i]['attrs']['o'],
+                    len = results[i]['attrs']['l'],
+                    part_1_text = this.original_text.substring(pointer, offset),
+                    part_1 = this.createPart(part_1_text);
+
+                output.appendChild(part_1);
+                pointer += offset - pointer;
+
+                // If the last child was an error, then insert some space
+                var err_link = this.createErrorLink(this.original_text.substr(offset, len), i);
+                this.error_links.push(err_link);
+                output.appendChild(err_link);
+                pointer += len;
+            }
+
+            // Insert the rest of the original text
+            var part_2_text = this.original_text.substr(pointer, this.original_text.length),
+                part_2 = this.createPart(part_2_text);
+
+            output.appendChild(part_2);
+        }
+        else
+            output.innerHTML = this.original_text;
+
+        $(output).css('text-align', 'left');
+
+        var me = this;
+        if (this.custom_item_evaluator)
+            $.map(this.error_links, function(elm){me.custom_item_evaluator(me, elm);});
+
+        $(this.edit_layer).append(output);
+
+        // Hide text area and show edit layer
+        $(this.text_area).hide();
+        $(this.edit_layer).insertBefore(this.text_area);
+
+        if (this.use_focus) {
+            this.focus_link_t = this.createFocusLink('focus_t');
+            this.focus_link_b = this.createFocusLink('focus_b');
+
+            $(this.focus_link_t).insertBefore(this.edit_layer);
+            $(this.focus_link_b).insertAfter(this.edit_layer);
+        }
+
+        //    this.edit_layer.scrollTop = this.ta_scroll_top;
+    };
+
+    this.deHighlightCurSel = function()
+    {
+        $(this.lang_cur_elm).removeClass().addClass('googie_list_onout');
+    };
+
+    this.highlightCurSel = function()
+    {
+        if (GOOGIE_CUR_LANG == null)
+            GOOGIE_CUR_LANG = GOOGIE_DEFAULT_LANG;
+        for (var i=0; i < this.lang_elms.length; i++) {
+            if ($(this.lang_elms[i]).attr('googieId') == GOOGIE_CUR_LANG) {
+                this.lang_elms[i].className = 'googie_list_selected';
+                this.lang_cur_elm = this.lang_elms[i];
+            }
+            else {
+                this.lang_elms[i].className = 'googie_list_onout';
+            }
+        }
+    };
+
+    this.createSpellDiv = function()
+    {
+        var span = document.createElement('span');
+
+        $(span).addClass('googie_check_spelling_link').text(this.lang_chck_spell);
+
+        if (this.show_spell_img) {
+            $(span).append(' ').append($('<img>').attr('src', this.img_dir + 'spellc.gif'));
+        }
+        return span;
+    };
+
+
+    //////
+    // State functions
+    /////
+    this.flashNoSpellingErrorState = function(on_finish)
+    {
+        this.setStateChanged('no_error_found');
+
+        var ref = this;
+        if (this.main_controller) {
+            var no_spell_errors;
+            if (on_finish) {
+                var fn = function() {
+                    on_finish();
+                    ref.checkSpellingState();
+                };
+                no_spell_errors = fn;
+            }
+            else
+                no_spell_errors = function () { ref.checkSpellingState(); };
+
+            var rsm = $('<span>').text(this.lang_no_error_found);
+
+            $(this.switch_lan_pic).hide();
+            $(this.spell_span).empty().append(rsm)
+                .removeClass().addClass('googie_check_spelling_ok');
+
+            setTimeout(no_spell_errors, 1000);
+        }
+    };
+
+    this.resumeEditingState = function()
+    {
+        this.setStateChanged('resume_editing');
+
+        //Change link text to resume
+        if (this.main_controller) {
+            var rsm = $('<span>').text(this.lang_rsm_edt);
+            var ref = this;
+
+            $(this.switch_lan_pic).hide();
+            $(this.spell_span).empty().off().append(rsm)
+                .click(function() { ref.resumeEditing(); })
+                .removeClass().addClass('googie_resume_editing');
+        }
+
+        try { this.edit_layer.scrollTop = this.ta_scroll_top; }
+        catch (e) {};
+    };
+
+    this.checkSpellingState = function(fire)
+    {
+        if (fire)
+            this.setStateChanged('ready');
+
+        this.switch_lan_pic = document.createElement('span');
+
+        var span_chck = this.createSpellDiv(),
+            ref = this;
+
+        if (this.custom_spellcheck_starter)
+            $(span_chck).click(function(e) { ref.custom_spellcheck_starter(); });
+        else {
+            $(span_chck).click(function(e) { ref.spellCheck(); });
+        }
+
+        if (this.main_controller) {
+            if (this.change_lang_pic_placement == 'left') {
+                $(this.spell_container).empty().append(this.switch_lan_pic).append(' ').append(span_chck);
+            } else {
+                $(this.spell_container).empty().append(span_chck).append(' ').append(this.switch_lan_pic);
+            }
+        }
+
+        this.spell_span = span_chck;
+    };
+
+
+    //////
+    // Misc. functions
+    /////
+    this.isDefined = function(o)
+    {
+        return (o !== undefined && o !== null);
+    };
+
+    this.errorFixed = function()
+    {
+        this.cnt_errors_fixed++;
+        if (this.all_errors_fixed_observer)
+            if (this.cnt_errors_fixed == this.cnt_errors) {
+                this.hideErrorWindow();
+                this.all_errors_fixed_observer();
+            }
+    };
+
+    this.errorFound = function()
+    {
+        this.cnt_errors++;
+    };
+
+    this.createCloseButton = function(c_fn)
+    {
+        return this.createButton(this.lang_close, 'googie_list_close', c_fn);
+    };
+
+    this.createButton = function(name, css_class, c_fn)
+    {
+        var btn_row = document.createElement('tr'),
+            btn = document.createElement('td'),
+            spn_btn;
+
+        if (css_class) {
+            spn_btn = document.createElement('span');
+            $(spn_btn).addClass(css_class).html(name);
         } else {
-            $(this.spell_container).empty().append(span_chck).append(' ').append(this.switch_lan_pic);
+            spn_btn = document.createTextNode(name);
         }
-    }
 
-    this.spell_span = span_chck;
-};
+        $(btn).click(c_fn)
+            .mouseover(this.item_onmouseover)
+            .mouseout(this.item_onmouseout);
 
+        btn.appendChild(spn_btn);
+        btn_row.appendChild(btn);
 
-//////
-// Misc. functions
-/////
-this.isDefined = function(o)
-{
-    return (o !== undefined && o !== null)
-};
+        return btn_row;
+    };
 
-this.errorFixed = function()
-{
-    this.cnt_errors_fixed++;
-    if (this.all_errors_fixed_observer)
-        if (this.cnt_errors_fixed == this.cnt_errors) {
-            this.hideErrorWindow();
-            this.all_errors_fixed_observer();
-        }
-};
-
-this.errorFound = function()
-{
-    this.cnt_errors++;
-};
-
-this.createCloseButton = function(c_fn)
-{
-    return this.createButton(this.lang_close, 'googie_list_close', c_fn);
-};
-
-this.createButton = function(name, css_class, c_fn)
-{
-    var btn_row = document.createElement('tr'),
-        btn = document.createElement('td'),
-        spn_btn;
-
-    if (css_class) {
-        spn_btn = document.createElement('span');
-        $(spn_btn).addClass(css_class).html(name);
-    } else {
-        spn_btn = document.createTextNode(name);
-    }
-
-    $(btn).click(c_fn)
-        .mouseover(this.item_onmouseover)
-        .mouseout(this.item_onmouseout);
-
-    btn.appendChild(spn_btn);
-    btn_row.appendChild(btn);
-
-    return btn_row;
-};
-
-this.removeIndicator = function(elm)
-{
+    this.removeIndicator = function(elm)
+    {
     //$(this.indicator).remove();
     // roundcube mod.
-    if (window.rcmail)
-        rcmail.set_busy(false, null, this.rc_msg_id);
-};
+        if (window.rcmail)
+            rcmail.set_busy(false, null, this.rc_msg_id);
+    };
 
-this.appendIndicator = function(elm)
-{
+    this.appendIndicator = function(elm)
+    {
     // modified by roundcube
-    if (window.rcmail)
-        this.rc_msg_id = rcmail.set_busy(true, 'checking');
-/*
+        if (window.rcmail)
+            this.rc_msg_id = rcmail.set_busy(true, 'checking');
+        /*
     this.indicator = document.createElement('img');
     $(this.indicator).attr('src', this.img_dir + 'indicator.gif')
         .css({'margin-right': '5px', 'text-decoration': 'none'}).width(16).height(16);
@@ -956,30 +956,30 @@ this.appendIndicator = function(elm)
     else
         $('body').append(this.indicator);
 */
-}
+    };
 
-this.createFocusLink = function(name)
-{
-    var link = document.createElement('a');
-    $(link).attr({'href': 'javascript:;', 'name': name});
-    return link;
-};
+    this.createFocusLink = function(name)
+    {
+        var link = document.createElement('a');
+        $(link).attr({'href': 'javascript:;', 'name': name});
+        return link;
+    };
 
-this.item_onmouseover = function(e)
-{
-    if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
-        this.className = 'googie_list_onhover';
-    else
-        this.parentNode.className = 'googie_list_onhover';
-};
+    this.item_onmouseover = function(e)
+    {
+        if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
+            this.className = 'googie_list_onhover';
+        else
+            this.parentNode.className = 'googie_list_onhover';
+    };
 
-this.item_onmouseout = function(e)
-{
-    if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
-        this.className = 'googie_list_onout';
-    else
-        this.parentNode.className = 'googie_list_onout';
-};
+    this.item_onmouseout = function(e)
+    {
+        if (this.className != 'googie_list_revert' && this.className != 'googie_list_close')
+            this.className = 'googie_list_onout';
+        else
+            this.parentNode.className = 'googie_list_onout';
+    };
 
 
 };
diff --git a/program/js/list.js b/program/js/list.js
index 9a2b1a1c6..e7658d602 100644
--- a/program/js/list.js
+++ b/program/js/list.js
@@ -38,1942 +38,1942 @@
  */
 function rcube_list_widget(list, p)
 {
-  // static constants
-  this.ENTER_KEY = 13;
-  this.DELETE_KEY = 46;
-  this.BACKSPACE_KEY = 8;
+    // static constants
+    this.ENTER_KEY = 13;
+    this.DELETE_KEY = 46;
+    this.BACKSPACE_KEY = 8;
 
-  this.list = list ? list : null;
-  this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table';
-  this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i;
-  this.rows = {};
-  this.selection = [];
-  this.rowcount = 0;
-  this.colcount = 0;
+    this.list = list ? list : null;
+    this.tagname = this.list ? this.list.nodeName.toLowerCase() : 'table';
+    this.id_regexp = /^rcmrow([a-z0-9\-_=\+\/]+)/i;
+    this.rows = {};
+    this.selection = [];
+    this.rowcount = 0;
+    this.colcount = 0;
 
-  this.subject_col = 0;
-  this.modkey = 0;
-  this.multiselect = false;
-  this.multiexpand = false;
-  this.multi_selecting = false;
-  this.draggable = false;
-  this.column_movable = false;
-  this.keyboard = false;
-  this.toggleselect = false;
-  this.aria_listbox = false;
-  this.parent_focus = true;
-  this.checkbox_selection = false;
+    this.subject_col = 0;
+    this.modkey = 0;
+    this.multiselect = false;
+    this.multiexpand = false;
+    this.multi_selecting = false;
+    this.draggable = false;
+    this.column_movable = false;
+    this.keyboard = false;
+    this.toggleselect = false;
+    this.aria_listbox = false;
+    this.parent_focus = true;
+    this.checkbox_selection = false;
 
-  this.drag_active = false;
-  this.col_drag_active = false;
-  this.column_fixed = null;
-  this.last_selected = null;
-  this.shift_start = null;
-  this.focused = false;
-  this.drag_mouse_start = null;
-  this.dblclick_time = 500; // default value on MS Windows is 500
-  this.row_init = function(){};  // @deprecated; use list.addEventListener('initrow') instead
+    this.drag_active = false;
+    this.col_drag_active = false;
+    this.column_fixed = null;
+    this.last_selected = null;
+    this.shift_start = null;
+    this.focused = false;
+    this.drag_mouse_start = null;
+    this.dblclick_time = 500; // default value on MS Windows is 500
+    this.row_init = function(){};  // @deprecated; use list.addEventListener('initrow') instead
 
-  this.touch_start_time = 0; // start time of the touch event
-  this.touch_event_time = 500; // maximum time a touch should be considered a left mouse button event, after this its something else (eg contextmenu event)
+    this.touch_start_time = 0; // start time of the touch event
+    this.touch_event_time = 500; // maximum time a touch should be considered a left mouse button event, after this its something else (eg contextmenu event)
 
-  // overwrite default parameters
-  if (p && typeof p === 'object')
-    for (var n in p)
-      this[n] = p[n];
+    // overwrite default parameters
+    if (p && typeof p === 'object')
+        for (var n in p)
+            this[n] = p[n];
 
-  // register this instance
-  rcube_list_widget._instances.push(this);
+    // register this instance
+    rcube_list_widget._instances.push(this);
 };
 
 
 rcube_list_widget.prototype = {
 
 
-/**
+    /**
  * get all message rows from HTML table and init each row
  */
-init: function()
-{
-  if (this.tagname == 'table' && this.list && this.list.tBodies[0]) {
-    this.thead = this.list.tHead;
-    this.tbody = this.list.tBodies[0];
-  }
-  else if (this.tagname != 'table' && this.list) {
-    this.tbody = this.list;
-  }
+    init: function()
+    {
+        if (this.tagname == 'table' && this.list && this.list.tBodies[0]) {
+            this.thead = this.list.tHead;
+            this.tbody = this.list.tBodies[0];
+        }
+        else if (this.tagname != 'table' && this.list) {
+            this.tbody = this.list;
+        }
 
-  if ($(this.list).attr('role') == 'listbox') {
-    this.aria_listbox = true;
-    if (this.multiselect)
-      $(this.list).attr('aria-multiselectable', 'true');
-  }
+        if ($(this.list).attr('role') == 'listbox') {
+            this.aria_listbox = true;
+            if (this.multiselect)
+                $(this.list).attr('aria-multiselectable', 'true');
+        }
 
-  var me = this;
+        var me = this;
 
-  if (this.tbody) {
-    this.rows = {};
-    this.rowcount = 0;
+        if (this.tbody) {
+            this.rows = {};
+            this.rowcount = 0;
 
-    var r, len, rows = this.tbody.childNodes;
+            var r, len, rows = this.tbody.childNodes;
 
-    for (r=0, len=rows.length; r<len; r++) {
-      if (rows[r].nodeType == 1)
-        this.rowcount += this.init_row(rows[r]) ? 1 : 0;
-    }
+            for (r=0, len=rows.length; r<len; r++) {
+                if (rows[r].nodeType == 1)
+                    this.rowcount += this.init_row(rows[r]) ? 1 : 0;
+            }
 
-    this.init_header();
-    this.frame = this.list.parentNode;
+            this.init_header();
+            this.frame = this.list.parentNode;
 
-    // set body events
-    if (this.keyboard) {
-      rcube_event.add_listener({event:'keydown', object:this, method:'key_press'});
+            // set body events
+            if (this.keyboard) {
+                rcube_event.add_listener({event:'keydown', object:this, method:'key_press'});
 
-      // allow the table element to receive focus.
-      $(this.list).attr('tabindex', '0')
-        .on('focus', function(e) { me.focus(e); });
-    }
-  }
+                // allow the table element to receive focus.
+                $(this.list).attr('tabindex', '0')
+                    .on('focus', function(e) { me.focus(e); });
+            }
+        }
 
-  if (this.parent_focus) {
-    this.list.parentNode.onclick = function(e) { me.focus(); };
-  }
+        if (this.parent_focus) {
+            this.list.parentNode.onclick = function(e) { me.focus(); };
+        }
 
-  rcmail.triggerEvent('initlist', { obj: this.list });
+        rcmail.triggerEvent('initlist', { obj: this.list });
 
-  return this;
-},
+        return this;
+    },
 
 
-/**
+    /**
  * Init list row and set mouse events on it
  */
-init_row: function(row)
-{
-  row.uid = this.get_row_uid(row);
+    init_row: function(row)
+    {
+        row.uid = this.get_row_uid(row);
 
-  // make references in internal array and set event handlers
-  if (row && row.uid) {
-    var self = this, uid = row.uid;
-    this.rows[uid] = {uid:uid, id:row.id, obj:row};
+        // make references in internal array and set event handlers
+        if (row && row.uid) {
+            var self = this, uid = row.uid;
+            this.rows[uid] = {uid:uid, id:row.id, obj:row};
 
-    $(row).data('uid', uid)
-      // set eventhandlers to table row (only left-button-clicks in mouseup)
-      .mousedown(function(e) { return self.drag_row(e, this.uid); })
-      .mouseup(function(e) {
-        if (e.which == 1 && !self.drag_active && !$(e.currentTarget).is('.ui-droppable-active'))
-          return self.click_row(e, this.uid);
-        else
-          return true;
-      });
+            $(row).data('uid', uid)
+            // set eventhandlers to table row (only left-button-clicks in mouseup)
+                .mousedown(function(e) { return self.drag_row(e, this.uid); })
+                .mouseup(function(e) {
+                    if (e.which == 1 && !self.drag_active && !$(e.currentTarget).is('.ui-droppable-active'))
+                        return self.click_row(e, this.uid);
+                    else
+                        return true;
+                });
 
-    // for IE and Edge (Trident) differentiate between touch, touch+hold using pointer events rather than touch
-    if ((bw.ie || (bw.edge && bw.vendver < 75)) && bw.pointer) {
-      $(row).on('pointerdown', function(e) {
-          if (e.pointerType == 'touch') {
-            self.touch_start_time = new Date().getTime();
-            return false;
-          }
-        })
-        .on('pointerup', function(e) {
-          if (e.pointerType == 'touch') {
-            var duration = (new Date().getTime() - self.touch_start_time);
-            if (duration <= self.touch_event_time) {
-              self.drag_row(e, this.uid);
-              return self.click_row(e, this.uid);
+            // for IE and Edge (Trident) differentiate between touch, touch+hold using pointer events rather than touch
+            if ((bw.ie || (bw.edge && bw.vendver < 75)) && bw.pointer) {
+                $(row).on('pointerdown', function(e) {
+                    if (e.pointerType == 'touch') {
+                        self.touch_start_time = new Date().getTime();
+                        return false;
+                    }
+                })
+                    .on('pointerup', function(e) {
+                        if (e.pointerType == 'touch') {
+                            var duration = (new Date().getTime() - self.touch_start_time);
+                            if (duration <= self.touch_event_time) {
+                                self.drag_row(e, this.uid);
+                                return self.click_row(e, this.uid);
+                            }
+                        }
+                    });
             }
-          }
-        });
-    }
-    else if (bw.touch && row.addEventListener) {
-      row.addEventListener('touchstart', function(e) {
-        if (e.touches.length == 1) {
-          self.touchmoved = false;
-          self.drag_row(rcube_event.touchevent(e.touches[0]), this.uid);
-          self.touch_start_time = new Date().getTime();
+            else if (bw.touch && row.addEventListener) {
+                row.addEventListener('touchstart', function(e) {
+                    if (e.touches.length == 1) {
+                        self.touchmoved = false;
+                        self.drag_row(rcube_event.touchevent(e.touches[0]), this.uid);
+                        self.touch_start_time = new Date().getTime();
+                    }
+                }, false);
+                row.addEventListener('touchend', function(e) {
+                    if (e.changedTouches.length == 1) {
+                        var duration = (new Date().getTime() - self.touch_start_time);
+                        if (!self.touchmoved && duration <= self.touch_event_time && !self.click_row(rcube_event.touchevent(e.changedTouches[0]), this.uid))
+                            e.preventDefault();
+                    }
+                }, false);
+                row.addEventListener('touchmove', function(e) {
+                    if (e.changedTouches.length == 1) {
+                        self.touchmoved = true;
+                        if (self.drag_active)
+                            e.preventDefault();
+                    }
+                }, false);
+            }
+
+            // label the list row with the subject col as descriptive label
+            if (this.aria_listbox) {
+                var lbl_id = 'l:' + row.id;
+                $(row)
+                    .attr('role', 'option')
+                    .attr('aria-labelledby', lbl_id)
+                    .find(this.col_tagname()).eq(this.subject_column()).attr('id', lbl_id);
+            }
+
+            if (document.all)
+                row.onselectstart = function() { return false; };
+
+            this.row_init(this.rows[uid]);  // legacy support
+            this.triggerEvent('initrow', this.rows[uid]);
+
+            return true;
         }
-      }, false);
-      row.addEventListener('touchend', function(e) {
-        if (e.changedTouches.length == 1) {
-          var duration = (new Date().getTime() - self.touch_start_time);
-          if (!self.touchmoved && duration <= self.touch_event_time && !self.click_row(rcube_event.touchevent(e.changedTouches[0]), this.uid))
-            e.preventDefault();
-        }
-      }, false);
-      row.addEventListener('touchmove', function(e) {
-        if (e.changedTouches.length == 1) {
-          self.touchmoved = true;
-          if (self.drag_active)
-            e.preventDefault();
-        }
-      }, false);
-    }
-
-    // label the list row with the subject col as descriptive label
-    if (this.aria_listbox) {
-      var lbl_id = 'l:' + row.id;
-      $(row)
-        .attr('role', 'option')
-        .attr('aria-labelledby', lbl_id)
-        .find(this.col_tagname()).eq(this.subject_column()).attr('id', lbl_id);
-    }
-
-    if (document.all)
-      row.onselectstart = function() { return false; };
-
-    this.row_init(this.rows[uid]);  // legacy support
-    this.triggerEvent('initrow', this.rows[uid]);
-
-    return true;
-  }
-},
+    },
 
 
-/**
+    /**
  * Init list column headers and set mouse events on them
  */
-init_header: function()
-{
-  if (this.thead) {
-    this.colcount = 0;
+    init_header: function()
+    {
+        if (this.thead) {
+            this.colcount = 0;
 
-    if (this.fixed_header) {  // copy (modified) fixed header back to the actual table
-      $(this.list.tHead).replaceWith($(this.fixed_header).find('thead').clone());
-      $(this.list.tHead).find('th,td').attr('style', '').find('a').attr('tabindex', '-1');  // remove fixed widths
-    }
-    else if (!bw.touch && this.list.className.indexOf('fixedheader') >= 0) {
-      this.init_fixed_header();
-    }
+            if (this.fixed_header) {  // copy (modified) fixed header back to the actual table
+                $(this.list.tHead).replaceWith($(this.fixed_header).find('thead').clone());
+                $(this.list.tHead).find('th,td').attr('style', '').find('a').attr('tabindex', '-1');  // remove fixed widths
+            }
+            else if (!bw.touch && this.list.className.indexOf('fixedheader') >= 0) {
+                this.init_fixed_header();
+            }
 
-    var col, r, p = this;
-    // add events for list columns moving
-    if (this.column_movable && this.thead && this.thead.rows) {
-      for (r=0; r<this.thead.rows[0].cells.length; r++) {
-        if (this.column_fixed == r)
-          continue;
-        col = this.thead.rows[0].cells[r];
-        col.onmousedown = function(e) { return p.drag_column(e, this); };
-        this.colcount++;
-      }
-    }
-  }
-},
+            var col, r, p = this;
+            // add events for list columns moving
+            if (this.column_movable && this.thead && this.thead.rows) {
+                for (r=0; r<this.thead.rows[0].cells.length; r++) {
+                    if (this.column_fixed == r)
+                        continue;
+                    col = this.thead.rows[0].cells[r];
+                    col.onmousedown = function(e) { return p.drag_column(e, this); };
+                    this.colcount++;
+                }
+            }
+        }
+    },
 
-/**
+    /**
  * Set the scrollable parent object for the table's fixed header
  */
-container: window,
+    container: window,
 
-init_fixed_header: function()
-{
-  var clone = $(this.list.tHead).clone();
+    init_fixed_header: function()
+    {
+        var clone = $(this.list.tHead).clone();
 
-  if (!this.fixed_header) {
-    this.fixed_header = $('<table>')
-      .attr('id', this.list.id + '-fixedcopy')
-      .attr('class', this.list.className + ' fixedcopy')
-      .attr('role', 'presentation')
-      .css({ position:'fixed' })
-      .append(clone)
-      .append('<tbody></tbody>');
-    $(this.list).before(this.fixed_header);
+        if (!this.fixed_header) {
+            this.fixed_header = $('<table>')
+                .attr('id', this.list.id + '-fixedcopy')
+                .attr('class', this.list.className + ' fixedcopy')
+                .attr('role', 'presentation')
+                .css({ position:'fixed' })
+                .append(clone)
+                .append('<tbody></tbody>');
+            $(this.list).before(this.fixed_header);
 
-    var me = this;
-    $(window).on('resize', function() { me.resize(); });
-    $(this.container).on('scroll', function() {
-        var w = $(this);
-        me.fixed_header.css({
-          marginLeft: -w.scrollLeft() + 'px',
-          marginTop: -w.scrollTop() + 'px'
+            var me = this;
+            $(window).on('resize', function() { me.resize(); });
+            $(this.container).on('scroll', function() {
+                var w = $(this);
+                me.fixed_header.css({
+                    marginLeft: -w.scrollLeft() + 'px',
+                    marginTop: -w.scrollTop() + 'px'
+                });
+            });
+        }
+        else {
+            $(this.fixed_header).find('thead').replaceWith(clone);
+        }
+
+        // avoid scrolling header links being focused
+        $(this.list.tHead).find('a.sortcol').attr('tabindex', '-1');
+
+        // set tabindex to fixed header sort links
+        clone.find('a.sortcol').attr('tabindex', '0');
+
+        this.thead = clone.get(0);
+        this.resize();
+    },
+
+    resize: function()
+    {
+        if (!this.fixed_header)
+            return;
+
+        var column_widths = [];
+
+        // get column widths from original thead
+        $(this.tbody).parent().find('thead th,thead td').each(function(index) {
+            column_widths[index] = $(this).width();
         });
-      });
-  }
-  else {
-    $(this.fixed_header).find('thead').replaceWith(clone);
-  }
 
-  // avoid scrolling header links being focused
-  $(this.list.tHead).find('a.sortcol').attr('tabindex', '-1');
+        // apply fixed widths to fixed table header
+        $(this.thead).parent().width($(this.tbody).parent().width());
+        $(this.thead).find('th,td').each(function(index) {
+            $(this).width(column_widths[index]);
+        });
 
-  // set tabindex to fixed header sort links
-  clone.find('a.sortcol').attr('tabindex', '0');
+        $(window).scroll();
+    },
 
-  this.thead = clone.get(0);
-  this.resize();
-},
-
-resize: function()
-{
-    if (!this.fixed_header)
-      return;
-
-    var column_widths = [];
-
-    // get column widths from original thead
-    $(this.tbody).parent().find('thead th,thead td').each(function(index) {
-      column_widths[index] = $(this).width();
-    });
-
-    // apply fixed widths to fixed table header
-    $(this.thead).parent().width($(this.tbody).parent().width());
-    $(this.thead).find('th,td').each(function(index) {
-      $(this).width(column_widths[index]);
-    });
-
-    $(window).scroll();
-},
-
-/**
+    /**
  * Remove all list rows
  */
-clear: function(sel)
-{
-  if (this.tagname == 'table') {
-    var tbody = document.createElement('tbody');
-    this.list.insertBefore(tbody, this.tbody);
-    this.list.removeChild(this.list.tBodies[1]);
-    this.tbody = tbody;
-  }
-  else {
-    $(this.row_tagname() + ':not(.thead)', this.tbody).remove();
-  }
+    clear: function(sel)
+    {
+        if (this.tagname == 'table') {
+            var tbody = document.createElement('tbody');
+            this.list.insertBefore(tbody, this.tbody);
+            this.list.removeChild(this.list.tBodies[1]);
+            this.tbody = tbody;
+        }
+        else {
+            $(this.row_tagname() + ':not(.thead)', this.tbody).remove();
+        }
 
-  this.rows = {};
-  this.rowcount = 0;
-  this.last_selected = null;
+        this.rows = {};
+        this.rowcount = 0;
+        this.last_selected = null;
 
-  if (sel)
-    this.clear_selection();
+        if (sel)
+            this.clear_selection();
 
-  // reset scroll position (in Opera)
-  if (this.frame)
-    this.frame.scrollTop = 0;
+        // reset scroll position (in Opera)
+        if (this.frame)
+            this.frame.scrollTop = 0;
 
-  // fix list header after removing any rows
-  this.resize();
-},
+        // fix list header after removing any rows
+        this.resize();
+    },
 
 
-/**
+    /**
  * 'remove' message row from list (just hide it)
  */
-remove_row: function(uid, sel_next)
-{
-  var self = this, node = this.rows[uid] ? this.rows[uid].obj : null;
+    remove_row: function(uid, sel_next)
+    {
+        var self = this, node = this.rows[uid] ? this.rows[uid].obj : null;
 
-  if (!node)
-    return;
+        if (!node)
+            return;
 
-  node.style.display = 'none';
+        node.style.display = 'none';
 
-  // Select next row before deletion, because we need the reference
-  if (sel_next)
-    this.select_next(uid);
+        // Select next row before deletion, because we need the reference
+        if (sel_next)
+            this.select_next(uid);
 
-  delete this.rows[uid];
-  this.rowcount--;
+        delete this.rows[uid];
+        this.rowcount--;
 
-  // fix list header after removing any rows
-  clearTimeout(this.resize_timeout)
-  this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
-},
+        // fix list header after removing any rows
+        clearTimeout(this.resize_timeout);
+        this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
+    },
 
 
-/**
+    /**
  * Add row to the list and initialize it
  */
-insert_row: function(row, before)
-{
-  var self = this, tbody = this.tbody;
+    insert_row: function(row, before)
+    {
+        var self = this, tbody = this.tbody;
 
-  // create a real dom node first
-  if (row.nodeName === undefined) {
-    // for performance reasons use DOM instead of jQuery here
-    var i, e, domcell, col,
-      domrow = document.createElement(this.row_tagname());
+        // create a real dom node first
+        if (row.nodeName === undefined) {
+            // for performance reasons use DOM instead of jQuery here
+            var i, e, domcell, col,
+                domrow = document.createElement(this.row_tagname());
 
-    if (row.id) domrow.id = row.id;
-    if (row.uid) domrow.uid = row.uid;
-    if (row.className) domrow.className = row.className;
-    if (row.style) $.extend(domrow.style, row.style);
+            if (row.id) domrow.id = row.id;
+            if (row.uid) domrow.uid = row.uid;
+            if (row.className) domrow.className = row.className;
+            if (row.style) $.extend(domrow.style, row.style);
 
-    for (i=0; row.cols && i < row.cols.length; i++) {
-      col = row.cols[i];
-      domcell = col.dom;
-      if (!domcell) {
-        domcell = document.createElement(this.col_tagname());
-        if (col.className) domcell.className = col.className;
-        if (col.innerHTML) domcell.innerHTML = col.innerHTML;
-        for (e in col.events)
-          domcell['on' + e] = col.events[e];
-      }
-      domrow.appendChild(domcell);
-    }
+            for (i=0; row.cols && i < row.cols.length; i++) {
+                col = row.cols[i];
+                domcell = col.dom;
+                if (!domcell) {
+                    domcell = document.createElement(this.col_tagname());
+                    if (col.className) domcell.className = col.className;
+                    if (col.innerHTML) domcell.innerHTML = col.innerHTML;
+                    for (e in col.events)
+                        domcell['on' + e] = col.events[e];
+                }
+                domrow.appendChild(domcell);
+            }
 
-    row = domrow;
-  }
+            row = domrow;
+        }
 
-  if (this.checkbox_selection) {
-    this.insert_checkbox(row);
-  }
+        if (this.checkbox_selection) {
+            this.insert_checkbox(row);
+        }
 
-  if (before && tbody.childNodes.length)
-    tbody.insertBefore(row, (typeof before == 'object' && before.parentNode == tbody) ? before : tbody.firstChild);
-  else
-    tbody.appendChild(row);
+        if (before && tbody.childNodes.length)
+            tbody.insertBefore(row, (typeof before == 'object' && before.parentNode == tbody) ? before : tbody.firstChild);
+        else
+            tbody.appendChild(row);
 
-  this.init_row(row);
-  this.rowcount++;
+        this.init_row(row);
+        this.rowcount++;
 
-  // fix list header after adding any rows
-  clearTimeout(this.resize_timeout)
-  this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
-},
+        // fix list header after adding any rows
+        clearTimeout(this.resize_timeout);
+        this.resize_timeout = setTimeout(function() { self.resize(); }, 50);
+    },
 
-/**
+    /**
  * Update existing record
  */
-update_row: function(id, cols, newid, select)
-{
-  var row = this.rows[id];
-  if (!row) return false;
+    update_row: function(id, cols, newid, select)
+    {
+        var row = this.rows[id];
+        if (!row) return false;
 
-  var i, domrow = row.obj;
-  for (i = 0; cols && i < cols.length; i++) {
-    this.get_cell(domrow, i).html(cols[i]);
-  }
+        var i, domrow = row.obj;
+        for (i = 0; cols && i < cols.length; i++) {
+            this.get_cell(domrow, i).html(cols[i]);
+        }
 
-  if (newid) {
-    delete this.rows[id];
-    domrow.uid = newid;
-    domrow.id = 'rcmrow' + newid;
-    this.init_row(domrow);
+        if (newid) {
+            delete this.rows[id];
+            domrow.uid = newid;
+            domrow.id = 'rcmrow' + newid;
+            this.init_row(domrow);
 
-    if (select)
-      this.selection[0] = newid;
+            if (select)
+                this.selection[0] = newid;
 
-    if (this.last_selected == id)
-      this.last_selected = newid;
-  }
-},
+            if (this.last_selected == id)
+                this.last_selected = newid;
+        }
+    },
 
-/**
+    /**
  * Add selection checkbox to the list record
  */
-insert_checkbox: function(row, tag_name)
-{
-  var key, self = this,
-    cell = document.createElement(this.col_tagname(tag_name)),
-    chbox = document.createElement('input');
+    insert_checkbox: function(row, tag_name)
+    {
+        var key, self = this,
+            cell = document.createElement(this.col_tagname(tag_name)),
+            chbox = document.createElement('input');
 
-  chbox.type = 'checkbox';
-  chbox.tabIndex = -1;
-  chbox.onchange = function(e) {
-    self.select_row(row.uid, key || CONTROL_KEY, true);
-    e.stopPropagation();
-    key = null;
-  };
-  chbox.onmousedown = function(e) {
-    key = rcube_event.get_modifier(e);
-  };
+        chbox.type = 'checkbox';
+        chbox.tabIndex = -1;
+        chbox.onchange = function(e) {
+            self.select_row(row.uid, key || CONTROL_KEY, true);
+            e.stopPropagation();
+            key = null;
+        };
+        chbox.onmousedown = function(e) {
+            key = rcube_event.get_modifier(e);
+        };
 
-  cell.className = 'selection';
-  // make the whole cell "touchable" for touch devices
-  cell.onclick = function(e) {
-    if (!$(e.target).is('input')) {
-      key = rcube_event.get_modifier(e);
-      $(chbox).prop('checked', !chbox.checked).change();
-    }
-    e.stopPropagation();
-  };
+        cell.className = 'selection';
+        // make the whole cell "touchable" for touch devices
+        cell.onclick = function(e) {
+            if (!$(e.target).is('input')) {
+                key = rcube_event.get_modifier(e);
+                $(chbox).prop('checked', !chbox.checked).change();
+            }
+            e.stopPropagation();
+        };
 
-  cell.appendChild(chbox);
+        cell.appendChild(chbox);
 
-  row.insertBefore(cell, row.firstChild);
-},
+        row.insertBefore(cell, row.firstChild);
+    },
 
-/**
+    /**
  * Enable checkbox selection
  */
-enable_checkbox_selection: function()
-{
-  this.checkbox_selection = true;
+    enable_checkbox_selection: function()
+    {
+        this.checkbox_selection = true;
 
-  // Add checkbox to existing records if any
-  var r, len, cell, rows,
-    row_tag = this.row_tagname().toUpperCase();
+        // Add checkbox to existing records if any
+        var r, len, cell, rows,
+            row_tag = this.row_tagname().toUpperCase();
 
-  if (this.thead) {
-    rows = this.thead.childNodes;
-    for (r=0, len=rows.length; r<len; r++) {
-      if (rows[r].nodeName == row_tag && (cell = rows[r].firstChild)) {
-        if (cell.className == 'selection')
-          break;
-        this.insert_checkbox(rows[r], 'thead');
-      }
-    }
-  }
+        if (this.thead) {
+            rows = this.thead.childNodes;
+            for (r=0, len=rows.length; r<len; r++) {
+                if (rows[r].nodeName == row_tag && (cell = rows[r].firstChild)) {
+                    if (cell.className == 'selection')
+                        break;
+                    this.insert_checkbox(rows[r], 'thead');
+                }
+            }
+        }
 
-  rows = this.tbody.childNodes;
-  for (r=0, len=rows.length; r<len; r++) {
-    if (rows[r].nodeName == row_tag && (cell = rows[r].firstChild)) {
-      if (cell.className == 'selection')
-        break;
-      this.insert_checkbox(rows[r], 'tbody');
-    }
-  }
-},
+        rows = this.tbody.childNodes;
+        for (r=0, len=rows.length; r<len; r++) {
+            if (rows[r].nodeName == row_tag && (cell = rows[r].firstChild)) {
+                if (cell.className == 'selection')
+                    break;
+                this.insert_checkbox(rows[r], 'tbody');
+            }
+        }
+    },
 
-/**
+    /**
  * Set focus to the list
  */
-focus: function(e)
-{
-  if (this.focused)
-    return;
+    focus: function(e)
+    {
+        if (this.focused)
+            return;
 
-  this.focused = true;
+        this.focused = true;
 
-  if (e)
-    rcube_event.cancel(e);
+        if (e)
+            rcube_event.cancel(e);
 
-  var focus_elem = null;
+        var focus_elem = null;
 
-  if (this.last_selected && this.rows[this.last_selected]) {
-    focus_elem = $(this.rows[this.last_selected].obj).find(this.col_tagname()).eq(this.subject_column()).attr('tabindex', '0');
-  }
+        if (this.last_selected && this.rows[this.last_selected]) {
+            focus_elem = $(this.rows[this.last_selected].obj).find(this.col_tagname()).eq(this.subject_column()).attr('tabindex', '0');
+        }
 
-  // Un-focus already focused elements (#1487123, #1487316, #1488600, #1488620)
-  if (focus_elem && focus_elem.length) {
-    // We now fix this by explicitly assigning focus to a dedicated link element
-    this.focus_noscroll(focus_elem);
-  }
-  else {
-    // It looks that window.focus() does the job for all browsers, but not Firefox (#1489058)
-    $('iframe,:focus:not(body)').blur();
-    window.focus();
-  }
+        // Un-focus already focused elements (#1487123, #1487316, #1488600, #1488620)
+        if (focus_elem && focus_elem.length) {
+            // We now fix this by explicitly assigning focus to a dedicated link element
+            this.focus_noscroll(focus_elem);
+        }
+        else {
+            // It looks that window.focus() does the job for all browsers, but not Firefox (#1489058)
+            $('iframe,:focus:not(body)').blur();
+            window.focus();
+        }
 
-  $(this.list).addClass('focus').removeAttr('tabindex');
+        $(this.list).addClass('focus').removeAttr('tabindex');
 
-  // set internal focus pointer to first row
-  if (!this.last_selected)
-    this.select_first(CONTROL_KEY);
-},
+        // set internal focus pointer to first row
+        if (!this.last_selected)
+            this.select_first(CONTROL_KEY);
+    },
 
 
-/**
+    /**
  * remove focus from the list
  */
-blur: function(e)
-{
-  this.focused = false;
+    blur: function(e)
+    {
+        this.focused = false;
 
-  // avoid the table getting focus right again (on Shift+Tab)
-  var me = this;
-  setTimeout(function() { $(me.list).attr('tabindex', '0'); }, 20);
+        // avoid the table getting focus right again (on Shift+Tab)
+        var me = this;
+        setTimeout(function() { $(me.list).attr('tabindex', '0'); }, 20);
 
-  if (this.last_selected && this.rows[this.last_selected]) {
-    $(this.rows[this.last_selected].obj)
-      .find(this.col_tagname()).eq(this.subject_column()).removeAttr('tabindex');
-  }
+        if (this.last_selected && this.rows[this.last_selected]) {
+            $(this.rows[this.last_selected].obj)
+                .find(this.col_tagname()).eq(this.subject_column()).removeAttr('tabindex');
+        }
 
-  $(this.list).removeClass('focus');
-},
+        $(this.list).removeClass('focus');
+    },
 
-/**
+    /**
  * Focus the given element without scrolling the list container
  */
-focus_noscroll: function(elem)
-{
-  var y = this.frame.scrollTop || this.frame.scrollY;
-  elem.focus();
-  this.frame.scrollTop = y;
-},
+    focus_noscroll: function(elem)
+    {
+        var y = this.frame.scrollTop || this.frame.scrollY;
+        elem.focus();
+        this.frame.scrollTop = y;
+    },
 
 
-/**
+    /**
  * Set/unset the given column as hidden
  */
-hide_column: function(col, hide)
-{
-  var method = hide ? 'addClass' : 'removeClass';
+    hide_column: function(col, hide)
+    {
+        var method = hide ? 'addClass' : 'removeClass';
 
-  if (this.fixed_header)
-    $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.fixed_header)[method]('hidden');
+        if (this.fixed_header)
+            $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.fixed_header)[method]('hidden');
 
-  $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.list)[method]('hidden');
-},
+        $(this.row_tagname()+' '+this.col_tagname()+'.'+col, this.list)[method]('hidden');
+    },
 
 
-/**
+    /**
  * onmousedown-handler of message list column
  */
-drag_column: function(e, col)
-{
-  if (this.colcount > 1) {
-    this.drag_start = true;
-    this.drag_mouse_start = rcube_event.get_mouse_pos(e);
+    drag_column: function(e, col)
+    {
+        if (this.colcount > 1) {
+            this.drag_start = true;
+            this.drag_mouse_start = rcube_event.get_mouse_pos(e);
 
-    rcube_event.add_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
-    rcube_event.add_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
+            rcube_event.add_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
+            rcube_event.add_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
 
-    // enable dragging over iframes
-    this.add_dragfix();
+            // enable dragging over iframes
+            this.add_dragfix();
 
-    // find selected column number
-    for (var i=0; i<this.thead.rows[0].cells.length; i++) {
-      if (col == this.thead.rows[0].cells[i]) {
-        this.selected_column = i;
-        break;
-      }
-    }
-  }
+            // find selected column number
+            for (var i=0; i<this.thead.rows[0].cells.length; i++) {
+                if (col == this.thead.rows[0].cells[i]) {
+                    this.selected_column = i;
+                    break;
+                }
+            }
+        }
 
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * onmousedown-handler of message list row
  */
-drag_row: function(e, id)
-{
-  // don't do anything (another action processed before)
-  if (!this.is_event_target(e))
-    return true;
+    drag_row: function(e, id)
+    {
+        // don't do anything (another action processed before)
+        if (!this.is_event_target(e))
+            return true;
 
-  // handle only left-clicks
-  if (rcube_event.get_button(e) != 0)
-    return true;
+        // handle only left-clicks
+        if (rcube_event.get_button(e) != 0)
+            return true;
 
-  this.in_selection_before = e && e.istouch || this.in_selection(id) ? id : false;
+        this.in_selection_before = e && e.istouch || this.in_selection(id) ? id : false;
 
-  // selects currently unselected row
-  if (!this.in_selection_before) {
-    var mod_key = rcube_event.get_modifier(e);
-    this.select_row(id, mod_key, true);
-  }
+        // selects currently unselected row
+        if (!this.in_selection_before) {
+            var mod_key = rcube_event.get_modifier(e);
+            this.select_row(id, mod_key, true);
+        }
 
-  if (this.draggable && this.selection.length && this.in_selection(id)) {
-    this.drag_start = true;
-    this.drag_mouse_start = rcube_event.get_mouse_pos(e);
+        if (this.draggable && this.selection.length && this.in_selection(id)) {
+            this.drag_start = true;
+            this.drag_mouse_start = rcube_event.get_mouse_pos(e);
 
-    rcube_event.add_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
-    rcube_event.add_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
+            rcube_event.add_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
+            rcube_event.add_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
 
-    if (bw.touch) {
-      rcube_event.add_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
-      rcube_event.add_listener({event:'touchend', object:this, method:'drag_mouse_up'});
-    }
+            if (bw.touch) {
+                rcube_event.add_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
+                rcube_event.add_listener({event:'touchend', object:this, method:'drag_mouse_up'});
+            }
 
-    // enable dragging over iframes
-    this.add_dragfix();
-    this.focus();
-  }
+            // enable dragging over iframes
+            this.add_dragfix();
+            this.focus();
+        }
 
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * onmouseup-handler of message list row
  */
-click_row: function(e, id)
-{
-  // sanity check
-  if (!id || !this.rows[id])
-    return false;
+    click_row: function(e, id)
+    {
+        // sanity check
+        if (!id || !this.rows[id])
+            return false;
 
-  // don't do anything (another action processed before)
-  if (!this.is_event_target(e))
-    return true;
+        // don't do anything (another action processed before)
+        if (!this.is_event_target(e))
+            return true;
 
-  var now = new Date().getTime(),
-    dblclicked = now - this.rows[id].clicked < this.dblclick_time;
+        var now = new Date().getTime(),
+            dblclicked = now - this.rows[id].clicked < this.dblclick_time;
 
-  // unselects currently selected row
-  if (!this.drag_active && !dblclicked && this.in_selection_before == id)
-    this.select_row(id, rcube_event.get_modifier(e), true);
+        // unselects currently selected row
+        if (!this.drag_active && !dblclicked && this.in_selection_before == id)
+            this.select_row(id, rcube_event.get_modifier(e), true);
 
-  this.drag_start = false;
-  this.in_selection_before = false;
+        this.drag_start = false;
+        this.in_selection_before = false;
 
-  // row was double clicked
-  if (this.rowcount && dblclicked && this.in_selection(id)) {
-    this.triggerEvent('dblclick');
-    now = 0;
-  }
-  else
-    this.triggerEvent('click');
+        // row was double clicked
+        if (this.rowcount && dblclicked && this.in_selection(id)) {
+            this.triggerEvent('dblclick');
+            now = 0;
+        }
+        else
+            this.triggerEvent('click');
 
-  if (!this.drag_active) {
-    // remove temp divs
-    this.del_dragfix();
-    rcube_event.cancel(e);
-  }
+        if (!this.drag_active) {
+            // remove temp divs
+            this.del_dragfix();
+            rcube_event.cancel(e);
+        }
 
-  this.rows[id].clicked = now;
-  this.focus();
+        this.rows[id].clicked = now;
+        this.focus();
 
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * Check target of the current event
  */
-is_event_target: function(e)
-{
-  var target = rcube_event.get_target(e),
-    tagname = target.tagName.toLowerCase();
+    is_event_target: function(e)
+    {
+        var target = rcube_event.get_target(e),
+            tagname = target.tagName.toLowerCase();
 
-  return !(target && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && target.onclick) || $(target).data('action-link')));
-},
+        return !(target && (tagname == 'input' || tagname == 'img' || (tagname != 'a' && target.onclick) || $(target).data('action-link')));
+    },
 
 
-/*
+    /*
  * Returns thread root ID for specified row ID
  */
-find_root: function(uid)
-{
-   var r = this.rows[uid];
+    find_root: function(uid)
+    {
+        var r = this.rows[uid];
 
-   if (r && r.parent_uid)
-     return this.find_root(r.parent_uid);
-   else
-     return uid;
-},
+        if (r && r.parent_uid)
+            return this.find_root(r.parent_uid);
+        else
+            return uid;
+    },
 
 
-expand_row: function(e, id)
-{
-  var row = this.rows[id],
-    evtarget = rcube_event.get_target(e),
-    mod_key = rcube_event.get_modifier(e),
-    action = (row.expanded ? 'collapse' : 'expand') + (mod_key == CONTROL_KEY || this.multiexpand ? '_all' : '');
+    expand_row: function(e, id)
+    {
+        var row = this.rows[id],
+            evtarget = rcube_event.get_target(e),
+            mod_key = rcube_event.get_modifier(e),
+            action = (row.expanded ? 'collapse' : 'expand') + (mod_key == CONTROL_KEY || this.multiexpand ? '_all' : '');
 
-  // Don't treat double click on the expando as double click on the message.
-  row.clicked = 0;
+        // Don't treat double click on the expando as double click on the message.
+        row.clicked = 0;
 
-  this[action](row);
-},
+        this[action](row);
+    },
 
-collapse: function(row)
-{
-  var r, depth = row.depth,
-    new_row = row ? row.obj.nextSibling : null;
+    collapse: function(row)
+    {
+        var r, depth = row.depth,
+            new_row = row ? row.obj.nextSibling : null;
 
-  row.expanded = false;
-  this.update_expando(row.id);
-  this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
+        row.expanded = false;
+        this.update_expando(row.id);
+        this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
 
-  while (new_row) {
-    if (new_row.nodeType == 1) {
-      r = this.rows[new_row.uid];
-      if (r && r.depth <= depth)
-        break;
+        while (new_row) {
+            if (new_row.nodeType == 1) {
+                r = this.rows[new_row.uid];
+                if (r && r.depth <= depth)
+                    break;
 
-      $(new_row).css('display', 'none');
-      if (r.expanded) {
-        r.expanded = false;
-        this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
-      }
-    }
-    new_row = new_row.nextSibling;
-  }
-
-  this.resize();
-  this.triggerEvent('listupdate');
-
-  return false;
-},
-
-expand: function(row)
-{
-  var r, p, depth, new_row, last_expanded_parent_depth;
-
-  if (row) {
-    row.expanded = true;
-    depth = row.depth;
-    new_row = row.obj.nextSibling;
-    this.update_expando(row.id, true);
-    this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
-  }
-  else {
-    var tbody = this.tbody;
-    new_row = tbody.firstChild;
-    depth = 0;
-    last_expanded_parent_depth = 0;
-  }
-
-  while (new_row) {
-    if (new_row.nodeType == 1) {
-      r = this.rows[new_row.uid];
-      if (r) {
-        if (row && (!r.depth || r.depth <= depth))
-          break;
-
-        if (r.parent_uid) {
-          p = this.rows[r.parent_uid];
-          if (p && p.expanded) {
-            if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1) {
-              last_expanded_parent_depth = p.depth;
-              $(new_row).css('display', '');
-              r.expanded = true;
-              this.update_expando(r.id, true);
-              this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
+                $(new_row).css('display', 'none');
+                if (r.expanded) {
+                    r.expanded = false;
+                    this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
+                }
             }
-          }
-          else
-            if (row && (! p || p.depth <= depth))
-              break;
+            new_row = new_row.nextSibling;
         }
-      }
-    }
-    new_row = new_row.nextSibling;
-  }
 
-  this.resize();
-  this.triggerEvent('listupdate');
+        this.resize();
+        this.triggerEvent('listupdate');
 
-  return false;
-},
+        return false;
+    },
 
+    expand: function(row)
+    {
+        var r, p, depth, new_row, last_expanded_parent_depth;
 
-collapse_all: function(row)
-{
-  var depth, new_row, r;
-
-  if (row) {
-    row.expanded = false;
-    depth = row.depth;
-    new_row = row.obj.nextSibling;
-    this.update_expando(row.id);
-    this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
-
-    // don't collapse sub-root tree in multiexpand mode
-    if (depth && this.multiexpand)
-      return false;
-  }
-  else {
-    new_row = this.tbody.firstChild;
-    depth = 0;
-  }
-
-  while (new_row) {
-    if (new_row.nodeType == 1) {
-      if (r = this.rows[new_row.uid]) {
-        if (row && (!r.depth || r.depth <= depth))
-          break;
-
-        if (row || r.depth)
-          $(new_row).css('display', 'none');
-        if (r.expanded) {
-          r.expanded = false;
-          if (r.has_children) {
-            this.update_expando(r.id);
-            this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
-          }
+        if (row) {
+            row.expanded = true;
+            depth = row.depth;
+            new_row = row.obj.nextSibling;
+            this.update_expando(row.id, true);
+            this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
         }
-      }
-    }
-    new_row = new_row.nextSibling;
-  }
-
-  this.resize();
-  this.triggerEvent('listupdate');
-
-  return false;
-},
-
-
-expand_all: function(row)
-{
-  var depth, new_row, r;
-
-  if (row) {
-    row.expanded = true;
-    depth = row.depth;
-    new_row = row.obj.nextSibling;
-    this.update_expando(row.id, true);
-    this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
-  }
-  else {
-    new_row = this.tbody.firstChild;
-    depth = 0;
-  }
-
-  while (new_row) {
-    if (new_row.nodeType == 1) {
-      if (r = this.rows[new_row.uid]) {
-        if (row && r.depth <= depth)
-          break;
-
-        $(new_row).css('display', '');
-        if (!r.expanded) {
-          r.expanded = true;
-          if (r.has_children) {
-            this.update_expando(r.id, true);
-            this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
-          }
+        else {
+            var tbody = this.tbody;
+            new_row = tbody.firstChild;
+            depth = 0;
+            last_expanded_parent_depth = 0;
         }
-      }
-    }
-    new_row = new_row.nextSibling;
-  }
 
-  this.resize();
-  this.triggerEvent('listupdate');
+        while (new_row) {
+            if (new_row.nodeType == 1) {
+                r = this.rows[new_row.uid];
+                if (r) {
+                    if (row && (!r.depth || r.depth <= depth))
+                        break;
 
-  return false;
-},
+                    if (r.parent_uid) {
+                        p = this.rows[r.parent_uid];
+                        if (p && p.expanded) {
+                            if ((row && p == row) || last_expanded_parent_depth >= p.depth - 1) {
+                                last_expanded_parent_depth = p.depth;
+                                $(new_row).css('display', '');
+                                r.expanded = true;
+                                this.update_expando(r.id, true);
+                                this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
+                            }
+                        }
+                        else
+                            if (row && (! p || p.depth <= depth))
+                                break;
+                    }
+                }
+            }
+            new_row = new_row.nextSibling;
+        }
+
+        this.resize();
+        this.triggerEvent('listupdate');
+
+        return false;
+    },
 
 
-update_expando: function(id, expanded)
-{
-  var expando = document.getElementById('rcmexpando' + id);
-  if (expando)
-    expando.className = expanded ? 'expanded' : 'collapsed';
-},
+    collapse_all: function(row)
+    {
+        var depth, new_row, r;
 
-get_row_uid: function(row)
-{
-  if (!row)
-    return;
+        if (row) {
+            row.expanded = false;
+            depth = row.depth;
+            new_row = row.obj.nextSibling;
+            this.update_expando(row.id);
+            this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
 
-  if (!row.uid) {
-    var uid = $(row).data('uid');
-    if (uid)
-      row.uid = uid;
-    else if (String(row.id).match(this.id_regexp))
-      row.uid = RegExp.$1;
-  }
+            // don't collapse sub-root tree in multiexpand mode
+            if (depth && this.multiexpand)
+                return false;
+        }
+        else {
+            new_row = this.tbody.firstChild;
+            depth = 0;
+        }
 
-  return row.uid;
-},
+        while (new_row) {
+            if (new_row.nodeType == 1) {
+                if (r = this.rows[new_row.uid]) {
+                    if (row && (!r.depth || r.depth <= depth))
+                        break;
 
-/**
+                    if (row || r.depth)
+                        $(new_row).css('display', 'none');
+                    if (r.expanded) {
+                        r.expanded = false;
+                        if (r.has_children) {
+                            this.update_expando(r.id);
+                            this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
+                        }
+                    }
+                }
+            }
+            new_row = new_row.nextSibling;
+        }
+
+        this.resize();
+        this.triggerEvent('listupdate');
+
+        return false;
+    },
+
+
+    expand_all: function(row)
+    {
+        var depth, new_row, r;
+
+        if (row) {
+            row.expanded = true;
+            depth = row.depth;
+            new_row = row.obj.nextSibling;
+            this.update_expando(row.id, true);
+            this.triggerEvent('expandcollapse', { uid:row.uid, expanded:row.expanded, obj:row.obj });
+        }
+        else {
+            new_row = this.tbody.firstChild;
+            depth = 0;
+        }
+
+        while (new_row) {
+            if (new_row.nodeType == 1) {
+                if (r = this.rows[new_row.uid]) {
+                    if (row && r.depth <= depth)
+                        break;
+
+                    $(new_row).css('display', '');
+                    if (!r.expanded) {
+                        r.expanded = true;
+                        if (r.has_children) {
+                            this.update_expando(r.id, true);
+                            this.triggerEvent('expandcollapse', { uid:r.uid, expanded:r.expanded, obj:new_row });
+                        }
+                    }
+                }
+            }
+            new_row = new_row.nextSibling;
+        }
+
+        this.resize();
+        this.triggerEvent('listupdate');
+
+        return false;
+    },
+
+
+    update_expando: function(id, expanded)
+    {
+        var expando = document.getElementById('rcmexpando' + id);
+        if (expando)
+            expando.className = expanded ? 'expanded' : 'collapsed';
+    },
+
+    get_row_uid: function(row)
+    {
+        if (!row)
+            return;
+
+        if (!row.uid) {
+            var uid = $(row).data('uid');
+            if (uid)
+                row.uid = uid;
+            else if (String(row.id).match(this.id_regexp))
+                row.uid = RegExp.$1;
+        }
+
+        return row.uid;
+    },
+
+    /**
  * get first/next/previous/last rows that are not hidden
  */
-get_next_row: function(uid)
-{
-  if (!this.rowcount)
-    return false;
+    get_next_row: function(uid)
+    {
+        if (!this.rowcount)
+            return false;
 
-  var last_selected_row = this.rows[uid || this.last_selected],
-    new_row = last_selected_row ? last_selected_row.obj.nextSibling : null;
+        var last_selected_row = this.rows[uid || this.last_selected],
+            new_row = last_selected_row ? last_selected_row.obj.nextSibling : null;
 
-  while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
-    new_row = new_row.nextSibling;
+        while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
+            new_row = new_row.nextSibling;
 
-  return new_row;
-},
+        return new_row;
+    },
 
-get_prev_row: function(uid)
-{
-  if (!this.rowcount)
-    return false;
+    get_prev_row: function(uid)
+    {
+        if (!this.rowcount)
+            return false;
 
-  var last_selected_row = this.rows[uid || this.last_selected],
-    new_row = last_selected_row ? last_selected_row.obj.previousSibling : null;
+        var last_selected_row = this.rows[uid || this.last_selected],
+            new_row = last_selected_row ? last_selected_row.obj.previousSibling : null;
 
-  while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
-    new_row = new_row.previousSibling;
+        while (new_row && (new_row.nodeType != 1 || new_row.style.display == 'none'))
+            new_row = new_row.previousSibling;
 
-  return new_row;
-},
+        return new_row;
+    },
 
-get_first_row: function()
-{
-  if (this.rowcount) {
-    var i, uid, rows = this.tbody.childNodes;
+    get_first_row: function()
+    {
+        if (this.rowcount) {
+            var i, uid, rows = this.tbody.childNodes;
 
-    for (i=0; i<rows.length; i++)
-      if (rows[i].id && (uid = this.get_row_uid(rows[i])) && this.rows[uid])
-        return uid;
-  }
+            for (i=0; i<rows.length; i++)
+                if (rows[i].id && (uid = this.get_row_uid(rows[i])) && this.rows[uid])
+                    return uid;
+        }
 
-  return null;
-},
+        return null;
+    },
 
-get_last_row: function()
-{
-  if (this.rowcount) {
-    var i, uid, rows = this.tbody.childNodes;
+    get_last_row: function()
+    {
+        if (this.rowcount) {
+            var i, uid, rows = this.tbody.childNodes;
 
-    for (i=rows.length-1; i>=0; i--)
-      if (rows[i].id && (uid = this.get_row_uid(rows[i])) && this.rows[uid])
-        return uid;
-  }
+            for (i=rows.length-1; i>=0; i--)
+                if (rows[i].id && (uid = this.get_row_uid(rows[i])) && this.rows[uid])
+                    return uid;
+        }
 
-  return null;
-},
+        return null;
+    },
 
-get_next: function()
-{
-  var row;
-  if (row = this.get_next_row()) {
-    return row.uid;
-  }
-},
+    get_next: function()
+    {
+        var row;
+        if (row = this.get_next_row()) {
+            return row.uid;
+        }
+    },
 
-get_prev: function()
-{
-  var row;
-  if (row = this.get_prev_row()) {
-    return row.uid;
-  }
-},
+    get_prev: function()
+    {
+        var row;
+        if (row = this.get_prev_row()) {
+            return row.uid;
+        }
+    },
 
-row_tagname: function()
-{
-  var row_tagnames = { table:'tr', ul:'li', '*':'div' };
-  return row_tagnames[this.tagname] || row_tagnames['*'];
-},
+    row_tagname: function()
+    {
+        var row_tagnames = { table:'tr', ul:'li', '*':'div' };
+        return row_tagnames[this.tagname] || row_tagnames['*'];
+    },
 
-col_tagname: function(tagname)
-{
-  var col_tagnames = { table:'td', thead:'th', tbody:'td', '*':'span' };
-  return col_tagnames[tagname || this.tagname] || col_tagnames['*'];
-},
+    col_tagname: function(tagname)
+    {
+        var col_tagnames = { table:'td', thead:'th', tbody:'td', '*':'span' };
+        return col_tagnames[tagname || this.tagname] || col_tagnames['*'];
+    },
 
-get_cell: function(row, index)
-{
-  return $(this.col_tagname(), row).eq(index + (this.checkbox_selection ? 1 : 0));
-},
+    get_cell: function(row, index)
+    {
+        return $(this.col_tagname(), row).eq(index + (this.checkbox_selection ? 1 : 0));
+    },
 
-/**
+    /**
  * selects or unselects the proper row depending on the modifier key pressed
  */
-select_row: function(id, mod_key, with_mouse)
-{
-  var select_before = this.selection.join(','),
-    in_selection_before = this.in_selection(id);
+    select_row: function(id, mod_key, with_mouse)
+    {
+        var select_before = this.selection.join(','),
+            in_selection_before = this.in_selection(id);
 
-  if (!this.multiselect && with_mouse)
-    mod_key = 0;
+        if (!this.multiselect && with_mouse)
+            mod_key = 0;
 
-  if (!this.shift_start)
-    this.shift_start = id
+        if (!this.shift_start)
+            this.shift_start = id;
 
-  if (!mod_key) {
-    this.shift_start = id;
-    this.highlight_row(id, false);
-    this.multi_selecting = false;
-  }
-  else {
-    switch (mod_key) {
-      case SHIFT_KEY:
-        this.shift_select(id, false);
-        break;
-
-      case CONTROL_KEY:
-        if (with_mouse) {
-          this.shift_start = id;
-          this.highlight_row(id, true);
+        if (!mod_key) {
+            this.shift_start = id;
+            this.highlight_row(id, false);
+            this.multi_selecting = false;
         }
-        break;
+        else {
+            switch (mod_key) {
+                case SHIFT_KEY:
+                    this.shift_select(id, false);
+                    break;
 
-      case CONTROL_SHIFT_KEY:
-        this.shift_select(id, true);
-        break;
+                case CONTROL_KEY:
+                    if (with_mouse) {
+                        this.shift_start = id;
+                        this.highlight_row(id, true);
+                    }
+                    break;
 
-      default:
-        this.highlight_row(id, false);
-        break;
-    }
+                case CONTROL_SHIFT_KEY:
+                    this.shift_select(id, true);
+                    break;
 
-    this.multi_selecting = true;
-  }
+                default:
+                    this.highlight_row(id, false);
+                    break;
+            }
 
-  if (this.last_selected && this.rows[this.last_selected]) {
-    $(this.rows[this.last_selected].obj).removeClass('focused')
-      .find(this.col_tagname()).eq(this.subject_column()).removeAttr('tabindex');
-  }
+            this.multi_selecting = true;
+        }
 
-  // unselect if toggleselect is active and the same row was clicked again
-  if (this.toggleselect && in_selection_before && !mod_key) {
-    this.clear_selection();
-  }
-  // trigger event if selection changed
-  else if (this.selection.join(',') != select_before) {
-    this.triggerEvent('select');
-  }
+        if (this.last_selected && this.rows[this.last_selected]) {
+            $(this.rows[this.last_selected].obj).removeClass('focused')
+                .find(this.col_tagname()).eq(this.subject_column()).removeAttr('tabindex');
+        }
 
-  if (this.rows[id]) {
-    $(this.rows[id].obj).addClass('focused');
-    // set cursor focus to link inside selected row
-    if (this.focused)
-      this.focus_noscroll($(this.rows[id].obj).find(this.col_tagname()).eq(this.subject_column()).attr('tabindex', '0'));
-  }
+        // unselect if toggleselect is active and the same row was clicked again
+        if (this.toggleselect && in_selection_before && !mod_key) {
+            this.clear_selection();
+        }
+        // trigger event if selection changed
+        else if (this.selection.join(',') != select_before) {
+            this.triggerEvent('select');
+        }
 
-  if (!this.selection.length)
-    this.shift_start = null;
+        if (this.rows[id]) {
+            $(this.rows[id].obj).addClass('focused');
+            // set cursor focus to link inside selected row
+            if (this.focused)
+                this.focus_noscroll($(this.rows[id].obj).find(this.col_tagname()).eq(this.subject_column()).attr('tabindex', '0'));
+        }
 
-  this.last_selected = id;
-},
+        if (!this.selection.length)
+            this.shift_start = null;
+
+        this.last_selected = id;
+    },
 
 
-/**
+    /**
  * Alias method for select_row
  */
-select: function(id)
-{
-  this.select_row(id, false);
-  this.scrollto(id);
-},
+    select: function(id)
+    {
+        this.select_row(id, false);
+        this.scrollto(id);
+    },
 
 
-/**
+    /**
  * Select row next to the specified or last selected one
  * Either below or above.
  */
-select_next: function(uid)
-{
-  var new_row = this.get_next_row(uid) || this.get_prev_row(uid);
-  if (new_row)
-    this.select_row(new_row.uid, false, false);
-},
+    select_next: function(uid)
+    {
+        var new_row = this.get_next_row(uid) || this.get_prev_row(uid);
+        if (new_row)
+            this.select_row(new_row.uid, false, false);
+    },
 
 
-/**
+    /**
  * Select first row
  */
-select_first: function(mod_key, noscroll)
-{
-  var row = this.get_first_row();
-  if (row) {
-    this.select_row(row, mod_key, false);
+    select_first: function(mod_key, noscroll)
+    {
+        var row = this.get_first_row();
+        if (row) {
+            this.select_row(row, mod_key, false);
 
-    if (!noscroll)
-      this.scrollto(row);
-  }
-},
+            if (!noscroll)
+                this.scrollto(row);
+        }
+    },
 
 
-/**
+    /**
  * Select last row
  */
-select_last: function(mod_key, noscroll)
-{
-  var row = this.get_last_row();
-  if (row) {
-    this.select_row(row, mod_key, false);
+    select_last: function(mod_key, noscroll)
+    {
+        var row = this.get_last_row();
+        if (row) {
+            this.select_row(row, mod_key, false);
 
-    if (!noscroll)
-      this.scrollto(row);
-  }
-},
+            if (!noscroll)
+                this.scrollto(row);
+        }
+    },
 
 
-/**
+    /**
  * Add all children of the given row to selection
  */
-select_children: function(uid)
-{
-  var i, children = this.row_children(uid), len = children.length;
+    select_children: function(uid)
+    {
+        var i, children = this.row_children(uid), len = children.length;
 
-  for (i=0; i<len; i++)
-    if (!this.in_selection(children[i]))
-      this.select_row(children[i], CONTROL_KEY, true);
-},
+        for (i=0; i<len; i++)
+            if (!this.in_selection(children[i]))
+                this.select_row(children[i], CONTROL_KEY, true);
+    },
 
 
-/**
+    /**
  * Perform selection when shift key is pressed
  */
-shift_select: function(id, control)
-{
-  if (!this.rows[this.shift_start] || !this.selection.length)
-    this.shift_start = id;
+    shift_select: function(id, control)
+    {
+        if (!this.rows[this.shift_start] || !this.selection.length)
+            this.shift_start = id;
 
-  var n, i, j, to_row = this.rows[id],
-    from_rowIndex = this._rowIndex(this.rows[this.shift_start].obj),
-    to_rowIndex = this._rowIndex(to_row.obj);
+        var n, i, j, to_row = this.rows[id],
+            from_rowIndex = this._rowIndex(this.rows[this.shift_start].obj),
+            to_rowIndex = this._rowIndex(to_row.obj);
 
-  // if we're going down the list, and we hit a thread, and it's closed, select the whole thread
-  if (from_rowIndex < to_rowIndex && !to_row.expanded && to_row.has_children)
-    if (to_row = this.rows[(this.row_children(id)).pop()])
-      to_rowIndex = this._rowIndex(to_row.obj);
+        // if we're going down the list, and we hit a thread, and it's closed, select the whole thread
+        if (from_rowIndex < to_rowIndex && !to_row.expanded && to_row.has_children)
+            if (to_row = this.rows[(this.row_children(id)).pop()])
+                to_rowIndex = this._rowIndex(to_row.obj);
 
-  i = ((from_rowIndex < to_rowIndex) ? from_rowIndex : to_rowIndex),
-  j = ((from_rowIndex > to_rowIndex) ? from_rowIndex : to_rowIndex);
+        i = ((from_rowIndex < to_rowIndex) ? from_rowIndex : to_rowIndex),
+        j = ((from_rowIndex > to_rowIndex) ? from_rowIndex : to_rowIndex);
 
-  // iterate through the entire message list
-  for (n in this.rows) {
-    if (this._rowIndex(this.rows[n].obj) >= i && this._rowIndex(this.rows[n].obj) <= j) {
-      if (!this.in_selection(n)) {
-        this.highlight_row(n, true);
-      }
-    }
-    else {
-      if (this.in_selection(n) && !control) {
-        this.highlight_row(n, true);
-      }
-    }
-  }
-},
+        // iterate through the entire message list
+        for (n in this.rows) {
+            if (this._rowIndex(this.rows[n].obj) >= i && this._rowIndex(this.rows[n].obj) <= j) {
+                if (!this.in_selection(n)) {
+                    this.highlight_row(n, true);
+                }
+            }
+            else {
+                if (this.in_selection(n) && !control) {
+                    this.highlight_row(n, true);
+                }
+            }
+        }
+    },
 
 
-/**
+    /**
  * Helper method to emulate the rowIndex property of non-tr elements
  */
-_rowIndex: function(obj)
-{
-  return (obj.rowIndex !== undefined) ? obj.rowIndex : $(obj).prevAll().length;
-},
+    _rowIndex: function(obj)
+    {
+        return (obj.rowIndex !== undefined) ? obj.rowIndex : $(obj).prevAll().length;
+    },
 
-/**
+    /**
  * Check if given id is part of the current selection
  */
-in_selection: function(id, index)
-{
-  for (var n in this.selection)
-    if (this.selection[n] == id)
-      return index ? parseInt(n) : true;
+    in_selection: function(id, index)
+    {
+        for (var n in this.selection)
+            if (this.selection[n] == id)
+                return index ? parseInt(n) : true;
 
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * Select each row in list
  */
-select_all: function(filter)
-{
-  if (!this.rowcount)
-    return false;
+    select_all: function(filter)
+    {
+        if (!this.rowcount)
+            return false;
 
-  // reset but remember selection first
-  var n, select_before = this.selection.join(',');
-  this.selection = [];
+        // reset but remember selection first
+        var n, select_before = this.selection.join(',');
+        this.selection = [];
 
-  for (n in this.rows) {
-    if (!filter || this.rows[n][filter] == true) {
-      this.last_selected = n;
-      this.highlight_row(n, true, true);
-    }
-    else {
-      $(this.rows[n].obj).removeClass('selected').removeAttr('aria-selected');
-    }
-  }
+        for (n in this.rows) {
+            if (!filter || this.rows[n][filter] == true) {
+                this.last_selected = n;
+                this.highlight_row(n, true, true);
+            }
+            else {
+                $(this.rows[n].obj).removeClass('selected').removeAttr('aria-selected');
+            }
+        }
 
-  // trigger event if selection changed
-  if (this.selection.join(',') != select_before)
-    this.triggerEvent('select');
+        // trigger event if selection changed
+        if (this.selection.join(',') != select_before)
+            this.triggerEvent('select');
 
-  this.focus();
+        this.focus();
 
-  return true;
-},
+        return true;
+    },
 
 
-/**
+    /**
  * Invert selection
  */
-invert_selection: function()
-{
-  if (!this.rowcount)
-    return false;
+    invert_selection: function()
+    {
+        if (!this.rowcount)
+            return false;
 
-  // remember old selection
-  var n, select_before = this.selection.join(',');
+        // remember old selection
+        var n, select_before = this.selection.join(',');
 
-  for (n in this.rows)
-    this.highlight_row(n, true);
+        for (n in this.rows)
+            this.highlight_row(n, true);
 
-  // trigger event if selection changed
-  if (this.selection.join(',') != select_before)
-    this.triggerEvent('select');
+        // trigger event if selection changed
+        if (this.selection.join(',') != select_before)
+            this.triggerEvent('select');
 
-  this.focus();
+        this.focus();
 
-  return true;
-},
+        return true;
+    },
 
 
-/**
+    /**
  * Unselect selected row(s)
  */
-clear_selection: function(id, no_event)
-{
-  var n, num_select = this.selection.length;
+    clear_selection: function(id, no_event)
+    {
+        var n, num_select = this.selection.length;
 
-  // one row
-  if (id) {
-    for (n in this.selection)
-      if (this.selection[n] == id) {
-        this.selection.splice(n,1);
-        break;
-      }
-  }
-  // all rows
-  else {
-    for (n in this.selection)
-      if (this.rows[this.selection[n]]) {
-        $(this.rows[this.selection[n]].obj).removeClass('selected').removeAttr('aria-selected');
-      }
+        // one row
+        if (id) {
+            for (n in this.selection)
+                if (this.selection[n] == id) {
+                    this.selection.splice(n, 1);
+                    break;
+                }
+        }
+        // all rows
+        else {
+            for (n in this.selection)
+                if (this.rows[this.selection[n]]) {
+                    $(this.rows[this.selection[n]].obj).removeClass('selected').removeAttr('aria-selected');
+                }
 
-    this.selection = [];
-  }
+            this.selection = [];
+        }
 
-  if (this.checkbox_selection)
-    $(this.row_tagname() + ':not(.selected) > .selection > input:checked', this.list).prop('checked', false);
+        if (this.checkbox_selection)
+            $(this.row_tagname() + ':not(.selected) > .selection > input:checked', this.list).prop('checked', false);
 
-  if (num_select && !this.selection.length && !no_event) {
-    this.triggerEvent('select');
-    this.last_selected = null;
-  }
-},
+        if (num_select && !this.selection.length && !no_event) {
+            this.triggerEvent('select');
+            this.last_selected = null;
+        }
+    },
 
 
-/**
+    /**
  * Getter for the selection array
  */
-get_selection: function(deep)
-{
-  var res = $.merge([], this.selection);
+    get_selection: function(deep)
+    {
+        var res = $.merge([], this.selection);
 
-  var props = {deep: deep, res: res};
-  if (this.triggerEvent('getselection', props) === false)
-    return props.res;
+        var props = {deep: deep, res: res};
+        if (this.triggerEvent('getselection', props) === false)
+            return props.res;
 
-  // return children of selected threads even if only root is selected
-  if (deep !== false && res.length) {
-    for (var uid, uids, i=0, len=res.length; i<len; i++) {
-      uid = res[i];
-      if (this.rows[uid] && this.rows[uid].has_children && !this.rows[uid].expanded) {
-        uids = this.row_children(uid);
-        for (var j=0, uids_len=uids.length; j<uids_len; j++) {
-          uid = uids[j];
-          if (!this.in_selection(uid))
-            res.push(uid);
+        // return children of selected threads even if only root is selected
+        if (deep !== false && res.length) {
+            for (var uid, uids, i=0, len=res.length; i<len; i++) {
+                uid = res[i];
+                if (this.rows[uid] && this.rows[uid].has_children && !this.rows[uid].expanded) {
+                    uids = this.row_children(uid);
+                    for (var j=0, uids_len=uids.length; j<uids_len; j++) {
+                        uid = uids[j];
+                        if (!this.in_selection(uid))
+                            res.push(uid);
+                    }
+                }
+            }
         }
-      }
-    }
-  }
 
-  return res;
-},
+        return res;
+    },
 
 
-/**
+    /**
  * Return the ID if only one row is selected
  */
-get_single_selection: function()
-{
-  var selection = this.get_selection(false);
+    get_single_selection: function()
+    {
+        var selection = this.get_selection(false);
 
-  if (selection.length == 1)
-    return selection[0];
-  else
-    return null;
-},
+        if (selection.length == 1)
+            return selection[0];
+        else
+            return null;
+    },
 
 
-/**
+    /**
  * Highlight/unhighlight a row
  */
-highlight_row: function(id, multiple, norecur)
-{
-  if (!this.rows[id])
-    return;
+    highlight_row: function(id, multiple, norecur)
+    {
+        if (!this.rows[id])
+            return;
 
-  if (!multiple) {
-    if (this.selection.length > 1 || !this.in_selection(id)) {
-      this.clear_selection(null, true);
-      this.selection[0] = id;
-      $(this.rows[id].obj).addClass('selected').attr('aria-selected', 'true');
+        if (!multiple) {
+            if (this.selection.length > 1 || !this.in_selection(id)) {
+                this.clear_selection(null, true);
+                this.selection[0] = id;
+                $(this.rows[id].obj).addClass('selected').attr('aria-selected', 'true');
 
-      if (this.checkbox_selection)
-        $('.selection > input', this.rows[id].obj).prop('checked', true);
-    }
-  }
-  else {
-    var pre, post, p = this.in_selection(id, true);
+                if (this.checkbox_selection)
+                    $('.selection > input', this.rows[id].obj).prop('checked', true);
+            }
+        }
+        else {
+            var pre, post, p = this.in_selection(id, true);
 
-    if (p === false) { // select row
-      this.selection.push(id);
-      $(this.rows[id].obj).addClass('selected').attr('aria-selected', 'true');
+            if (p === false) { // select row
+                this.selection.push(id);
+                $(this.rows[id].obj).addClass('selected').attr('aria-selected', 'true');
 
-      if (this.checkbox_selection)
-        $('.selection > input', this.rows[id].obj).prop('checked', true);
+                if (this.checkbox_selection)
+                    $('.selection > input', this.rows[id].obj).prop('checked', true);
 
-      if (!norecur && !this.rows[id].expanded)
-        this.highlight_children(id, true);
-    }
-    else { // unselect row
-      pre = this.selection.slice(0, p);
-      post = this.selection.slice(p+1, this.selection.length);
+                if (!norecur && !this.rows[id].expanded)
+                    this.highlight_children(id, true);
+            }
+            else { // unselect row
+                pre = this.selection.slice(0, p);
+                post = this.selection.slice(p+1, this.selection.length);
 
-      this.selection = pre.concat(post);
-      $(this.rows[id].obj).removeClass('selected').removeAttr('aria-selected');
+                this.selection = pre.concat(post);
+                $(this.rows[id].obj).removeClass('selected').removeAttr('aria-selected');
 
-      if (this.checkbox_selection)
-        $('.selection > input', this.rows[id].obj).prop('checked', false);
+                if (this.checkbox_selection)
+                    $('.selection > input', this.rows[id].obj).prop('checked', false);
 
-      if (!norecur && !this.rows[id].expanded)
-        this.highlight_children(id, false);
-    }
-  }
-},
+                if (!norecur && !this.rows[id].expanded)
+                    this.highlight_children(id, false);
+            }
+        }
+    },
 
 
-/**
+    /**
  * Highlight/unhighlight all children of the given row
  */
-highlight_children: function(id, status)
-{
-  var i, selected,
-    children = this.row_children(id), len = children.length;
+    highlight_children: function(id, status)
+    {
+        var i, selected,
+            children = this.row_children(id), len = children.length;
 
-  for (i=0; i<len; i++) {
-    selected = this.in_selection(children[i]);
-    if ((status && !selected) || (!status && selected))
-      this.highlight_row(children[i], true, true);
-  }
-},
+        for (i=0; i<len; i++) {
+            selected = this.in_selection(children[i]);
+            if ((status && !selected) || (!status && selected))
+                this.highlight_row(children[i], true, true);
+        }
+    },
 
 
-/**
+    /**
  * Handler for keyboard events
  */
-key_press: function(e)
-{
-  if (!this.focused || $(e.target).is('input,textarea,select'))
-    return true;
+    key_press: function(e)
+    {
+        if (!this.focused || $(e.target).is('input,textarea,select'))
+            return true;
 
-  var keyCode = rcube_event.get_keycode(e),
-    mod_key = rcube_event.get_modifier(e);
+        var keyCode = rcube_event.get_keycode(e),
+            mod_key = rcube_event.get_modifier(e);
 
-  switch (keyCode) {
-    case 37:    // Left arrow
-    case 39:    // Right arrow
-    case 40:    // Up arrow
-    case 38:    // Down arrow
-    case 63233: // "down" in Safari keypress
-    case 63232: // "up" in Safari keypress
-      // Stop propagation so that the browser doesn't scroll
-      rcube_event.cancel(e);
-      return this.use_arrow_key(keyCode, mod_key);
+        switch (keyCode) {
+            case 37:    // Left arrow
+            case 39:    // Right arrow
+            case 40:    // Up arrow
+            case 38:    // Down arrow
+            case 63233: // "down" in Safari keypress
+            case 63232: // "up" in Safari keypress
+                // Stop propagation so that the browser doesn't scroll
+                rcube_event.cancel(e);
+                return this.use_arrow_key(keyCode, mod_key);
 
-    case 32: // Space
-      rcube_event.cancel(e);
-      return this.select_row(this.last_selected, mod_key, true);
+            case 32: // Space
+                rcube_event.cancel(e);
+                return this.select_row(this.last_selected, mod_key, true);
 
-    case 36: // Home
-      this.select_first(mod_key);
-      return rcube_event.cancel(e);
+            case 36: // Home
+                this.select_first(mod_key);
+                return rcube_event.cancel(e);
 
-    case 35: // End
-      this.select_last(mod_key);
-      return rcube_event.cancel(e);
+            case 35: // End
+                this.select_last(mod_key);
+                return rcube_event.cancel(e);
 
-    case 65: // Ctrl + A
-      if (mod_key == CONTROL_KEY && this.multiselect) {
-        this.select_first(null, true);
-        this.select_last(SHIFT_KEY, true);
-        return rcube_event.cancel(e);
-      }
-      break;
+            case 65: // Ctrl + A
+                if (mod_key == CONTROL_KEY && this.multiselect) {
+                    this.select_first(null, true);
+                    this.select_last(SHIFT_KEY, true);
+                    return rcube_event.cancel(e);
+                }
+                break;
 
-    case 27: // Esc
-      if (this.drag_active)
-        return this.drag_mouse_up(e);
+            case 27: // Esc
+                if (this.drag_active)
+                    return this.drag_mouse_up(e);
 
-      if (this.col_drag_active) {
-        this.selected_column = null;
-        return this.column_drag_mouse_up(e);
-      }
+                if (this.col_drag_active) {
+                    this.selected_column = null;
+                    return this.column_drag_mouse_up(e);
+                }
 
-      return rcube_event.cancel(e);
+                return rcube_event.cancel(e);
 
-    case 9: // Tab
-      this.blur();
-      break;
+            case 9: // Tab
+                this.blur();
+                break;
 
-    case 13: // Enter
-      if (!this.selection.length)
-        this.select_row(this.last_selected, mod_key, false);
+            case 13: // Enter
+                if (!this.selection.length)
+                    this.select_row(this.last_selected, mod_key, false);
 
-    default:
-      this.key_pressed = keyCode;
-      this.modkey = mod_key;
-      this.triggerEvent('keypress');
-      this.modkey = 0;
+            default:
+                this.key_pressed = keyCode;
+                this.modkey = mod_key;
+                this.triggerEvent('keypress');
+                this.modkey = 0;
 
-      if (this.key_pressed == this.BACKSPACE_KEY)
-        return rcube_event.cancel(e);
-  }
+                if (this.key_pressed == this.BACKSPACE_KEY)
+                    return rcube_event.cancel(e);
+        }
 
-  return true;
-},
+        return true;
+    },
 
 
-/**
+    /**
  * Special handling method for arrow keys
  */
-use_arrow_key: function(keyCode, mod_key)
-{
-  var new_row, selected_row = this.rows[this.last_selected];
+    use_arrow_key: function(keyCode, mod_key)
+    {
+        var new_row, selected_row = this.rows[this.last_selected];
 
-  if (!selected_row) {
-    // select the first row if none selected yet
-    this.select_first(CONTROL_KEY);
-  }
-  // Safari uses the non-standard keycodes 63232/63233 for up/down, if we're
-  // using the keypress event (but not the keydown or keyup event).
-  else if (keyCode == 40 || keyCode == 63233) // Down arrow
-    new_row = this.get_next_row();
-  else if (keyCode == 38 || keyCode == 63232) // Up arrow
-    new_row = this.get_prev_row();
-  else if (keyCode == 39 && selected_row.has_children) { // Right arrow
-    if (!selected_row.expanded)
-      this.expand_all(selected_row);
-    else {
-      // jump to the first child
-      new_row = this.get_next_row();
-      mod_key = null;
-    }
-  }
-  else if (keyCode == 37) { // Left arrow
-    if (selected_row.expanded && selected_row.has_children && (!selected_row.parent_uid || !this.multiexpand))
-      this.collapse_all(selected_row);
-    else if (selected_row.parent_uid) {
-      // jump to the top-most or closest parent
-      if (mod_key == CONTROL_KEY)
-        new_row = this.rows[this.find_root(selected_row.uid)];
-      else
-        new_row = this.rows[selected_row.parent_uid];
+        if (!selected_row) {
+            // select the first row if none selected yet
+            this.select_first(CONTROL_KEY);
+        }
+        // Safari uses the non-standard keycodes 63232/63233 for up/down, if we're
+        // using the keypress event (but not the keydown or keyup event).
+        else if (keyCode == 40 || keyCode == 63233) // Down arrow
+            new_row = this.get_next_row();
+        else if (keyCode == 38 || keyCode == 63232) // Up arrow
+            new_row = this.get_prev_row();
+        else if (keyCode == 39 && selected_row.has_children) { // Right arrow
+            if (!selected_row.expanded)
+                this.expand_all(selected_row);
+            else {
+                // jump to the first child
+                new_row = this.get_next_row();
+                mod_key = null;
+            }
+        }
+        else if (keyCode == 37) { // Left arrow
+            if (selected_row.expanded && selected_row.has_children && (!selected_row.parent_uid || !this.multiexpand))
+                this.collapse_all(selected_row);
+            else if (selected_row.parent_uid) {
+                // jump to the top-most or closest parent
+                if (mod_key == CONTROL_KEY)
+                    new_row = this.rows[this.find_root(selected_row.uid)];
+                else
+                    new_row = this.rows[selected_row.parent_uid];
 
-      mod_key = null;
-    }
-  }
+                mod_key = null;
+            }
+        }
 
-  if (new_row) {
-    // simulate ctr-key if no rows are selected
-    if (!mod_key && !this.selection.length)
-      mod_key = CONTROL_KEY;
+        if (new_row) {
+            // simulate ctr-key if no rows are selected
+            if (!mod_key && !this.selection.length)
+                mod_key = CONTROL_KEY;
 
-    this.select_row(new_row.uid, mod_key, false);
-    this.scrollto(new_row.uid);
-  }
+            this.select_row(new_row.uid, mod_key, false);
+            this.scrollto(new_row.uid);
+        }
 
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * Try to scroll the list to make the specified row visible
  */
-scrollto: function(id)
-{
-  var row = this.rows[id] ? this.rows[id].obj : null;
+    scrollto: function(id)
+    {
+        var row = this.rows[id] ? this.rows[id].obj : null;
 
-  if (row && this.frame) {
-    var scroll_to = Number(row.offsetTop),
-      head_offset = 0;
+        if (row && this.frame) {
+            var scroll_to = Number(row.offsetTop),
+                head_offset = 0;
 
-    // expand thread if target row is hidden (collapsed)
-    if (!scroll_to && this.rows[id].parent_uid) {
-      var parent = this.find_root(this.rows[id].uid);
-      this.expand_all(this.rows[parent]);
-      scroll_to = Number(row.offsetTop);
-    }
+            // expand thread if target row is hidden (collapsed)
+            if (!scroll_to && this.rows[id].parent_uid) {
+                var parent = this.find_root(this.rows[id].uid);
+                this.expand_all(this.rows[parent]);
+                scroll_to = Number(row.offsetTop);
+            }
 
-    if (this.fixed_header)
-      head_offset = Number(this.thead.offsetHeight);
+            if (this.fixed_header)
+                head_offset = Number(this.thead.offsetHeight);
 
-    // if row is above the frame (or behind header)
-    if (scroll_to < Number(this.frame.scrollTop) + head_offset) {
-      // scroll window so that row isn't behind header
-      this.frame.scrollTop = scroll_to - head_offset;
-    }
-    else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
-      this.frame.scrollTop = (scroll_to + Number(row.offsetHeight)) - Number(this.frame.offsetHeight);
-  }
-},
+            // if row is above the frame (or behind header)
+            if (scroll_to < Number(this.frame.scrollTop) + head_offset) {
+                // scroll window so that row isn't behind header
+                this.frame.scrollTop = scroll_to - head_offset;
+            }
+            else if (scroll_to + Number(row.offsetHeight) > Number(this.frame.scrollTop) + Number(this.frame.offsetHeight))
+                this.frame.scrollTop = (scroll_to + Number(row.offsetHeight)) - Number(this.frame.offsetHeight);
+        }
+    },
 
 
-/**
+    /**
  * Handler for mouse move events
  */
-drag_mouse_move: function(e)
-{
-  // convert touch event
-  if (e.type == 'touchmove') {
-    if (e.touches.length == 1 && e.changedTouches.length == 1)
-      e = rcube_event.touchevent(e.changedTouches[0]);
-    else
-      return rcube_event.cancel(e);
-  }
-
-  if (this.drag_start) {
-    // check mouse movement, of less than 3 pixels, don't start dragging
-    var m = rcube_event.get_mouse_pos(e),
-      limit = 10, selection = [], self = this;
-
-    if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
-      return false;
-
-    // remember dragging start position
-    this.drag_start_pos = {left: m.x, top: m.y};
-
-    // initialize drag layer
-    if (!this.draglayer)
-      this.draglayer = $('<div>').attr('id', 'rcmdraglayer')
-        .css({position: 'absolute', display: 'none', 'z-index': 2000})
-        .appendTo(document.body);
-    else
-      this.draglayer.html('');
-
-    // get selected rows (in display order), don't use this.selection here
-    $(this.row_tagname() + '.selected', this.tbody).each(function() {
-      var uid = self.get_row_uid(this), row = self.rows[uid];
-
-      if (!row || $.inArray(uid, selection) > -1)
-        return;
-
-      selection.push(uid);
-
-      // also handle children of (collapsed) trees for dragging (they might be not selected)
-      if (row.has_children && !row.expanded)
-        $.each(self.row_children(uid), function() {
-          if ($.inArray(this, selection) > -1)
-            return;
-          selection.push(this);
-        });
-
-      // break the loop asap
-      if (selection.length > limit + 1)
-        return false;
-    });
-
-    var row, subject,
-      subject_col = self.subject_column(),
-      subject_func = function(cell) {
-        if (cell) {
-          // remove elements marked with "skip-on-drag" class
-          cell = $(cell).clone();
-          $(cell).find('.skip-on-drag').remove();
+    drag_mouse_move: function(e)
+    {
+        // convert touch event
+        if (e.type == 'touchmove') {
+            if (e.touches.length == 1 && e.changedTouches.length == 1)
+                e = rcube_event.touchevent(e.changedTouches[0]);
+            else
+                return rcube_event.cancel(e);
         }
-        return cell ? cell.text() : '';
-      };
 
-    // append subject (of every row up to the limit) to the drag layer
-    $.each(selection, function(i, uid) {
-      if (i > limit) {
-        self.draglayer.append($('<div>').text('...'));
-        return false;
-      }
+        if (this.drag_start) {
+            // check mouse movement, of less than 3 pixels, don't start dragging
+            var m = rcube_event.get_mouse_pos(e),
+                limit = 10, selection = [], self = this;
 
-      row = self.rows[uid].obj;
-      subject = '';
+            if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
+                return false;
 
-      $(row).children(self.col_tagname()).each(function(n, cell) {
-        if (subject_col < 0 || (subject_col >= 0 && subject_col == n)) {
-          if (subject = subject_func(cell)) {
-            return false;
-          }
+            // remember dragging start position
+            this.drag_start_pos = {left: m.x, top: m.y};
+
+            // initialize drag layer
+            if (!this.draglayer)
+                this.draglayer = $('<div>').attr('id', 'rcmdraglayer')
+                    .css({position: 'absolute', display: 'none', 'z-index': 2000})
+                    .appendTo(document.body);
+            else
+                this.draglayer.html('');
+
+            // get selected rows (in display order), don't use this.selection here
+            $(this.row_tagname() + '.selected', this.tbody).each(function() {
+                var uid = self.get_row_uid(this), row = self.rows[uid];
+
+                if (!row || $.inArray(uid, selection) > -1)
+                    return;
+
+                selection.push(uid);
+
+                // also handle children of (collapsed) trees for dragging (they might be not selected)
+                if (row.has_children && !row.expanded)
+                    $.each(self.row_children(uid), function() {
+                        if ($.inArray(this, selection) > -1)
+                            return;
+                        selection.push(this);
+                    });
+
+                // break the loop asap
+                if (selection.length > limit + 1)
+                    return false;
+            });
+
+            var row, subject,
+                subject_col = self.subject_column(),
+                subject_func = function(cell) {
+                    if (cell) {
+                        // remove elements marked with "skip-on-drag" class
+                        cell = $(cell).clone();
+                        $(cell).find('.skip-on-drag').remove();
+                    }
+                    return cell ? cell.text() : '';
+                };
+
+            // append subject (of every row up to the limit) to the drag layer
+            $.each(selection, function(i, uid) {
+                if (i > limit) {
+                    self.draglayer.append($('<div>').text('...'));
+                    return false;
+                }
+
+                row = self.rows[uid].obj;
+                subject = '';
+
+                $(row).children(self.col_tagname()).each(function(n, cell) {
+                    if (subject_col < 0 || (subject_col >= 0 && subject_col == n)) {
+                        if (subject = subject_func(cell)) {
+                            return false;
+                        }
+                    }
+                });
+
+                // Subject column might be wrong, fallback to .subject
+                if (!subject.length) {
+                    subject = subject_func($(row).children('.subject').first());
+                }
+
+                if (subject.length) {
+                    // remove leading spaces
+                    subject = subject.trim();
+                    // truncate line to 50 characters
+                    subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
+
+                    self.draglayer.append($('<div>').text(subject));
+                }
+            });
+
+            this.draglayer.show();
+            this.drag_active = true;
+            this.triggerEvent('dragstart');
         }
-      });
 
-      // Subject column might be wrong, fallback to .subject
-      if (!subject.length) {
-        subject = subject_func($(row).children('.subject').first());
-      }
+        if (this.drag_active && this.draglayer) {
+            var pos = rcube_event.get_mouse_pos(e);
+            this.draglayer.css({ left:(pos.x+20)+'px', top:(pos.y-5 + (bw.ie ? document.documentElement.scrollTop : 0))+'px' });
+            this.triggerEvent('dragmove', e?e:window.event);
+        }
 
-      if (subject.length) {
-        // remove leading spaces
-        subject = subject.trim();
-        // truncate line to 50 characters
-        subject = (subject.length > 50 ? subject.substring(0, 50) + '...' : subject);
+        this.drag_start = false;
 
-        self.draglayer.append($('<div>').text(subject));
-      }
-    });
-
-    this.draglayer.show();
-    this.drag_active = true;
-    this.triggerEvent('dragstart');
-  }
-
-  if (this.drag_active && this.draglayer) {
-    var pos = rcube_event.get_mouse_pos(e);
-    this.draglayer.css({ left:(pos.x+20)+'px', top:(pos.y-5 + (bw.ie ? document.documentElement.scrollTop : 0))+'px' });
-    this.triggerEvent('dragmove', e?e:window.event);
-  }
-
-  this.drag_start = false;
-
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * Handler for mouse up events
  */
-drag_mouse_up: function(e)
-{
-  document.onmousemove = null;
+    drag_mouse_up: function(e)
+    {
+        document.onmousemove = null;
 
-  if (e.type == 'touchend') {
-    if (e.changedTouches.length != 1)
-      return rcube_event.cancel(e);
-  }
+        if (e.type == 'touchend') {
+            if (e.changedTouches.length != 1)
+                return rcube_event.cancel(e);
+        }
 
-  if (this.draglayer && this.draglayer.is(':visible')) {
-    if (this.drag_start_pos)
-      this.draglayer.animate(this.drag_start_pos, 300, 'swing').hide(20);
-    else
-      this.draglayer.hide();
-  }
+        if (this.draglayer && this.draglayer.is(':visible')) {
+            if (this.drag_start_pos)
+                this.draglayer.animate(this.drag_start_pos, 300, 'swing').hide(20);
+            else
+                this.draglayer.hide();
+        }
 
-  if (this.drag_active)
-    this.focus();
-  this.drag_active = false;
+        if (this.drag_active)
+            this.focus();
+        this.drag_active = false;
 
-  rcube_event.remove_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
-  rcube_event.remove_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
+        rcube_event.remove_listener({event:'mousemove', object:this, method:'drag_mouse_move'});
+        rcube_event.remove_listener({event:'mouseup', object:this, method:'drag_mouse_up'});
 
-  if (bw.touch) {
-    rcube_event.remove_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
-    rcube_event.remove_listener({event:'touchend', object:this, method:'drag_mouse_up'});
-  }
+        if (bw.touch) {
+            rcube_event.remove_listener({event:'touchmove', object:this, method:'drag_mouse_move'});
+            rcube_event.remove_listener({event:'touchend', object:this, method:'drag_mouse_up'});
+        }
 
-  // remove temp divs
-  this.del_dragfix();
+        // remove temp divs
+        this.del_dragfix();
 
-  this.triggerEvent('dragend', e);
+        this.triggerEvent('dragend', e);
 
-  return rcube_event.cancel(e);
-},
+        return rcube_event.cancel(e);
+    },
 
 
-/**
+    /**
  * Handler for mouse move events for dragging list column
  */
-column_drag_mouse_move: function(e)
-{
-  if (this.drag_start) {
-    // check mouse movement, of less than 3 pixels, don't start dragging
-    var i, m = rcube_event.get_mouse_pos(e);
+    column_drag_mouse_move: function(e)
+    {
+        if (this.drag_start) {
+            // check mouse movement, of less than 3 pixels, don't start dragging
+            var i, m = rcube_event.get_mouse_pos(e);
 
-    if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
-      return false;
+            if (!this.drag_mouse_start || (Math.abs(m.x - this.drag_mouse_start.x) < 3 && Math.abs(m.y - this.drag_mouse_start.y) < 3))
+                return false;
 
-    if (!this.col_draglayer) {
-      var lpos = $(this.list).offset(),
-        cells = this.thead.rows[0].cells;
+            if (!this.col_draglayer) {
+                var lpos = $(this.list).offset(),
+                    cells = this.thead.rows[0].cells;
 
-      // fix layer position when list is scrolled
-      lpos.top += this.list.scrollTop + this.list.parentNode.scrollTop;
+                // fix layer position when list is scrolled
+                lpos.top += this.list.scrollTop + this.list.parentNode.scrollTop;
 
-      // create dragging layer
-      this.col_draglayer = $('<div>').attr('id', 'rcmcoldraglayer')
-        .css(lpos).css({ position:'absolute', 'z-index':2001,
-           'background-color':'white', opacity:0.75,
-           height: (this.frame.offsetHeight-2)+'px', width: (this.frame.offsetWidth-2)+'px' })
-        .appendTo(document.body)
-        // ... and column position indicator
-       .append($('<div>').attr('id', 'rcmcolumnindicator')
-          .css({ position:'absolute', 'border-right':'2px dotted #555',
-          'z-index':2002, height: (this.frame.offsetHeight-2)+'px' }));
+                // create dragging layer
+                this.col_draglayer = $('<div>').attr('id', 'rcmcoldraglayer')
+                    .css(lpos).css({ position:'absolute', 'z-index':2001,
+                        'background-color':'white', opacity:0.75,
+                        height: (this.frame.offsetHeight-2)+'px', width: (this.frame.offsetWidth-2)+'px' })
+                    .appendTo(document.body)
+                // ... and column position indicator
+                    .append($('<div>').attr('id', 'rcmcolumnindicator')
+                        .css({ position:'absolute', 'border-right':'2px dotted #555',
+                            'z-index':2002, height: (this.frame.offsetHeight-2)+'px' }));
 
-      this.cols = [];
-      this.list_pos = this.list_min_pos = lpos.left;
-      // save columns positions
-      for (i=0; i<cells.length; i++) {
-        this.cols[i] = cells[i].offsetWidth;
-        if (this.column_fixed !== null && i <= this.column_fixed) {
-          this.list_min_pos += this.cols[i];
+                this.cols = [];
+                this.list_pos = this.list_min_pos = lpos.left;
+                // save columns positions
+                for (i=0; i<cells.length; i++) {
+                    this.cols[i] = cells[i].offsetWidth;
+                    if (this.column_fixed !== null && i <= this.column_fixed) {
+                        this.list_min_pos += this.cols[i];
+                    }
+                }
+            }
+
+            this.col_draglayer.show();
+            this.col_drag_active = true;
+            this.triggerEvent('column_dragstart');
         }
-      }
-    }
 
-    this.col_draglayer.show();
-    this.col_drag_active = true;
-    this.triggerEvent('column_dragstart');
-  }
+        // set column indicator position
+        if (this.col_drag_active && this.col_draglayer) {
+            var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
 
-  // set column indicator position
-  if (this.col_drag_active && this.col_draglayer) {
-    var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
+            for (i=0; i<this.cols.length; i++) {
+                if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
+                    cpos += this.cols[i];
+                else
+                    break;
+            }
 
-    for (i=0; i<this.cols.length; i++) {
-      if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
-        cpos += this.cols[i];
-      else
-        break;
-    }
+            // handle fixed columns on left
+            if (i == 0 && this.list_min_pos > pos.x)
+                cpos = this.list_min_pos - this.list_pos;
+            // empty list needs some assignment
+            else if (!this.list.rowcount && i == this.cols.length)
+                cpos -= 2;
+            $('#rcmcolumnindicator').css({ width: cpos+'px'});
+            this.triggerEvent('column_dragmove', e?e:window.event);
+        }
 
-    // handle fixed columns on left
-    if (i == 0 && this.list_min_pos > pos.x)
-      cpos = this.list_min_pos - this.list_pos;
-    // empty list needs some assignment
-    else if (!this.list.rowcount && i == this.cols.length)
-      cpos -= 2;
-    $('#rcmcolumnindicator').css({ width: cpos+'px'});
-    this.triggerEvent('column_dragmove', e?e:window.event);
-  }
+        this.drag_start = false;
 
-  this.drag_start = false;
-
-  return false;
-},
+        return false;
+    },
 
 
-/**
+    /**
  * Handler for mouse up events for dragging list columns
  */
-column_drag_mouse_up: function(e)
-{
-  document.onmousemove = null;
+    column_drag_mouse_up: function(e)
+    {
+        document.onmousemove = null;
 
-  if (this.col_draglayer) {
-    (this.col_draglayer).remove();
-    this.col_draglayer = null;
-  }
+        if (this.col_draglayer) {
+            (this.col_draglayer).remove();
+            this.col_draglayer = null;
+        }
 
-  rcube_event.remove_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
-  rcube_event.remove_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
+        rcube_event.remove_listener({event:'mousemove', object:this, method:'column_drag_mouse_move'});
+        rcube_event.remove_listener({event:'mouseup', object:this, method:'column_drag_mouse_up'});
 
-  // remove temp divs
-  this.del_dragfix();
+        // remove temp divs
+        this.del_dragfix();
 
-  if (this.col_drag_active) {
-    this.col_drag_active = false;
-    this.focus();
-    this.triggerEvent('column_dragend', e);
+        if (this.col_drag_active) {
+            this.col_drag_active = false;
+            this.focus();
+            this.triggerEvent('column_dragend', e);
 
-    if (this.selected_column !== null && this.cols && this.cols.length) {
-      var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
+            if (this.selected_column !== null && this.cols && this.cols.length) {
+                var i, cpos = 0, pos = rcube_event.get_mouse_pos(e);
 
-      // find destination position
-      for (i=0; i<this.cols.length; i++) {
-        if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
-          cpos += this.cols[i];
-        else
-          break;
-      }
+                // find destination position
+                for (i=0; i<this.cols.length; i++) {
+                    if (pos.x >= this.cols[i]/2 + this.list_pos + cpos)
+                        cpos += this.cols[i];
+                    else
+                        break;
+                }
 
-      if (i != this.selected_column && i != this.selected_column+1) {
-        this.column_replace(this.selected_column, i);
-      }
-    }
-  }
+                if (i != this.selected_column && i != this.selected_column+1) {
+                    this.column_replace(this.selected_column, i);
+                }
+            }
+        }
 
-  return rcube_event.cancel(e);
-},
+        return rcube_event.cancel(e);
+    },
 
 
-/**
+    /**
  * Returns IDs of all rows in a thread (except root) for specified root
  */
-row_children: function(uid)
-{
-  if (!this.rows[uid] || !this.rows[uid].has_children)
-    return [];
+    row_children: function(uid)
+    {
+        if (!this.rows[uid] || !this.rows[uid].has_children)
+            return [];
 
-  var res = [], depth = this.rows[uid].depth,
-    row = this.rows[uid].obj.nextSibling;
+        var res = [], depth = this.rows[uid].depth,
+            row = this.rows[uid].obj.nextSibling;
 
-  while (row) {
-    if (row.nodeType == 1) {
-      if (r = this.rows[row.uid]) {
-        if (!r.depth || r.depth <= depth)
-          break;
-        res.push(r.uid);
-      }
-    }
-    row = row.nextSibling;
-  }
+        while (row) {
+            if (row.nodeType == 1) {
+                if (r = this.rows[row.uid]) {
+                    if (!r.depth || r.depth <= depth)
+                        break;
+                    res.push(r.uid);
+                }
+            }
+            row = row.nextSibling;
+        }
 
-  return res;
-},
+        return res;
+    },
 
 
-/**
+    /**
  * Creates a layer for drag&drop over iframes
  */
-add_dragfix: function()
-{
-  $('iframe').each(function() {
-    $('<div class="iframe-dragdrop-fix"></div>')
-      .css({background: '#fff',
-        width: this.offsetWidth+'px', height: this.offsetHeight+'px',
-        position: 'absolute', opacity: '0.001', zIndex: 1000
-      })
-      .css($(this).offset())
-      .appendTo(document.body);
-  });
-},
+    add_dragfix: function()
+    {
+        $('iframe').each(function() {
+            $('<div class="iframe-dragdrop-fix"></div>')
+                .css({background: '#fff',
+                    width: this.offsetWidth+'px', height: this.offsetHeight+'px',
+                    position: 'absolute', opacity: '0.001', zIndex: 1000
+                })
+                .css($(this).offset())
+                .appendTo(document.body);
+        });
+    },
 
 
-/**
+    /**
  * Removes the layer for drag&drop over iframes
  */
-del_dragfix: function()
-{
-  $('div.iframe-dragdrop-fix').remove();
-},
+    del_dragfix: function()
+    {
+        $('div.iframe-dragdrop-fix').remove();
+    },
 
 
-/**
+    /**
  * Replaces two columns
  */
-column_replace: function(from, to)
-{
-  // only supported for <table> lists
-  if (!this.thead || !this.thead.rows)
-    return;
+    column_replace: function(from, to)
+    {
+        // only supported for <table> lists
+        if (!this.thead || !this.thead.rows)
+            return;
 
-  var len, cells = this.thead.rows[0].cells,
-    elem = cells[from],
-    before = cells[to],
-    td = document.createElement('td');
+        var len, cells = this.thead.rows[0].cells,
+            elem = cells[from],
+            before = cells[to],
+            td = document.createElement('td');
 
-  // replace header cells
-  if (before)
-    cells[0].parentNode.insertBefore(td, before);
-  else
-    cells[0].parentNode.appendChild(td);
-  cells[0].parentNode.replaceChild(elem, td);
+        // replace header cells
+        if (before)
+            cells[0].parentNode.insertBefore(td, before);
+        else
+            cells[0].parentNode.appendChild(td);
+        cells[0].parentNode.replaceChild(elem, td);
 
-  // replace list cells
-  for (r=0, len=this.tbody.rows.length; r<len; r++) {
-    row = this.tbody.rows[r];
+        // replace list cells
+        for (r=0, len=this.tbody.rows.length; r<len; r++) {
+            row = this.tbody.rows[r];
 
-    elem = row.cells[from];
-    before = row.cells[to];
-    td = document.createElement('td');
+            elem = row.cells[from];
+            before = row.cells[to];
+            td = document.createElement('td');
 
-    if (before)
-      row.insertBefore(td, before);
-    else
-      row.appendChild(td);
-    row.replaceChild(elem, td);
-  }
+            if (before)
+                row.insertBefore(td, before);
+            else
+                row.appendChild(td);
+            row.replaceChild(elem, td);
+        }
 
-  // update subject column position
-  if (this.subject_col == from)
-    this.subject_col = to > from ? to - 1 : to;
-  else if (this.subject_col < from && to <= this.subject_col)
-    this.subject_col++;
-  else if (this.subject_col > from && to >= this.subject_col)
-    this.subject_col--;
+        // update subject column position
+        if (this.subject_col == from)
+            this.subject_col = to > from ? to - 1 : to;
+        else if (this.subject_col < from && to <= this.subject_col)
+            this.subject_col++;
+        else if (this.subject_col > from && to >= this.subject_col)
+            this.subject_col--;
 
-  if (this.fixed_header)
-    this.init_header();
+        if (this.fixed_header)
+            this.init_header();
 
-  this.triggerEvent('column_replace');
-},
+        this.triggerEvent('column_replace');
+    },
 
-subject_column: function()
-{
-  return this.subject_col + (this.checkbox_selection ? 1 : 0);
-}
+    subject_column: function()
+    {
+        return this.subject_col + (this.checkbox_selection ? 1 : 0);
+    }
 
 };
 
diff --git a/program/js/treelist.js b/program/js/treelist.js
index 1f600ba14..01aefb4d6 100644
--- a/program/js/treelist.js
+++ b/program/js/treelist.js
@@ -36,1274 +36,1274 @@
  */
 function rcube_treelist_widget(node, p)
 {
-  // apply some defaults to p
-  p = $.extend({
-    id_prefix: '',
-    autoexpand: 1000,
-    selectable: false,
-    scroll_delay: 500,
-    scroll_step: 5,
-    scroll_speed: 20,
-    save_state: false,
-    keyboard: true,
-    tabexit: true,
-    parent_focus: false,
-    check_droptarget: function(node) { return !node.virtual; }
-  }, p || {});
+    // apply some defaults to p
+    p = $.extend({
+        id_prefix: '',
+        autoexpand: 1000,
+        selectable: false,
+        scroll_delay: 500,
+        scroll_step: 5,
+        scroll_speed: 20,
+        save_state: false,
+        keyboard: true,
+        tabexit: true,
+        parent_focus: false,
+        check_droptarget: function(node) { return !node.virtual; }
+    }, p || {});
 
-  var container = $(node),
-    data = p.data || [],
-    indexbyid = {},
-    selection = null,
-    drag_active = false,
-    search_active = false,
-    last_search = '',
-    has_focus = false,
-    box_coords = {},
-    item_coords = [],
-    autoexpand_timer,
-    autoexpand_item,
-    body_scroll_top = 0,
-    list_scroll_top = 0,
-    scroll_timer,
-    searchfield,
-    tree_state,
-    ui_droppable,
-    ui_draggable,
-    draggable_opts,
-    droppable_opts,
-    list_id = (container.attr('id') || p.id_prefix || '0'),
-    me = this;
+    var container = $(node),
+        data = p.data || [],
+        indexbyid = {},
+        selection = null,
+        drag_active = false,
+        search_active = false,
+        last_search = '',
+        has_focus = false,
+        box_coords = {},
+        item_coords = [],
+        autoexpand_timer,
+        autoexpand_item,
+        body_scroll_top = 0,
+        list_scroll_top = 0,
+        scroll_timer,
+        searchfield,
+        tree_state,
+        ui_droppable,
+        ui_draggable,
+        draggable_opts,
+        droppable_opts,
+        list_id = (container.attr('id') || p.id_prefix || '0'),
+        me = this;
 
 
-  /////// export public members and methods
+    /////// export public members and methods
 
-  this.container = container;
-  this.expand = expand;
-  this.collapse = collapse;
-  this.expand_all = expand_all;
-  this.collapse_all = collapse_all;
-  this.select = select;
-  this.render = render;
-  this.reset = reset;
-  this.drag_start = drag_start;
-  this.drag_end = drag_end;
-  this.intersects = intersects;
-  this.droppable = droppable;
-  this.draggable = draggable;
-  this.is_draggable = is_draggable;
-  this.update = update_node;
-  this.insert = insert;
-  this.remove = remove;
-  this.get_item = get_item;
-  this.get_node = get_node;
-  this.get_selection = get_selection;
-  this.in_selection = in_selection;
-  this.get_next = get_next;
-  this.get_prev = get_prev;
-  this.get_single_selection = get_selection;
-  this.is_search = is_search;
-  this.reset_search = reset_search;
+    this.container = container;
+    this.expand = expand;
+    this.collapse = collapse;
+    this.expand_all = expand_all;
+    this.collapse_all = collapse_all;
+    this.select = select;
+    this.render = render;
+    this.reset = reset;
+    this.drag_start = drag_start;
+    this.drag_end = drag_end;
+    this.intersects = intersects;
+    this.droppable = droppable;
+    this.draggable = draggable;
+    this.is_draggable = is_draggable;
+    this.update = update_node;
+    this.insert = insert;
+    this.remove = remove;
+    this.get_item = get_item;
+    this.get_node = get_node;
+    this.get_selection = get_selection;
+    this.in_selection = in_selection;
+    this.get_next = get_next;
+    this.get_prev = get_prev;
+    this.get_single_selection = get_selection;
+    this.is_search = is_search;
+    this.reset_search = reset_search;
 
-  /////// startup code (constructor)
+    /////// startup code (constructor)
 
-  // abort if node not found
-  if (!container.length)
-    return;
+    // abort if node not found
+    if (!container.length)
+        return;
 
-  if (p.data)
-    index_data({ children:data });
-  // load data from DOM
-  else
-    update_data();
+    if (p.data)
+        index_data({ children:data });
+    // load data from DOM
+    else
+        update_data();
 
-  // scroll to the selected item
-  if (selection) {
-    scroll_to_node(id2dom(selection, true));
-  }
+    // scroll to the selected item
+    if (selection) {
+        scroll_to_node(id2dom(selection, true));
+    }
 
-  container.attr('role', 'tree')
-    .on('focusin', function(e) {
-      // TODO: only accept focus on virtual nodes from keyboard events
-      has_focus = true;
-    })
-    .on('focusout', function(e) {
-      has_focus = false;
-    })
+    container.attr('role', 'tree')
+        .on('focusin', function(e) {
+            // TODO: only accept focus on virtual nodes from keyboard events
+            has_focus = true;
+        })
+        .on('focusout', function(e) {
+            has_focus = false;
+        })
     // register click handlers on list
-    .on('click', 'div.treetoggle', function(e) {
-      toggle(dom2id($(this).parent()));
-      e.stopPropagation();
-    })
-    .on('click', 'li', function(e) {
-      // do not select record on checkbox/input click
-      if ($(e.target).is('input'))
-        return true;
+        .on('click', 'div.treetoggle', function(e) {
+            toggle(dom2id($(this).parent()));
+            e.stopPropagation();
+        })
+        .on('click', 'li', function(e) {
+            // do not select record on checkbox/input click
+            if ($(e.target).is('input'))
+                return true;
 
-      var node = p.selectable ? indexbyid[dom2id($(this))] : null;
-      if (node) {
-        if (!node.virtual)
-          select(node.id);
-        e.stopPropagation();
-      }
-    })
+            var node = p.selectable ? indexbyid[dom2id($(this))] : null;
+            if (node) {
+                if (!node.virtual)
+                    select(node.id);
+                e.stopPropagation();
+            }
+        })
     // mute clicks on virtual folder links (they need tabindex="0" in order to be selectable by keyboard)
-    .on('mousedown', 'a', function(e) {
-      var link = $(e.target), node = indexbyid[dom2id(link.closest('li'))];
-      if (node && node.virtual && !link.attr('href')) {
-        e.preventDefault();
-        e.stopPropagation();
-        return false;
-      }
-    });
+        .on('mousedown', 'a', function(e) {
+            var link = $(e.target), node = indexbyid[dom2id(link.closest('li'))];
+            if (node && node.virtual && !link.attr('href')) {
+                e.preventDefault();
+                e.stopPropagation();
+                return false;
+            }
+        });
 
-  // activate search function
-  if (p.searchbox) {
-    searchfield = $(p.searchbox).off('keyup.treelist').on('keyup.treelist', function(e) {
-      var key = rcube_event.get_keycode(e),
-        mod = rcube_event.get_modifier(e);
+    // activate search function
+    if (p.searchbox) {
+        searchfield = $(p.searchbox).off('keyup.treelist').on('keyup.treelist', function(e) {
+            var key = rcube_event.get_keycode(e),
+                mod = rcube_event.get_modifier(e);
 
-      switch (key) {
-        case 9:   // tab
-          break;
+            switch (key) {
+                case 9:   // tab
+                    break;
 
-        case 13:  // enter
-          search(this.value, true);
-          return rcube_event.cancel(e);
+                case 13:  // enter
+                    search(this.value, true);
+                    return rcube_event.cancel(e);
 
-        case 27:  // escape
-          reset_search();
-          break;
+                case 27:  // escape
+                    reset_search();
+                    break;
 
-        case 38:  // arrow up
-        case 37:  // left
-        case 39:  // right
-        case 40:  // arrow down
-          return;  // ignore arrow keys
+                case 38:  // arrow up
+                case 37:  // left
+                case 39:  // right
+                case 40:  // arrow down
+                    return;  // ignore arrow keys
 
-        default:
-          search(this.value, false);
-          break;
-      }
-    }).attr('autocomplete', 'off');
+                default:
+                    search(this.value, false);
+                    break;
+            }
+        }).attr('autocomplete', 'off');
 
-    // find the reset button for this search field
-    searchfield.parent().find('a.reset').off('click.treelist').on('click.treelist', function(e) {
-      reset_search();
-      return false;
-    })
-  }
+        // find the reset button for this search field
+        searchfield.parent().find('a.reset').off('click.treelist').on('click.treelist', function(e) {
+            reset_search();
+            return false;
+        });
+    }
 
-  $(document.body).on('keydown', keypress);
+    $(document.body).on('keydown', keypress);
 
-  // catch focus when clicking the list container area
-  if (p.parent_focus) {
-    container.parent(':not(body)').click(function(e) {
-      // click on a checkbox does not catch the focus
-      if ($(e.target).is('input'))
-        return true;
+    // catch focus when clicking the list container area
+    if (p.parent_focus) {
+        container.parent(':not(body)').click(function(e) {
+            // click on a checkbox does not catch the focus
+            if ($(e.target).is('input'))
+                return true;
 
-      if (!has_focus && selection) {
-        $(get_item(selection)).find(':focusable').first().focus();
-      }
-      else if (!has_focus) {
-        container.children('li').find(':focusable').first().focus();
-      }
-    });
-  }
+            if (!has_focus && selection) {
+                $(get_item(selection)).find(':focusable').first().focus();
+            }
+            else if (!has_focus) {
+                container.children('li').find(':focusable').first().focus();
+            }
+        });
+    }
 
-  /**
+    /**
    * Collapse a the node with the given ID
    */
-  function collapse(id, recursive, set)
-  {
-    var node;
+    function collapse(id, recursive, set)
+    {
+        var node;
 
-    if (node = indexbyid[id]) {
-      node.collapsed = typeof set == 'undefined' || set;
-      update_dom(node);
+        if (node = indexbyid[id]) {
+            node.collapsed = typeof set == 'undefined' || set;
+            update_dom(node);
 
-      if (recursive && node.children) {
-        for (var i=0; i < node.children.length; i++) {
-          collapse(node.children[i].id, recursive, set);
+            if (recursive && node.children) {
+                for (var i=0; i < node.children.length; i++) {
+                    collapse(node.children[i].id, recursive, set);
+                }
+            }
+
+            me.triggerEvent(node.collapsed ? 'collapse' : 'expand', node);
+            save_state(id, node.collapsed);
         }
-      }
-
-      me.triggerEvent(node.collapsed ? 'collapse' : 'expand', node);
-      save_state(id, node.collapsed);
     }
-  }
 
-  /**
+    /**
    * Expand a the node with the given ID
    */
-  function expand(id, recursive)
-  {
-    collapse(id, recursive, false);
-  }
+    function expand(id, recursive)
+    {
+        collapse(id, recursive, false);
+    }
 
-  /**
+    /**
    * Toggle collapsed state of a list node
    */
-  function toggle(id, recursive)
-  {
-    var node;
-    if (node = indexbyid[id]) {
-      collapse(id, recursive, !node.collapsed);
+    function toggle(id, recursive)
+    {
+        var node;
+        if (node = indexbyid[id]) {
+            collapse(id, recursive, !node.collapsed);
+        }
     }
-  }
 
-  /**
+    /**
    * Collapse all expanded nodes
    */
-  function collapse_all()
-  {
-    $.each(indexbyid, function(id, data) {
-      if (data.children.length > 0 && !data.collapsed) {
-        collapse(id);
-      }
-    });
-  }
+    function collapse_all()
+    {
+        $.each(indexbyid, function(id, data) {
+            if (data.children.length > 0 && !data.collapsed) {
+                collapse(id);
+            }
+        });
+    }
 
-  /**
+    /**
    * Expand all collapsed nodes
    */
-  function expand_all()
-  {
-    $.each(indexbyid, function(id, data) {
-      if (data.children.length > 0 && data.collapsed) {
-        collapse(id, false, false);
-      }
-    });
-  }
+    function expand_all()
+    {
+        $.each(indexbyid, function(id, data) {
+            if (data.children.length > 0 && data.collapsed) {
+                collapse(id, false, false);
+            }
+        });
+    }
 
-  /**
+    /**
    * Select a tree node by it's ID
    */
-  function select(id)
-  {
+    function select(id)
+    {
     // allow subscribes to prevent selection change
-    if (me.triggerEvent('beforeselect', indexbyid[id]) === false) {
-      return;
+        if (me.triggerEvent('beforeselect', indexbyid[id]) === false) {
+            return;
+        }
+
+        if (selection) {
+            id2dom(selection, true).removeClass('selected').removeAttr('aria-selected');
+            if (search_active)
+                id2dom(selection).removeClass('selected').removeAttr('aria-selected');
+            selection = null;
+        }
+
+        if (!id)
+            return;
+
+        var li = id2dom(id, true);
+        if (li.length) {
+            li.addClass('selected').attr('aria-selected', 'true');
+            selection = id;
+            // TODO: expand all parent nodes if collapsed
+
+            if (search_active)
+                id2dom(id).addClass('selected').attr('aria-selected', 'true');
+
+            scroll_to_node(li);
+        }
+
+        me.triggerEvent('select', indexbyid[id]);
     }
 
-    if (selection) {
-      id2dom(selection, true).removeClass('selected').removeAttr('aria-selected');
-      if (search_active)
-          id2dom(selection).removeClass('selected').removeAttr('aria-selected');
-      selection = null;
-    }
-
-    if (!id)
-      return;
-
-    var li = id2dom(id, true);
-    if (li.length) {
-      li.addClass('selected').attr('aria-selected', 'true');
-      selection = id;
-      // TODO: expand all parent nodes if collapsed
-
-      if (search_active)
-        id2dom(id).addClass('selected').attr('aria-selected', 'true');
-
-      scroll_to_node(li);
-    }
-
-    me.triggerEvent('select', indexbyid[id]);
-  }
-
-  /**
+    /**
    * Getter for the currently selected node ID
    */
-  function get_selection()
-  {
-    return selection;
-  }
+    function get_selection()
+    {
+        return selection;
+    }
 
-  /**
+    /**
    * Check if given id is selected
    * This is for consistency with rcube_list_widget
    */
-  function in_selection(id)
-  {
-    return selection == id;
-  }
+    function in_selection(id)
+    {
+        return selection == id;
+    }
 
-  /**
+    /**
    * Return the DOM element of the list item with the given ID
    */
-  function get_node(id)
-  {
-    return indexbyid[id];
-  }
+    function get_node(id)
+    {
+        return indexbyid[id];
+    }
 
-  /**
+    /**
    * Return the DOM element of the list item with the given ID
    */
-  function get_item(id, real)
-  {
-    return id2dom(id, real).get(0);
-  }
+    function get_item(id, real)
+    {
+        return id2dom(id, real).get(0);
+    }
 
-  /**
+    /**
    * Insert the given node
    */
-  function insert(node, parent_id, sort)
-  {
-    var li, parent_li,
-      parent_node = parent_id ? indexbyid[parent_id] : null
-      search_ = search_active;
+    function insert(node, parent_id, sort)
+    {
+        var li, parent_li,
+            parent_node = parent_id ? indexbyid[parent_id] : null;
+        search_ = search_active;
 
-    // ignore, already exists
-    if (indexbyid[node.id]) {
-      return;
-    }
-
-    // apply saved state
-    state = get_state(node.id, node.collapsed);
-    if (state !== undefined) {
-      node.collapsed = state;
-    }
-
-    // insert as child of an existing node
-    if (parent_node) {
-      node.level = parent_node.level + 1;
-
-      if (!parent_node.children)
-        parent_node.children = [];
-      else {
-        // Remove deleted nodes from the parent to make sure re-rendering below
-        // happens when adding a new child to a parent with all nodes removed
-        parent_node.children = parent_node.children.filter(function(node) { return !node.deleted; });
-      }
-
-      search_active = false;
-      parent_node.children.push(node);
-      parent_li = id2dom(parent_id);
-
-      // re-render the entire subtree
-      if (parent_node.children.length == 1) {
-        render_node(parent_node, null, parent_li);
-        li = id2dom(node.id);
-      }
-      else {
-        // append new node to parent's child list
-        li = render_node(node, parent_li.children('ul').first());
-      }
-
-      // list is in search mode
-      if (search_) {
-        search_active = search_;
-
-        // add clone to current search results (top level)
-        if (!li.is(':visible')) {
-          $('<li>')
-            .attr('id', li.attr('id') + '--xsR')
-            .attr('class', li.attr('class'))
-            .addClass('searchresult__')
-            .append(li.children().first().clone(true, true))
-            .appendTo(container);
-        }
-      }
-    }
-    // insert at top level
-    else {
-      node.level = 0;
-      data.push(node);
-      li = render_node(node, container);
-    }
-
-    indexbyid[node.id] = node;
-
-    // set new reference to node.html after insert
-    // will otherwise vanish in Firefox 3.6
-    if (typeof node.html == 'object') {
-        indexbyid[node.id].html = id2dom(node.id, true).children();
-    }
-
-    if (sort) {
-      resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
-    }
-  }
-
-  /**
-   * Update properties of an existing node
-   */
-  function update_node(id, updates, sort)
-  {
-    var li, parent_ul, parent_node, old_parent,
-      node = indexbyid[id];
-
-    if (node) {
-      li = id2dom(id);
-      parent_ul = li.parent();
-
-      if (updates.id || updates.html || updates.children || updates.classes || updates.parent) {
-        if (updates.parent && (parent_node = indexbyid[updates.parent])) {
-          // remove reference from old parent's child list
-          if (parent_ul.closest('li').length && (old_parent = indexbyid[dom2id(parent_ul.closest('li'))])) {
-            old_parent.children = $.grep(old_parent.children, function(elem, i){ return elem.id != node.id; });
-          }
-
-          // append to new parent node
-          parent_ul = id2dom(updates.parent).children('ul').first();
-          if (!parent_node.children)
-            parent_node.children = [];
-          parent_node.children.push(node);
-        }
-        else if (updates.parent !== undefined) {
-          parent_ul = container;
-        }
-
-        $.extend(node, updates);
-        li = render_node(node, parent_ul, li);
-      }
-
-      if (node.id != id) {
-        delete indexbyid[id];
-        indexbyid[node.id] = node;
-      }
-
-      if (sort) {
-        resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
-      }
-    }
-  }
-
-  /**
-   * Helper method to sort the list of the given item
-   */
-  function resort_node(li, filter)
-  {
-    var first, sibling,
-      myid = li.get(0).id,
-      sortname = li.children().first().text().toUpperCase();
-
-    li.parent().children('li' + filter).each(function(i, elem) {
-      if (i == 0)
-        first = elem;
-      if (elem.id == myid) {
-        // skip
-      }
-      else if (elem.id != myid && sortname >= $(elem).children().first().text().toUpperCase()) {
-        sibling = elem;
-      }
-      else {
-        return false;
-      }
-    });
-
-    if (sibling) {
-      li.insertAfter(sibling);
-    }
-    else if (first && first.id != myid) {
-      li.insertBefore(first);
-    }
-
-    // reload data from dom
-    update_data();
-  }
-
-  /**
-   * Remove the item with the given ID
-   */
-  function remove(id)
-  {
-    var node, li, parent;
-
-    if (node = indexbyid[id]) {
-      li = id2dom(id, true);
-      parent = li.parent();
-      li.remove();
-
-      node.deleted = true;
-      delete indexbyid[id];
-
-      if (search_active) {
-        id2dom(id, false).remove();
-      }
-
-      // remove tree-toggle button and children list
-      if (!parent.children().length) {
-        parent.parent('li').find('div.treetoggle').remove();
-
-        // remove parent, but not if it's the list itself
-        if (parent[0] != container[0]) {
-            parent.remove();
-        }
-      }
-
-      return true;
-    }
-
-    return false;
-  }
-
-  /**
-   * (Re-)read tree data from DOM
-   */
-  function update_data()
-  {
-    data = walk_list(container, 0);
-  }
-
-  /**
-   * Apply the 'collapsed' status of the data node to the corresponding DOM element(s)
-   */
-  function update_dom(node)
-  {
-    var li = id2dom(node.id, true);
-    li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
-    li.children('ul').first()[(node.collapsed ? 'hide' : 'show')]();
-    li.children('div.treetoggle').removeClass('collapsed expanded').addClass(node.collapsed ? 'collapsed' : 'expanded');
-    me.triggerEvent('toggle', node);
-  }
-
-  /**
-   *
-   */
-  function reset(keep_content, keep_selection)
-  {
-    if (!keep_selection)
-      select('');
-
-    data = [];
-    indexbyid = {};
-    drag_active = false;
-
-    if (keep_content) {
-      if (draggable_opts) {
-        if (ui_draggable)
-          draggable('destroy');
-        draggable(draggable_opts);
-      }
-
-      if (droppable_opts) {
-        if (ui_droppable)
-          droppable('destroy');
-        droppable(droppable_opts);
-      }
-
-      update_data();
-    }
-    else {
-      container.html('');
-    }
-
-    reset_search(keep_selection);
-  }
-
-  /**
-   *
-   */
-  function search(q, enter)
-  {
-    q = String(q).toLowerCase();
-
-    if (!q.length)
-      return reset_search();
-    else if (q == last_search && !enter)
-      return 0;
-
-    var hits = [];
-    var search_tree = function(items) {
-      $.each(items, function(i, node) {
-        var li, sli;
-        if (!node.virtual && !node.deleted && String(node.text).toLowerCase().indexOf(q) >= 0 && hits.indexOf(node.id) < 0) {
-          li = id2dom(node.id);
-
-          // skip already filtered nodes
-          if (li.data('filtered'))
+        // ignore, already exists
+        if (indexbyid[node.id]) {
             return;
-
-          sli = $('<li>')
-            .attr('id', li.attr('id') + '--xsR')
-            .attr('class', li.attr('class'))
-            .addClass('searchresult__')
-            // append all elements like links and inputs, but not sub-trees
-            .append(li.children(':not(div.treetoggle,ul)').clone(true, true))
-            .appendTo(container);
-
-          // let skins to do their magic, e.g. Elastic will fix pretty checkbox
-          rcmail.triggerEvent('clonerow', {
-            id: node.id,
-            row: sli.get(0)
-          });
-
-          hits.push(node.id);
         }
 
-        if (node.children && node.children.length) {
-          search_tree(node.children);
-        }
-      });
-    };
-
-    // reset old search results
-    if (search_active) {
-      $(container).children('li.searchresult__').remove();
-      search_active = false;
-    }
-
-    // hide all list items
-    $(container).children('li').hide().removeClass('selected');
-
-    // search recursively in tree (to keep sorting order)
-    search_tree(data);
-    search_active = true;
-
-    me.triggerEvent('search', { query: q, last: last_search, count: hits.length, ids: hits, execute: enter||false });
-
-    last_search = q;
-
-    return hits.count;
-  }
-
-  /**
-   *
-   */
-  function reset_search(nosel)
-  {
-    if (searchfield)
-      searchfield.val('');
-
-    $(container).children('li.searchresult__').remove();
-    $(container).children('li').filter(function() { return !$(this).data('filtered'); }).show();
-
-    search_active = false;
-
-    me.triggerEvent('search', { query: false, last: last_search });
-    last_search = '';
-
-    if (selection && !nosel)
-      select(selection);
-  }
-
-  /**
-   *
-   */
-  function is_search()
-  {
-    return search_active;
-  }
-
-  /**
-   * Render the tree list from the internal data structure
-   */
-  function render()
-  {
-    if (me.triggerEvent('renderBefore', data) === false)
-      return;
-
-    // remove all child nodes
-    container.html('');
-
-    // render child nodes
-    for (var i=0; i < data.length; i++) {
-      data[i].level = 0;
-      render_node(data[i], container);
-    }
-
-    me.triggerEvent('renderAfter', container);
-  }
-
-  /**
-   * Render a specific node into the DOM list
-   */
-  function render_node(node, parent, replace)
-  {
-    if (node.deleted)
-      return;
-
-    var li = $('<li>')
-      .attr('id', p.id_prefix + (p.id_encode ? p.id_encode(node.id) : node.id))
-      .attr('role', 'treeitem')
-      .addClass((node.classes || []).join(' '))
-      .data('id', node.id);
-
-    if (replace) {
-      replace.replaceWith(li);
-      if (parent)
-        li.appendTo(parent);
-    }
-    else
-      li.appendTo(parent);
-
-    if (typeof node.html == 'string')
-      li.html(node.html);
-    else if (typeof node.html == 'object')
-      li.append(node.html);
-
-    if (!node.text)
-      node.text = li.children().first().text();
-
-    if (node.virtual)
-      li.addClass('virtual');
-    if (node.id == selection)
-      li.addClass('selected');
-
-    // add child list and toggle icon
-    if (node.children && node.children.length) {
-      li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
-      $('<div class="treetoggle '+(node.collapsed ? 'collapsed' : 'expanded') + '">&nbsp;</div>').appendTo(li);
-      var ul = $('<ul>').appendTo(li).attr('class', node.childlistclass).attr('role', 'group');
-      if (node.collapsed)
-        ul.hide();
-
-      for (var i=0; i < node.children.length; i++) {
-        node.children[i].level = node.level + 1;
-        render_node(node.children[i], ul);
-      }
-    }
-
-    return li;
-  }
-
-  /**
-   * Recursively walk the DOM tree and build an internal data structure
-   * representing the skeleton of this tree list.
-   */
-  function walk_list(ul, level)
-  {
-    var result = [];
-    ul.children('li').each(function(i,e){
-      var state, li = $(e), sublist = li.children('ul');
-      var node = {
-        id: dom2id(li),
-        classes: String(li.attr('class')).split(' '),
-        virtual: li.hasClass('virtual'),
-        level: level,
-        html: li.children().first().get(0).outerHTML,
-        text: li.children().first().text(),
-        children: walk_list(sublist, level+1)
-      }
-
-      if (sublist.length) {
-        node.childlistclass = sublist.attr('class');
-      }
-      if (node.children.length) {
-        if (node.collapsed === undefined)
-          node.collapsed = sublist.css('display') == 'none';
-
         // apply saved state
         state = get_state(node.id, node.collapsed);
         if (state !== undefined) {
-          node.collapsed = state;
-          sublist[(state?'hide':'show')]();
+            node.collapsed = state;
         }
 
-        if (!li.children('div.treetoggle').length)
-          $('<div class="treetoggle '+(node.collapsed ? 'collapsed' : 'expanded') + '">&nbsp;</div>').appendTo(li);
+        // insert as child of an existing node
+        if (parent_node) {
+            node.level = parent_node.level + 1;
 
-        li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
-      }
-      if (li.hasClass('selected')) {
-        li.attr('aria-selected', 'true');
-        selection = node.id;
-      }
+            if (!parent_node.children)
+                parent_node.children = [];
+            else {
+                // Remove deleted nodes from the parent to make sure re-rendering below
+                // happens when adding a new child to a parent with all nodes removed
+                parent_node.children = parent_node.children.filter(function(node) { return !node.deleted; });
+            }
 
-      li.data('id', node.id);
+            search_active = false;
+            parent_node.children.push(node);
+            parent_li = id2dom(parent_id);
 
-      // declare list item as treeitem
-      li.attr('role', 'treeitem').attr('aria-level', node.level+1);
+            // re-render the entire subtree
+            if (parent_node.children.length == 1) {
+                render_node(parent_node, null, parent_li);
+                li = id2dom(node.id);
+            }
+            else {
+                // append new node to parent's child list
+                li = render_node(node, parent_li.children('ul').first());
+            }
 
-      // allow virtual nodes to receive focus
-      if (node.virtual) {
-        li.children('a').first().attr('tabindex', '0');
-      }
+            // list is in search mode
+            if (search_) {
+                search_active = search_;
 
-      result.push(node);
-      indexbyid[node.id] = node;
-    });
-
-    ul.attr('role', level == 0 ? 'tree' : 'group');
-
-    return result;
-  }
-
-  /**
-   * Recursively walk the data tree and index nodes by their ID
-   */
-  function index_data(node)
-  {
-    if (node.id) {
-      indexbyid[node.id] = node;
-    }
-    for (var c=0; node.children && c < node.children.length; c++) {
-      index_data(node.children[c]);
-    }
-  }
-
-  /**
-   * Get the (stripped) node ID from the given DOM element
-   */
-  function dom2id(li)
-  {
-    var domid = String(li.attr('id')).replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, '');
-    return p.id_decode ? p.id_decode(domid) : domid;
-  }
-
-  /**
-   * Get the <li> element for the given node ID
-   */
-  function id2dom(id, real)
-  {
-    var domid = p.id_encode ? p.id_encode(id) : id,
-      suffix = search_active && !real ? '--xsR' : '';
-
-    return $('#' + p.id_prefix + domid + suffix, container);
-  }
-
-  /**
-   * Scroll the parent container to make the given list item visible
-   */
-  function scroll_to_node(li)
-  {
-    var scroller = container.parent(),
-      current_offset = scroller.scrollTop(),
-      rel_offset = li.offset().top - scroller.offset().top;
-
-    if (rel_offset < 0 || rel_offset + li.height() > scroller.height())
-      scroller.scrollTop(rel_offset + current_offset);
-  }
-
-  /**
-   * Save node collapse state to localStorage
-   */
-  function save_state(id, collapsed)
-  {
-    if (p.save_state && window.rcmail) {
-      var key = 'treelist-' + list_id;
-      if (!tree_state) {
-        tree_state = rcmail.local_storage_get_item(key, {});
-      }
-
-      if (tree_state[id] != collapsed) {
-        tree_state[id] = collapsed;
-        rcmail.local_storage_set_item(key, tree_state);
-      }
-    }
-  }
-
-  /**
-   * Read node collapse state from localStorage
-   */
-  function get_state(id)
-  {
-    if (p.save_state && window.rcmail) {
-      if (!tree_state) {
-        tree_state = rcmail.local_storage_get_item('treelist-' + list_id, {});
-      }
-      return tree_state[id];
-    }
-
-    return undefined;
-  }
-
-  /**
-   * Handler for keyboard events on treelist
-   */
-  function keypress(e)
-  {
-    var target = e.target || {},
-      keyCode = rcube_event.get_keycode(e);
-
-    if (!has_focus || target.nodeName == 'INPUT' && keyCode != 38 && keyCode != 40 || target.nodeName == 'TEXTAREA' || target.nodeName == 'SELECT')
-      return true;
-
-    switch (keyCode) {
-      case 38:
-      case 40:
-      case 63232: // 'up', in safari keypress
-      case 63233: // 'down', in safari keypress
-        var li = p.keyboard ? container.find(':focus').closest('li') : [];
-        if (li.length) {
-          focus_next(li, (mod = keyCode == 38 || keyCode == 63232 ? -1 : 1));
+                // add clone to current search results (top level)
+                if (!li.is(':visible')) {
+                    $('<li>')
+                        .attr('id', li.attr('id') + '--xsR')
+                        .attr('class', li.attr('class'))
+                        .addClass('searchresult__')
+                        .append(li.children().first().clone(true, true))
+                        .appendTo(container);
+                }
+            }
         }
-        return rcube_event.cancel(e);
-
-      case 37: // Left arrow key
-      case 39: // Right arrow key
-        var id, node, li = container.find(':focus').closest('li');
-        if (li.length) {
-          id = dom2id(li);
-          node = indexbyid[id];
-          if (node && node.children.length && node.collapsed != (keyCode == 37))
-            toggle(id, rcube_event.get_modifier(e) == SHIFT_KEY);  // toggle subtree
+        // insert at top level
+        else {
+            node.level = 0;
+            data.push(node);
+            li = render_node(node, container);
         }
+
+        indexbyid[node.id] = node;
+
+        // set new reference to node.html after insert
+        // will otherwise vanish in Firefox 3.6
+        if (typeof node.html == 'object') {
+            indexbyid[node.id].html = id2dom(node.id, true).children();
+        }
+
+        if (sort) {
+            resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
+        }
+    }
+
+    /**
+   * Update properties of an existing node
+   */
+    function update_node(id, updates, sort)
+    {
+        var li, parent_ul, parent_node, old_parent,
+            node = indexbyid[id];
+
+        if (node) {
+            li = id2dom(id);
+            parent_ul = li.parent();
+
+            if (updates.id || updates.html || updates.children || updates.classes || updates.parent) {
+                if (updates.parent && (parent_node = indexbyid[updates.parent])) {
+                    // remove reference from old parent's child list
+                    if (parent_ul.closest('li').length && (old_parent = indexbyid[dom2id(parent_ul.closest('li'))])) {
+                        old_parent.children = $.grep(old_parent.children, function(elem, i){ return elem.id != node.id; });
+                    }
+
+                    // append to new parent node
+                    parent_ul = id2dom(updates.parent).children('ul').first();
+                    if (!parent_node.children)
+                        parent_node.children = [];
+                    parent_node.children.push(node);
+                }
+                else if (updates.parent !== undefined) {
+                    parent_ul = container;
+                }
+
+                $.extend(node, updates);
+                li = render_node(node, parent_ul, li);
+            }
+
+            if (node.id != id) {
+                delete indexbyid[id];
+                indexbyid[node.id] = node;
+            }
+
+            if (sort) {
+                resort_node(li, typeof sort == 'string' ? '[class~="' + sort + '"]' : '');
+            }
+        }
+    }
+
+    /**
+   * Helper method to sort the list of the given item
+   */
+    function resort_node(li, filter)
+    {
+        var first, sibling,
+            myid = li.get(0).id,
+            sortname = li.children().first().text().toUpperCase();
+
+        li.parent().children('li' + filter).each(function(i, elem) {
+            if (i == 0)
+                first = elem;
+            if (elem.id == myid) {
+                // skip
+            }
+            else if (elem.id != myid && sortname >= $(elem).children().first().text().toUpperCase()) {
+                sibling = elem;
+            }
+            else {
+                return false;
+            }
+        });
+
+        if (sibling) {
+            li.insertAfter(sibling);
+        }
+        else if (first && first.id != myid) {
+            li.insertBefore(first);
+        }
+
+        // reload data from dom
+        update_data();
+    }
+
+    /**
+   * Remove the item with the given ID
+   */
+    function remove(id)
+    {
+        var node, li, parent;
+
+        if (node = indexbyid[id]) {
+            li = id2dom(id, true);
+            parent = li.parent();
+            li.remove();
+
+            node.deleted = true;
+            delete indexbyid[id];
+
+            if (search_active) {
+                id2dom(id, false).remove();
+            }
+
+            // remove tree-toggle button and children list
+            if (!parent.children().length) {
+                parent.parent('li').find('div.treetoggle').remove();
+
+                // remove parent, but not if it's the list itself
+                if (parent[0] != container[0]) {
+                    parent.remove();
+                }
+            }
+
+            return true;
+        }
+
         return false;
-
-      case 9:  // Tab
-        if (p.keyboard && p.tabexit) {
-          // jump to last/first item to move focus away from the treelist widget by tab
-          var limit = rcube_event.get_modifier(e) == SHIFT_KEY ? 'first' : 'last';
-          focus_noscroll(container.find('li[role=treeitem]:has(a)')[limit]().find('a:'+limit));
-        }
-        break;
     }
 
-    return true;
-  }
+    /**
+   * (Re-)read tree data from DOM
+   */
+    function update_data()
+    {
+        data = walk_list(container, 0);
+    }
 
-  function focus_next(li, dir, from_child)
-  {
-    var mod = dir < 0 ? 'prev' : 'next',
-      next = li[mod](), limit, parent;
+    /**
+   * Apply the 'collapsed' status of the data node to the corresponding DOM element(s)
+   */
+    function update_dom(node)
+    {
+        var li = id2dom(node.id, true);
+        li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
+        li.children('ul').first()[(node.collapsed ? 'hide' : 'show')]();
+        li.children('div.treetoggle').removeClass('collapsed expanded').addClass(node.collapsed ? 'collapsed' : 'expanded');
+        me.triggerEvent('toggle', node);
+    }
 
-    if (dir > 0 && !from_child && li.children('ul[role=group]:visible').length) {
-      li.children('ul').children('li').first().find('a').first().focus();
-    }
-    else if (dir < 0 && !from_child && next.children('ul[role=group]:visible').length) {
-      next.children('ul').children('li').last().find('a').first().focus();
-    }
-    else if (next.length && next.find('a').first().focus().length) {
-        // focused
-    }
-    else {
-      parent = li.parent().closest('li[role=treeitem]');
-      if (parent.length)
-        if (dir < 0) {
-          parent.find('a').first().focus();
+    /**
+   *
+   */
+    function reset(keep_content, keep_selection)
+    {
+        if (!keep_selection)
+            select('');
+
+        data = [];
+        indexbyid = {};
+        drag_active = false;
+
+        if (keep_content) {
+            if (draggable_opts) {
+                if (ui_draggable)
+                    draggable('destroy');
+                draggable(draggable_opts);
+            }
+
+            if (droppable_opts) {
+                if (ui_droppable)
+                    droppable('destroy');
+                droppable(droppable_opts);
+            }
+
+            update_data();
         }
         else {
-          focus_next(parent, dir, true);
+            container.html('');
+        }
+
+        reset_search(keep_selection);
+    }
+
+    /**
+   *
+   */
+    function search(q, enter)
+    {
+        q = String(q).toLowerCase();
+
+        if (!q.length)
+            return reset_search();
+        else if (q == last_search && !enter)
+            return 0;
+
+        var hits = [];
+        var search_tree = function(items) {
+            $.each(items, function(i, node) {
+                var li, sli;
+                if (!node.virtual && !node.deleted && String(node.text).toLowerCase().indexOf(q) >= 0 && hits.indexOf(node.id) < 0) {
+                    li = id2dom(node.id);
+
+                    // skip already filtered nodes
+                    if (li.data('filtered'))
+                        return;
+
+                    sli = $('<li>')
+                        .attr('id', li.attr('id') + '--xsR')
+                        .attr('class', li.attr('class'))
+                        .addClass('searchresult__')
+                    // append all elements like links and inputs, but not sub-trees
+                        .append(li.children(':not(div.treetoggle,ul)').clone(true, true))
+                        .appendTo(container);
+
+                    // let skins to do their magic, e.g. Elastic will fix pretty checkbox
+                    rcmail.triggerEvent('clonerow', {
+                        id: node.id,
+                        row: sli.get(0)
+                    });
+
+                    hits.push(node.id);
+                }
+
+                if (node.children && node.children.length) {
+                    search_tree(node.children);
+                }
+            });
+        };
+
+        // reset old search results
+        if (search_active) {
+            $(container).children('li.searchresult__').remove();
+            search_active = false;
+        }
+
+        // hide all list items
+        $(container).children('li').hide().removeClass('selected');
+
+        // search recursively in tree (to keep sorting order)
+        search_tree(data);
+        search_active = true;
+
+        me.triggerEvent('search', { query: q, last: last_search, count: hits.length, ids: hits, execute: enter||false });
+
+        last_search = q;
+
+        return hits.count;
+    }
+
+    /**
+   *
+   */
+    function reset_search(nosel)
+    {
+        if (searchfield)
+            searchfield.val('');
+
+        $(container).children('li.searchresult__').remove();
+        $(container).children('li').filter(function() { return !$(this).data('filtered'); }).show();
+
+        search_active = false;
+
+        me.triggerEvent('search', { query: false, last: last_search });
+        last_search = '';
+
+        if (selection && !nosel)
+            select(selection);
+    }
+
+    /**
+   *
+   */
+    function is_search()
+    {
+        return search_active;
+    }
+
+    /**
+   * Render the tree list from the internal data structure
+   */
+    function render()
+    {
+        if (me.triggerEvent('renderBefore', data) === false)
+            return;
+
+        // remove all child nodes
+        container.html('');
+
+        // render child nodes
+        for (var i=0; i < data.length; i++) {
+            data[i].level = 0;
+            render_node(data[i], container);
+        }
+
+        me.triggerEvent('renderAfter', container);
+    }
+
+    /**
+   * Render a specific node into the DOM list
+   */
+    function render_node(node, parent, replace)
+    {
+        if (node.deleted)
+            return;
+
+        var li = $('<li>')
+            .attr('id', p.id_prefix + (p.id_encode ? p.id_encode(node.id) : node.id))
+            .attr('role', 'treeitem')
+            .addClass((node.classes || []).join(' '))
+            .data('id', node.id);
+
+        if (replace) {
+            replace.replaceWith(li);
+            if (parent)
+                li.appendTo(parent);
+        }
+        else
+            li.appendTo(parent);
+
+        if (typeof node.html == 'string')
+            li.html(node.html);
+        else if (typeof node.html == 'object')
+            li.append(node.html);
+
+        if (!node.text)
+            node.text = li.children().first().text();
+
+        if (node.virtual)
+            li.addClass('virtual');
+        if (node.id == selection)
+            li.addClass('selected');
+
+        // add child list and toggle icon
+        if (node.children && node.children.length) {
+            li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
+            $('<div class="treetoggle '+(node.collapsed ? 'collapsed' : 'expanded') + '">&nbsp;</div>').appendTo(li);
+            var ul = $('<ul>').appendTo(li).attr('class', node.childlistclass).attr('role', 'group');
+            if (node.collapsed)
+                ul.hide();
+
+            for (var i=0; i < node.children.length; i++) {
+                node.children[i].level = node.level + 1;
+                render_node(node.children[i], ul);
+            }
+        }
+
+        return li;
+    }
+
+    /**
+   * Recursively walk the DOM tree and build an internal data structure
+   * representing the skeleton of this tree list.
+   */
+    function walk_list(ul, level)
+    {
+        var result = [];
+        ul.children('li').each(function(i, e){
+            var state, li = $(e), sublist = li.children('ul');
+            var node = {
+                id: dom2id(li),
+                classes: String(li.attr('class')).split(' '),
+                virtual: li.hasClass('virtual'),
+                level: level,
+                html: li.children().first().get(0).outerHTML,
+                text: li.children().first().text(),
+                children: walk_list(sublist, level+1)
+            };
+
+            if (sublist.length) {
+                node.childlistclass = sublist.attr('class');
+            }
+            if (node.children.length) {
+                if (node.collapsed === undefined)
+                    node.collapsed = sublist.css('display') == 'none';
+
+                // apply saved state
+                state = get_state(node.id, node.collapsed);
+                if (state !== undefined) {
+                    node.collapsed = state;
+                    sublist[(state?'hide':'show')]();
+                }
+
+                if (!li.children('div.treetoggle').length)
+                    $('<div class="treetoggle '+(node.collapsed ? 'collapsed' : 'expanded') + '">&nbsp;</div>').appendTo(li);
+
+                li.attr('aria-expanded', node.collapsed ? 'false' : 'true');
+            }
+            if (li.hasClass('selected')) {
+                li.attr('aria-selected', 'true');
+                selection = node.id;
+            }
+
+            li.data('id', node.id);
+
+            // declare list item as treeitem
+            li.attr('role', 'treeitem').attr('aria-level', node.level+1);
+
+            // allow virtual nodes to receive focus
+            if (node.virtual) {
+                li.children('a').first().attr('tabindex', '0');
+            }
+
+            result.push(node);
+            indexbyid[node.id] = node;
+        });
+
+        ul.attr('role', level == 0 ? 'tree' : 'group');
+
+        return result;
+    }
+
+    /**
+   * Recursively walk the data tree and index nodes by their ID
+   */
+    function index_data(node)
+    {
+        if (node.id) {
+            indexbyid[node.id] = node;
+        }
+        for (var c=0; node.children && c < node.children.length; c++) {
+            index_data(node.children[c]);
         }
     }
-  }
 
-  /**
+    /**
+   * Get the (stripped) node ID from the given DOM element
+   */
+    function dom2id(li)
+    {
+        var domid = String(li.attr('id')).replace(new RegExp('^' + (p.id_prefix) || '%'), '').replace(/--xsR$/, '');
+        return p.id_decode ? p.id_decode(domid) : domid;
+    }
+
+    /**
+   * Get the <li> element for the given node ID
+   */
+    function id2dom(id, real)
+    {
+        var domid = p.id_encode ? p.id_encode(id) : id,
+            suffix = search_active && !real ? '--xsR' : '';
+
+        return $('#' + p.id_prefix + domid + suffix, container);
+    }
+
+    /**
+   * Scroll the parent container to make the given list item visible
+   */
+    function scroll_to_node(li)
+    {
+        var scroller = container.parent(),
+            current_offset = scroller.scrollTop(),
+            rel_offset = li.offset().top - scroller.offset().top;
+
+        if (rel_offset < 0 || rel_offset + li.height() > scroller.height())
+            scroller.scrollTop(rel_offset + current_offset);
+    }
+
+    /**
+   * Save node collapse state to localStorage
+   */
+    function save_state(id, collapsed)
+    {
+        if (p.save_state && window.rcmail) {
+            var key = 'treelist-' + list_id;
+            if (!tree_state) {
+                tree_state = rcmail.local_storage_get_item(key, {});
+            }
+
+            if (tree_state[id] != collapsed) {
+                tree_state[id] = collapsed;
+                rcmail.local_storage_set_item(key, tree_state);
+            }
+        }
+    }
+
+    /**
+   * Read node collapse state from localStorage
+   */
+    function get_state(id)
+    {
+        if (p.save_state && window.rcmail) {
+            if (!tree_state) {
+                tree_state = rcmail.local_storage_get_item('treelist-' + list_id, {});
+            }
+            return tree_state[id];
+        }
+
+        return undefined;
+    }
+
+    /**
+   * Handler for keyboard events on treelist
+   */
+    function keypress(e)
+    {
+        var target = e.target || {},
+            keyCode = rcube_event.get_keycode(e);
+
+        if (!has_focus || target.nodeName == 'INPUT' && keyCode != 38 && keyCode != 40 || target.nodeName == 'TEXTAREA' || target.nodeName == 'SELECT')
+            return true;
+
+        switch (keyCode) {
+            case 38:
+            case 40:
+            case 63232: // 'up', in safari keypress
+            case 63233: // 'down', in safari keypress
+                var li = p.keyboard ? container.find(':focus').closest('li') : [];
+                if (li.length) {
+                    focus_next(li, (mod = keyCode == 38 || keyCode == 63232 ? -1 : 1));
+                }
+                return rcube_event.cancel(e);
+
+            case 37: // Left arrow key
+            case 39: // Right arrow key
+                var id, node, li = container.find(':focus').closest('li');
+                if (li.length) {
+                    id = dom2id(li);
+                    node = indexbyid[id];
+                    if (node && node.children.length && node.collapsed != (keyCode == 37))
+                        toggle(id, rcube_event.get_modifier(e) == SHIFT_KEY);  // toggle subtree
+                }
+                return false;
+
+            case 9:  // Tab
+                if (p.keyboard && p.tabexit) {
+                    // jump to last/first item to move focus away from the treelist widget by tab
+                    var limit = rcube_event.get_modifier(e) == SHIFT_KEY ? 'first' : 'last';
+                    focus_noscroll(container.find('li[role=treeitem]:has(a)')[limit]().find('a:'+limit));
+                }
+                break;
+        }
+
+        return true;
+    }
+
+    function focus_next(li, dir, from_child)
+    {
+        var mod = dir < 0 ? 'prev' : 'next',
+            next = li[mod](), limit, parent;
+
+        if (dir > 0 && !from_child && li.children('ul[role=group]:visible').length) {
+            li.children('ul').children('li').first().find('a').first().focus();
+        }
+        else if (dir < 0 && !from_child && next.children('ul[role=group]:visible').length) {
+            next.children('ul').children('li').last().find('a').first().focus();
+        }
+        else if (next.length && next.find('a').first().focus().length) {
+        // focused
+        }
+        else {
+            parent = li.parent().closest('li[role=treeitem]');
+            if (parent.length)
+                if (dir < 0) {
+                    parent.find('a').first().focus();
+                }
+                else {
+                    focus_next(parent, dir, true);
+                }
+        }
+    }
+
+    /**
    * Focus the given element without scrolling the list container
    */
-  function focus_noscroll(elem)
-  {
-    if (elem.length) {
-      var frame = container.parent().get(0) || { scrollTop:0 },
-        y = frame.scrollTop || frame.scrollY;
-      elem.focus();
-      frame.scrollTop = y;
-    }
-  }
-
-
-  function get_next()
-  {
-    var node, child;
-    if (selection && (node = id2dom(selection))) {
-      child = node.children('ul').children('li').first();
-      if (child.length) {
-        return dom2id(child);
-      }
-
-      child = node.next();
-      if (child.length) {
-        return dom2id(child);
-      }
-
-      while ((node = node.parent('ul').parent('li')) && node.length) {
-        child = node.next();
-        if (child.length) {
-          return dom2id(child);
+    function focus_noscroll(elem)
+    {
+        if (elem.length) {
+            var frame = container.parent().get(0) || { scrollTop:0 },
+                y = frame.scrollTop || frame.scrollY;
+            elem.focus();
+            frame.scrollTop = y;
         }
-      }
     }
-  }
 
-  function get_prev()
-  {
-    var node, prev, child;
-    if (selection && (node = id2dom(selection))) {
-      prev = node.prev();
-      child = prev.find('li').last();
 
-      if (child.length) {
-        return dom2id(child);
-      }
+    function get_next()
+    {
+        var node, child;
+        if (selection && (node = id2dom(selection))) {
+            child = node.children('ul').children('li').first();
+            if (child.length) {
+                return dom2id(child);
+            }
 
-      if (prev.length) {
-        return dom2id(prev);
-      }
+            child = node.next();
+            if (child.length) {
+                return dom2id(child);
+            }
 
-      node = node.parent().parent();
-      if (node.length && node.is('li')) {
-        return dom2id(node);
-      }
+            while ((node = node.parent('ul').parent('li')) && node.length) {
+                child = node.next();
+                if (child.length) {
+                    return dom2id(child);
+                }
+            }
+        }
     }
-  }
 
-  ///// drag & drop support
+    function get_prev()
+    {
+        var node, prev, child;
+        if (selection && (node = id2dom(selection))) {
+            prev = node.prev();
+            child = prev.find('li').last();
 
-  /**
+            if (child.length) {
+                return dom2id(child);
+            }
+
+            if (prev.length) {
+                return dom2id(prev);
+            }
+
+            node = node.parent().parent();
+            if (node.length && node.is('li')) {
+                return dom2id(node);
+            }
+        }
+    }
+
+    ///// drag & drop support
+
+    /**
    * When dragging starts, compute absolute bounding boxes of the list and it's items
    * for faster comparisons while mouse is moving
    */
-  function drag_start(force)
-  {
-    if (!force && drag_active)
-      return;
+    function drag_start(force)
+    {
+        if (!force && drag_active)
+            return;
 
-    drag_active = true;
+        drag_active = true;
 
-    var li, item, height,
-      pos = container.offset();
+        var li, item, height,
+            pos = container.offset();
 
-    body_scroll_top = bw.ie ? 0 : window.pageYOffset;
-    list_scroll_top = container.parent().scrollTop();
-    pos.top += list_scroll_top;
-
-    box_coords = {
-      x1: pos.left,
-      y1: pos.top,
-      x2: pos.left + container.width(),
-      y2: pos.top + container.height()
-    };
-
-    item_coords = [];
-    for (var id in indexbyid) {
-      li = id2dom(id);
-      item = li.children().first().get(0);
-      if (item && (height = item.offsetHeight)) {
-        pos = $(item).offset();
+        body_scroll_top = bw.ie ? 0 : window.pageYOffset;
+        list_scroll_top = container.parent().scrollTop();
         pos.top += list_scroll_top;
-        item_coords[id] = {
-          x1: pos.left,
-          y1: pos.top,
-          x2: pos.left + item.offsetWidth,
-          y2: pos.top + height,
-          on: id == autoexpand_item
+
+        box_coords = {
+            x1: pos.left,
+            y1: pos.top,
+            x2: pos.left + container.width(),
+            y2: pos.top + container.height()
         };
-      }
+
+        item_coords = [];
+        for (var id in indexbyid) {
+            li = id2dom(id);
+            item = li.children().first().get(0);
+            if (item && (height = item.offsetHeight)) {
+                pos = $(item).offset();
+                pos.top += list_scroll_top;
+                item_coords[id] = {
+                    x1: pos.left,
+                    y1: pos.top,
+                    x2: pos.left + item.offsetWidth,
+                    y2: pos.top + height,
+                    on: id == autoexpand_item
+                };
+            }
+        }
+
+        // enable auto-scrolling of list container
+        if (container.height() > container.parent().height()) {
+            container.parent().on('mousemove.treelist', function(e) {
+                var scroll = 0,
+                    mouse = rcube_event.get_mouse_pos(e);
+                mouse.y -= container.parent().offset().top;
+
+                if (mouse.y < 25 && list_scroll_top > 0) {
+                    scroll = -1; // up
+                }
+                else if (mouse.y > container.parent().height() - 25) {
+                    scroll = 1; // down
+                }
+
+                if (drag_active && scroll != 0) {
+                    if (!scroll_timer)
+                        scroll_timer = setTimeout(function() { drag_scroll(scroll); }, p.scroll_delay);
+                }
+                else if (scroll_timer) {
+                    window.clearTimeout(scroll_timer);
+                    scroll_timer = null;
+                }
+            })
+                .on('mouseleave.treelist', function() {
+                    if (scroll_timer) {
+                        window.clearTimeout(scroll_timer);
+                        scroll_timer = null;
+                    }
+                });
+        }
     }
 
-    // enable auto-scrolling of list container
-    if (container.height() > container.parent().height()) {
-      container.parent().on('mousemove.treelist', function(e) {
-          var scroll = 0,
-            mouse = rcube_event.get_mouse_pos(e);
-          mouse.y -= container.parent().offset().top;
-
-          if (mouse.y < 25 && list_scroll_top > 0) {
-            scroll = -1; // up
-          }
-          else if (mouse.y > container.parent().height() - 25) {
-            scroll = 1; // down
-          }
-
-          if (drag_active && scroll != 0) {
-            if (!scroll_timer)
-              scroll_timer = setTimeout(function() { drag_scroll(scroll); }, p.scroll_delay);
-          }
-          else if (scroll_timer) {
-            window.clearTimeout(scroll_timer);
-            scroll_timer = null;
-          }
-      })
-      .on('mouseleave.treelist', function() {
-          if (scroll_timer) {
-            window.clearTimeout(scroll_timer);
-            scroll_timer = null;
-          }
-      });
-    }
-  }
-
-  /**
+    /**
    * Signal that dragging has stopped
    */
-  function drag_end()
-  {
-    container.parent().off('.treelist');
-    $('li.droptarget', container).removeClass('droptarget');
+    function drag_end()
+    {
+        container.parent().off('.treelist');
+        $('li.droptarget', container).removeClass('droptarget');
 
-    if (!drag_active)
-      return;
+        if (!drag_active)
+            return;
 
-    drag_active = false;
-    scroll_timer = null;
+        drag_active = false;
+        scroll_timer = null;
 
-    if (autoexpand_timer) {
-      clearTimeout(autoexpand_timer);
-      autoexpand_timer = null;
-      autoexpand_item = null;
+        if (autoexpand_timer) {
+            clearTimeout(autoexpand_timer);
+            autoexpand_timer = null;
+            autoexpand_item = null;
+        }
     }
-  }
 
-  /**
+    /**
    * Scroll list container in the given direction
    */
-  function drag_scroll(dir)
-  {
-    if (!drag_active)
-      return;
+    function drag_scroll(dir)
+    {
+        if (!drag_active)
+            return;
 
-    var old_top = list_scroll_top;
-    container.parent().get(0).scrollTop += p.scroll_step * dir;
-    list_scroll_top = container.parent().scrollTop();
-    scroll_timer = null;
+        var old_top = list_scroll_top;
+        container.parent().get(0).scrollTop += p.scroll_step * dir;
+        list_scroll_top = container.parent().scrollTop();
+        scroll_timer = null;
 
-    if (list_scroll_top != old_top)
-      scroll_timer = setTimeout(function() { drag_scroll(dir); }, p.scroll_speed);
-  }
+        if (list_scroll_top != old_top)
+            scroll_timer = setTimeout(function() { drag_scroll(dir); }, p.scroll_speed);
+    }
 
-  /**
+    /**
    * Determine if the given mouse coords intersect the list and one of its items
    */
-  function intersects(mouse, highlight)
-  {
+    function intersects(mouse, highlight)
+    {
     // offsets to compensate for scrolling while dragging a message
-    var boffset = bw.ie ? -document.documentElement.scrollTop : body_scroll_top,
-      moffset = container.parent().scrollTop(),
-      result = null;
+        var boffset = bw.ie ? -document.documentElement.scrollTop : body_scroll_top,
+            moffset = container.parent().scrollTop(),
+            result = null;
 
-    mouse.top = mouse.y + moffset - boffset;
+        mouse.top = mouse.y + moffset - boffset;
 
-    // no intersection with list bounding box
-    if (mouse.x < box_coords.x1 || mouse.x >= box_coords.x2 || mouse.top < box_coords.y1 || mouse.top >= box_coords.y2) {
-      // TODO: optimize performance for this operation
-      if (highlight)
-        $('li.droptarget', container).removeClass('droptarget');
-      return result;
+        // no intersection with list bounding box
+        if (mouse.x < box_coords.x1 || mouse.x >= box_coords.x2 || mouse.top < box_coords.y1 || mouse.top >= box_coords.y2) {
+            // TODO: optimize performance for this operation
+            if (highlight)
+                $('li.droptarget', container).removeClass('droptarget');
+            return result;
+        }
+
+        // check intersection with visible list items
+        var id, pos, node;
+        for (id in item_coords) {
+            pos = item_coords[id];
+            if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.top >= pos.y1 && mouse.top < pos.y2) {
+                node = indexbyid[id];
+
+                // if the folder is collapsed, expand it after the configured time
+                if (node.children && node.children.length && node.collapsed && p.autoexpand && autoexpand_item != id) {
+                    if (autoexpand_timer)
+                        clearTimeout(autoexpand_timer);
+
+                    autoexpand_item = id;
+                    autoexpand_timer = setTimeout(function() {
+                        expand(autoexpand_item);
+                        drag_start(true);  // re-calculate item coords
+                        autoexpand_item = null;
+                        if (ui_droppable)
+                            $.ui.ddmanager.prepareOffsets($.ui.ddmanager.current, null);
+                    }, p.autoexpand);
+                }
+                else if (autoexpand_timer && autoexpand_item != id) {
+                    clearTimeout(autoexpand_timer);
+                    autoexpand_item = null;
+                    autoexpand_timer = null;
+                }
+
+                // check if this item is accepted as drop target
+                if (p.check_droptarget(node)) {
+                    if (highlight) {
+                        id2dom(id).addClass('droptarget');
+                        pos.on = true;
+                    }
+                    result = id;
+                }
+                else {
+                    result = null;
+                }
+            }
+            else if (pos.on) {
+                id2dom(id).removeClass('droptarget');
+                pos.on = false;
+            }
+        }
+
+        return result;
     }
 
-    // check intersection with visible list items
-    var id, pos, node;
-    for (id in item_coords) {
-      pos = item_coords[id];
-      if (mouse.x >= pos.x1 && mouse.x < pos.x2 && mouse.top >= pos.y1 && mouse.top < pos.y2) {
-        node = indexbyid[id];
-
-        // if the folder is collapsed, expand it after the configured time
-        if (node.children && node.children.length && node.collapsed && p.autoexpand && autoexpand_item != id) {
-          if (autoexpand_timer)
-            clearTimeout(autoexpand_timer);
-
-          autoexpand_item = id;
-          autoexpand_timer = setTimeout(function() {
-            expand(autoexpand_item);
-            drag_start(true);  // re-calculate item coords
-            autoexpand_item = null;
-            if (ui_droppable)
-              $.ui.ddmanager.prepareOffsets($.ui.ddmanager.current, null);
-          }, p.autoexpand);
-        }
-        else if (autoexpand_timer && autoexpand_item != id) {
-          clearTimeout(autoexpand_timer);
-          autoexpand_item = null;
-          autoexpand_timer = null;
-        }
-
-        // check if this item is accepted as drop target
-        if (p.check_droptarget(node)) {
-          if (highlight) {
-            id2dom(id).addClass('droptarget');
-            pos.on = true;
-          }
-          result = id;
-        }
-        else {
-          result = null;
-        }
-      }
-      else if (pos.on) {
-        id2dom(id).removeClass('droptarget');
-        pos.on = false;
-      }
-    }
-
-    return result;
-  }
-
-  /**
+    /**
    * Wrapper for jQuery.UI.droppable() activation on this widget
    *
    * @param object Options as passed to regular .droppable() function
    */
-  function droppable(opts)
-  {
-    if (!opts) opts = {};
+    function droppable(opts)
+    {
+        if (!opts) opts = {};
 
-    if ($.type(opts) == 'string') {
-      if (opts == 'destroy') {
-        ui_droppable = null;
-      }
-      $('li:not(.virtual)', container).droppable(opts);
-      return this;
+        if ($.type(opts) == 'string') {
+            if (opts == 'destroy') {
+                ui_droppable = null;
+            }
+            $('li:not(.virtual)', container).droppable(opts);
+            return this;
+        }
+
+        droppable_opts = opts;
+
+        var my_opts = $.extend({
+            greedy: true,
+            tolerance: 'pointer',
+            hoverClass: 'droptarget',
+            addClasses: false
+        }, opts);
+
+        my_opts.activate = function(e, ui) {
+            drag_start();
+            ui_droppable = ui;
+            if (opts.activate)
+                opts.activate(e, ui);
+        };
+
+        my_opts.deactivate = function(e, ui) {
+            drag_end();
+            ui_droppable = null;
+            if (opts.deactivate)
+                opts.deactivate(e, ui);
+        };
+
+        my_opts.over = function(e, ui) {
+            intersects(rcube_event.get_mouse_pos(e), false);
+            if (opts.over)
+                opts.over(e, ui);
+        };
+
+        $('li:not(.virtual)', container).droppable(my_opts);
+
+        return this;
     }
 
-    droppable_opts = opts;
-
-    var my_opts = $.extend({
-        greedy: true,
-        tolerance: 'pointer',
-        hoverClass: 'droptarget',
-        addClasses: false
-      }, opts);
-
-    my_opts.activate = function(e, ui) {
-      drag_start();
-      ui_droppable = ui;
-      if (opts.activate)
-        opts.activate(e, ui);
-    };
-
-    my_opts.deactivate = function(e, ui) {
-      drag_end();
-      ui_droppable = null;
-      if (opts.deactivate)
-        opts.deactivate(e, ui);
-    };
-
-    my_opts.over = function(e, ui) {
-      intersects(rcube_event.get_mouse_pos(e), false);
-      if (opts.over)
-        opts.over(e, ui);
-    };
-
-    $('li:not(.virtual)', container).droppable(my_opts);
-
-    return this;
-  }
-
-  /**
+    /**
    * Wrapper for jQuery.UI.draggable() activation on this widget
    *
    * @param object Options as passed to regular .draggable() function
    */
-  function draggable(opts)
-  {
-    if (!opts) opts = {};
+    function draggable(opts)
+    {
+        if (!opts) opts = {};
 
-    if ($.type(opts) == 'string') {
-      if (opts == 'destroy') {
-        ui_draggable = null;
-      }
-      $('li:not(.virtual)', container).draggable(opts);
-      return this;
+        if ($.type(opts) == 'string') {
+            if (opts == 'destroy') {
+                ui_draggable = null;
+            }
+            $('li:not(.virtual)', container).draggable(opts);
+            return this;
+        }
+
+        draggable_opts = opts;
+
+        var my_opts = $.extend({
+            appendTo: 'body',
+            revert: 'invalid',
+            iframeFix: true,
+            addClasses: false,
+            cursorAt: {left: -20, top: 5},
+            create: function(e, ui) { ui_draggable = ui; },
+            helper: function(e) {
+                return $('<div>').attr('id', 'rcmdraglayer')
+                    .text($(e.target).first().text().trim());
+            }
+        }, opts);
+
+        $('li:not(.virtual)', container).draggable(my_opts);
+
+        return this;
     }
 
-    draggable_opts = opts;
-
-    var my_opts = $.extend({
-        appendTo: 'body',
-        revert: 'invalid',
-        iframeFix: true,
-        addClasses: false,
-        cursorAt: {left: -20, top: 5},
-        create: function(e, ui) { ui_draggable = ui; },
-        helper: function(e) {
-          return $('<div>').attr('id', 'rcmdraglayer')
-            .text($(e.target).first().text().trim());
-        }
-      }, opts);
-
-    $('li:not(.virtual)', container).draggable(my_opts);
-
-    return this;
-  }
-
-  function is_draggable()
-  {
-    return !!ui_draggable;
-  }
+    function is_draggable()
+    {
+        return !!ui_draggable;
+    }
 }
 
 // use event processing functions from Roundcube's rcube_event_engine
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 633256e24..3d2a3aa73 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -297,9 +297,9 @@ function rcube_elastic_ui()
                 parent = $(this).parent('li'),
                 re = /(large|big|small|phone|lbs)/g;
 
-                while (m = re.exec(v)) {
-                    $(parent.length ? parent : this).addClass('hidden-' + m[1]);
-                }
+            while (m = re.exec(v)) {
+                $(parent.length ? parent : this).addClass('hidden-' + m[1]);
+            }
         });
 
         // Modify normal checkboxes on lists so they are different
@@ -332,8 +332,8 @@ function rcube_elastic_ui()
         // Set .notree class on treelist widget update
         $('.treelist').each(function() {
             var list = this, callback = function() {
-                    $(list)[$('.treetoggle', list).length > 0 ? 'removeClass' : 'addClass']('notree');
-                };
+                $(list)[$('.treetoggle', list).length > 0 ? 'removeClass' : 'addClass']('notree');
+            };
 
             if (window.MutationObserver) {
                 (new MutationObserver(callback)).observe(list, {childList: true, subtree: true});
@@ -390,7 +390,7 @@ function rcube_elastic_ui()
             btn_class = target[0].className + (add_class ? ' ' + add_class : '');
 
         if (!menu_button) {
-            btn_class = btn_class.replace('btn-primary', 'primary').replace(/(btn[a-z-]*|button|disabled)/g, '').trim()
+            btn_class = btn_class.replace('btn-primary', 'primary').replace(/(btn[a-z-]*|button|disabled)/g, '').trim();
             btn_class += ' button' + (!always_active ? ' disabled' : '');
         }
         else if (popup = target.data('popup')) {
@@ -666,13 +666,13 @@ function rcube_elastic_ui()
         };
 
         rcmail.addEventListener('fileappended', function(e) {
-                if (e.attachment.complete) {
-                    attachmentmenu_append(e.item);
-                    if (e.attachment.mimetype == 'text/vcard' && rcmail.commands['attach-vcard']) {
-                        phone_confirmation('vcard_attachments.vcardattached');
-                    }
+            if (e.attachment.complete) {
+                attachmentmenu_append(e.item);
+                if (e.attachment.mimetype == 'text/vcard' && rcmail.commands['attach-vcard']) {
+                    phone_confirmation('vcard_attachments.vcardattached');
                 }
-            })
+            }
+        })
             .addEventListener('managesieve.insertrow', function(o) { bootstrap_style(o.obj); })
             .addEventListener('add-recipient', function() { phone_confirmation('recipientsadded'); });
 
@@ -1065,17 +1065,17 @@ function rcube_elastic_ui()
 
             $(this).addClass('custom-file-input').wrap('<div class="custom-file">');
             $(this).on('change', function() {
-                    var text = label_text;
-                    if (this.files.length) {
-                        text = this.files[0].name;
-                        if (this.files.length > 1) {
-                            text += ', ...';
-                        }
+                var text = label_text;
+                if (this.files.length) {
+                    text = this.files[0].name;
+                    if (this.files.length > 1) {
+                        text += ', ...';
                     }
+                }
 
-                    // Note: We don't use label variable to allow cloning of the input
-                    $(this).next().text(text);
-                })
+                // Note: We don't use label variable to allow cloning of the input
+                $(this).next().text(text);
+            })
                 .parent().append(label);
         });
 
@@ -1396,7 +1396,7 @@ function rcube_elastic_ui()
                         $('#compose-subject').focus();
                         floating = false;
                     }
-                    toolbar.css({position: 'relative', top: 0, width: 'auto'})
+                    toolbar.css({position: 'relative', top: 0, width: 'auto'});
                 }
             });
 
@@ -1590,22 +1590,22 @@ function rcube_elastic_ui()
 
         if (rcmail.task == 'mail') {
             switch (args.command) {
-            case 'reply-list':
-                if (rcmail.env.reply_all_mode == 1) {
-                    var label = rcmail.gettext(args.status ? 'replylist' : 'replyall');
-                    $('.toolbar a.reply-all').attr('title', label).find('.inner').text(label);
-                }
-                break;
+                case 'reply-list':
+                    if (rcmail.env.reply_all_mode == 1) {
+                        var label = rcmail.gettext(args.status ? 'replylist' : 'replyall');
+                        $('.toolbar a.reply-all').attr('title', label).find('.inner').text(label);
+                    }
+                    break;
 
-            case 'compose-encrypted':
+                case 'compose-encrypted':
                 // show the toolbar button for Mailvelope
-                $('.toolbar a.encrypt').parent().show();
-                break;
+                    $('.toolbar a.encrypt').parent().show();
+                    break;
 
-            case 'compose-encrypted-signed':
+                case 'compose-encrypted-signed':
                 // enable selector for encrypt and sign
-                $('#encryption-menu-button').show();
-                break;
+                    $('#encryption-menu-button').show();
+                    break;
             }
         }
     };
@@ -1663,7 +1663,7 @@ function rcube_elastic_ui()
         // Hide content frame buttons on small devices (with frame toolbar in parent window)
         $.each(content_buttons, function() { $(this)[mobile ? 'hide' : 'show'](); });
 
-        rcmail.triggerEvent('skin-resize', { mode: mode })
+        rcmail.triggerEvent('skin-resize', { mode: mode });
     };
 
     function screen_resize()
@@ -2306,10 +2306,10 @@ function rcube_elastic_ui()
             };
 
         $(item).attr({
-                'aria-haspopup': 'true',
-                'aria-expanded': 'false',
-                'aria-owns': popup_id,
-            })
+            'aria-haspopup': 'true',
+            'aria-expanded': 'false',
+            'aria-owns': popup_id,
+        })
             .popover({
                 content: content_element,
                 trigger: $(item).data('popup-trigger') || 'click',
@@ -2338,9 +2338,9 @@ function rcube_elastic_ui()
                     // Stop propagation on menu items that have popups
                     // to make a click on them not hide their parent menu(s)
                     .find('[aria-haspopup="true"]')
-                        .data('level', level + 1)
-                        .off('click.popup')
-                        .on('click.popup', function(e) { e.stopPropagation(); });
+                    .data('level', level + 1)
+                    .off('click.popup')
+                    .on('click.popup', function(e) { e.stopPropagation(); });
 
                 if (!is_mobile()) {
                     // Set popup height so it is less than the window height
@@ -2465,16 +2465,16 @@ function rcube_elastic_ui()
             .on('keydown', function(e) {
                 if (e.originalEvent) {
                     switch (e.originalEvent.which) {
-                    case 13:
-                    case 32:
+                        case 13:
+                        case 32:
                         // Open the popup on ENTER or SPACE
-                        e.preventDefault();
-                        $(this).data('event', 'key').popover('toggle');
-                        break;
-                    case 27:
+                            e.preventDefault();
+                            $(this).data('event', 'key').popover('toggle');
+                            break;
+                        case 27:
                         // Close the popup on ESC key
-                        $(this).popover('hide');
-                        break;
+                            $(this).popover('hide');
+                            break;
                     }
                 }
             });
@@ -2558,13 +2558,13 @@ function rcube_elastic_ui()
                 // create a fake element to position drag menu on the cursor position
                 pos = rcube_event.get_mouse_pos(p.originalEvent);
                 target = $('<a>').css({
-                        position: 'absolute',
-                        left: pos.x,
-                        top: pos.y,
-                        height: '1px',
-                        width: '1px',
-                        visibility: 'hidden'
-                    })
+                    position: 'absolute',
+                    left: pos.x,
+                    top: pos.y,
+                    height: '1px',
+                    width: '1px',
+                    visibility: 'hidden'
+                })
                     .appendTo(document.body).get(0);
             }
 
@@ -2613,7 +2613,7 @@ function rcube_elastic_ui()
 
                 // setTimeout fixes Shift + drag'n'drop menu in Chrome (#8107)
                 setTimeout(function() { $(target).popover('show'); }, 1);
-            }
+            };
 
             fn();
         }
@@ -2839,7 +2839,7 @@ function rcube_elastic_ui()
             }
 
             $(obj).find('.proplist > li > a.dropdown').on('click', function() {
-                var list = $(this).next()
+                var list = $(this).next();
                 list[list.is('.d-none') ? 'removeClass' : 'addClass']('d-none');
             });
         }
@@ -3044,11 +3044,11 @@ function rcube_elastic_ui()
                 fname = item.find('a.filename');
 
             var button = $('<a>').attr({
-                    href: '#',
-                    tabindex: fname.attr('tabindex') || 0,
-                    title: label,
-                    'class': 'button icon dropdown skip-content'
-                })
+                href: '#',
+                tabindex: fname.attr('tabindex') || 0,
+                title: label,
+                'class': 'button icon dropdown skip-content'
+            })
                 .on('click', function(e) {
                     return attachmentmenu($('#attachmentmenu'), button, e);
                 })
@@ -3277,7 +3277,7 @@ function rcube_elastic_ui()
             button_class: opts.button_class || 'insert recipient',
             height: 600,
             classes: {
-              'ui-dialog-content': 'p-0' // remove padding on dialog content
+                'ui-dialog-content': 'p-0' // remove padding on dialog content
             },
             open: function() {
                 // Don't want focus in the search field, we focus first contacts source record instead
@@ -3353,7 +3353,7 @@ function rcube_elastic_ui()
 
                 email_element.text((name ? email : '') + ',');
                 recipient.attr('title', name ? (name + email) : null)
-                    .append([name_element, email_element, link])
+                    .append([name_element, email_element, link]);
 
                 if (replace)
                     replace.replaceWith(recipient);
@@ -3584,21 +3584,21 @@ function rcube_elastic_ui()
             content = $('<label>').text(rcmail.gettext('recipient')).append(input);
 
         rcmail.simple_dialog(content, 'recipientedit', function() {
-                var result, value = input.val();
-                if (value) {
-                    if (value != recipient) {
-                        result = recipient_input_parser(value);
+            var result, value = input.val();
+            if (value) {
+                if (value != recipient) {
+                    result = recipient_input_parser(value);
 
-                        if (result.recipients.length != 1) {
-                            return false;
-                        }
-
-                        callback(result.recipients[0].name, result.recipients[0].email, element);
+                    if (result.recipients.length != 1) {
+                        return false;
                     }
 
-                    return true;
+                    callback(result.recipients[0].name, result.recipients[0].email, element);
                 }
-            });
+
+                return true;
+            }
+        });
     };
 
     /**
@@ -3637,9 +3637,9 @@ function rcube_elastic_ui()
             // custom 'loaded' event is expected to be triggered by plugins
             // when using the loader not on an iframe
             frame.on('load error loaded', function() {
-                    // wait some time to make sure the iframe stopped loading
-                    setTimeout(function() { loader.remove(); }, 500);
-                })
+                // wait some time to make sure the iframe stopped loading
+                setTimeout(function() { loader.remove(); }, 500);
+            })
                 .parent().append(loader);
 
             // fix scrolling in iOS
@@ -3916,7 +3916,7 @@ function rcube_elastic_ui()
 
                     return false;
                 }
-            })
+            });
     };
 
     /**
@@ -4081,12 +4081,12 @@ function rcube_elastic_ui()
                 + '</div>');
 
         input = elem.find('input').attr({
-                value: value,
-                name: field.name + '[]',
-                size: $(field).data('size'),
-                title: field.title,
-                placeholder: field.placeholder
-            })
+            value: value,
+            name: field.name + '[]',
+            size: $(field).data('size'),
+            title: field.title,
+            placeholder: field.placeholder
+        })
             .keydown(function(e) {
                 // element creation event (on Enter)
                 if (e.which == 13) {
@@ -4280,7 +4280,7 @@ function rcube_elastic_ui()
             $(body).css({
                 color: $(document.body).css('color'),
                 backgroundColor: $(document.body).css('background-color')
-            })
+            });
         };
 
         var setColor = color_mode == 'dark' && /_task=mail/.test(url) && /_action=viewsource/.test(url);
@@ -4423,7 +4423,7 @@ if (window.rcmail) {
 
         // just delegate the action to rcube_elastic_ui
         return rcmail.triggerEvent(show === false ? 'menu-close' : 'menu-open', {name: name, obj: obj, props: prop, originalEvent: event});
-    }
+    };
 
     /**
      * Elastic version of hide_menu as we don't need e.g. menus stack handling
@@ -4432,7 +4432,7 @@ if (window.rcmail) {
     {
         // delegate to rcube_elastic_ui
         return rcmail.triggerEvent('menu-close', {name: name, props: {menu: name}, originalEvent: event});
-    }
+    };
 }
 else {
     // rcmail does not exists e.g. on the error template inside a frame