File HEAD.patch of Package roundcubemail-plugin-contextmenu

Overview Repositories Revisions Requests Users Attributes Meta

File HEAD.patch of Package roundcubemail-plugin-contextmenu (Revision d1d1cf6a0c39ef1d0cd21618bf4a86d7)

Currently displaying revision d1d1cf6a0c39ef1d0cd21618bf4a86d7 , Show latest

diff --git a/CHANGELOG b/CHANGELOG
index de69456..95d3200 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,42 @@
 Roundcube Webmail ContextMenu
 =============================
 
+ * Rework Contextmenu settings object
+ * Rework core Contextmenu JS functions
+    * rcm_listmenu_init() -> rcmail.contextmenu.init_list()
+    * rcm_foldermenu_init()-> rcmail.contextmenu.init_folder()
+    * rcm_abookmenu_init()-> rcmail.contextmenu.init_addressbook()
+    * rcm_callbackmenu_init()-> return rcmail.contextmenu.init()
+    * rcm_show_menu()-> rcmail.contextmenu.show_one()
+    * rcm_hide_menu()-> rcmail.contextmenu.hide_all()
+    * rcm_check_button_state()-> return rcmail.contextmenu.ui_button_check()
+ * Allow skins to set Contextmenu classes
+ * Remove IE8 hacks
+ * Improve menu element parsing, allow for popup menu functions in skin
+ * Add new event submenu_toggle to handle display of hidden menus
+ * Disable right click on context menu
+ * Depreciate right-arrow class, use sub-button instead
+ * Depreciate contextRow class, use context-source instead
+ * Depreciate rcmmainmenu class, use rcm-mainmenu instead
+ * Depreciate rcmsubmenu and submenu classes, use rcm-submenu instead
+ * Depreciate rcm_active class, use rcm-active instead
+ * Depreciate rcm_ignore class, use rcm-ignore instead
+ * Add new event addmenuitem
+ * Add ability to add to core event handlers as well as replace them
+ * Improve collapseall/expandall JS functions to better mimic true click
+ * Use getselection list event added (req RC e9eb87d, afaaa77, 2f7aaca)
+ * Change rcube_context_menu.list_object from Object to String, backwards compatibility added for Contact list but no others
+ * Replace overload_commands option with always_enable_commands
+ * overload_commands option removed (req RC afaaa77)
+ * Add Elastic skin support
+ * Add menu-change JS event listener
+ * Support new Contacts toolbar with Copy/Move actions (req RC eb0228b)
+ * Add menus to Settings screens
+ * Add contextmenu_mouseover_timeout config option to override default mouseover timeout for submenus
+ * Extend activate hook, now returns JSON rather than Boolean
+ * Make menu button inactive if all subactions are inactive (req RC daf4607)
+ * Use new treelist collapse_all/expand_all functions (req RC 3a40f6c)
+
 Version 2.3 (2017-06-14, rc-1.3)
 =================================================
  * Remove special handling for group-create/rename (requires roundcube rev ec98aa5)
diff --git a/MANUAL.md b/MANUAL.md
old mode 100755
new mode 100644
index 6cd989c..4923be2
--- a/MANUAL.md
+++ b/MANUAL.md
@@ -2,19 +2,42 @@
 
 This file provides information for plugin and skin developers. The Contextmenu plugin can be extended by other plugins; new menus can be created and existing menus manipulated. For basic installation information please see the [README](./README.md).
 
+- [Global options](#global-options)
 - [Creating a new Contextmenu](#creating-a-new-contextmenu)
 - [Working with an existing Contextmenu](#working-with-an-existing-contextmenu)
 - [Events](#events)
 - [Contextmenu and skins](#contextmenu-and-skins)
 
+## Global options
+
+The following global options are available:
+* no_right_click_on_menu - (boolean) treat right click as left click when on the contextmenu
+* skip_commands - (array) Roundcube commands that should be ignored by the contextmenu
+* always_enable_commands - (array) Roundcube commands that should rename enabled, once clicked, until the menu is closed
+* command_pattern - (regex) pattern matching the Roundcube command call
+* popup_attrib - (string) attribute that contains the Roundcube popup call
+* popup_pattern - (regex) pattern matching the Roundcube popup call
+* popup_func - (string) function used by Contextmenu when opening a popup
+* classes - (object) CSS classes for various aspects of the menu
+    * container - class(es) applied to the menu container
+    * mainmenu - class(es) applied to the menu container of top level menus
+    * submenu - class(es) applied to the menu container of sub menus
+    * button_remove - thse class(es) will be removed from the context menu button (for example classes that are used in the UI which are not needed in the context menu)
+    * button_active - class(es) for buttons in an active state
+    * button_disabled - class(es) for buttons in an inactive state
+* menu_defaults - (object) default options for Contextmenu objects
+* menu_events - (object) default events for Contextmenu objects
+
+Note: When specifying multiple classes each one should be separated by a space
+
 ## Creating a new Contextmenu
 
-By default Contextmenu is added to the `mail` and `addressbook` tasks in Roundcube. It can be added to other tasks by calling the PHP function `include_plugin()` like this `$this->include_plugin('contextmenu');` from inside your plugin. This function checks if the Contextmenu plugin is available and loads it if possible.
+By default Contextmenu is added to all tasks in Roundcube except `login`.
 
-The JavaScript function `rcm_callbackmenu_init()` creates the Contextmenu object. If the Contextmenu functions are enabled in the UI then the `rcmail.env.contextmenu` variable JavaScript will be set to true. Setting this variable to false will disable all context menus.
+The JavaScript function `rcmail.contextmenu.init()` creates the Contextmenu object. If the Contextmenu functions are enabled in the UI then the `rcmail.env.contextmenu` variable JavaScript will be set to true. Setting this variable to false will disable all context menus.
 
 ```js
-var menu = rcm_callbackmenu_init(props, events);
+var menu = rcmail.contextmenu.init(props, events);
 ```
 
 The functions takes 2 parameters:
@@ -25,12 +48,24 @@ The functions takes 2 parameters:
 * list_object - (object) optional - If Contextmenu is used on a Roundcube list object then that list object should be set here (e.g. `rcmail.message_list`), set to `null` if using Contextmenu on another element. It is set to `rcmail.message_list` by default.
 * source_class - (string) optional - The CSS class applied to the triggering element, `contextRow` by default.
 * mouseover_timeout - (int) optional - The delay for displaying submenus on mouseover, set to -1 to disable mouseover. `400` by default.
+* classes - (object) optional - CSS classes for various aspects of the menu:
+    * source - class(es) applied to object on which the menu was triggered
+    * div - class(es) applied to the menu container
+    * ul - class(es) applied to the UL object in the menu
+    * a - class(es) applied to the A objects in the menu
+    * span - class(es) applied to spans inside in the A objects
+    * sub_button_a - class(es) applied to A objects which have a submenu
+    * sub_button_span - class(es) applied to the submenu indicator element, set to null to remove this span
+* modal - (boolean) optional - Display the menu in a modal fashion
+* skinable - (boolean) optional - Value passed to the skinable param of the menu-open event. `false` by default.
 
 `events` (optional) JSON object. Contextmenu triggers a number of events during execution, for example `command` is tiggered when the user clicks on an item in the menu. Full details of all the events can be found in the [Events](#events) section of this file. This parameters allows a plugin author to attach their own functions to the Contextmenu events, overriding the defaults.
 
+Displaying submenus on mouseover: A config value named `contextmenu_mouseover_timeout` can be set in your main Roundcube config file to define the default `mouseover_timeout` value as something other than `400`.
+
 Creating a simple Contextmenu looks like this:
 ```js
-var menu = rcm_callbackmenu_init(
+var menu = rcmail.contextmenu.init(
   {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'},
   {'beforeactivate': function(p) {
     rcmail.env.contextmenu_selection = p.ref.list_selection(true);
@@ -43,45 +78,46 @@ var menu = rcm_callbackmenu_init(
 The Contextmenu must then be attached to the element(s) in the UI. For example:
 ```js
 $(el).on("contextmenu", function(e) {
-  rcm_show_menu(e, obj, source_id, menu);
+  rcmail.contextmenu.show_one(e, obj, source_id, menu);
 });
 ```
 
-The `rcm_show_menu` displays a Contextmenu on the screen. It has the following parameters:
+The `rcmail.contextmenu.show` displays a Contextmenu on the screen. It has the following parameters:
 * e - (event) The JS event object
 * obj - (object) The object the Contextmenu is active on (typically `this`)
 * source_id - (string) The object ID used by core function. When using the Contextmenu on a Roundcube list object then the ID can be retrieved from the object, like this:
 ```js
 if (uid = list_object.get_row_uid(this)) {
-  rcm_show_menu(e, this, uid, menu);
+  rcmail.contextmenu.show_one(e, this, uid, menu);
 }
 ```
 The ID can also be extracted from the originial function call, like this:
 ```js
-if (source.attr('onclick') && source.attr('onclick').match(rcmail.context_menu_command_pattern)) {
-  rcm_show_menu(e, this, RegExp.$2, menu);
+if (source.attr('onclick') && (matches = source.attr('onclick').match(rcmail.contextmenu.command_pattern))) {
+  rcmail.contextmenu.show_one(e, this, matches[2], menu);
 }
 ```
-* menu - (object) The menu object as created by `rcm_callbackmenu_init`
+* menu - (object) The menu object as created by `rcmail.contextmenu.init`
 
 ## Menu sources
 
 The menu_source parameter can be a string (for building the Contextmenu from a single source) or an array of jQuery selectors. To add custom elements to the Contextmenu a menu element must first be added to the IU, for example:
 ```php
+$rcube = rcube::get_instance();
 $li = '';
-$li .= html::tag('li', null, $this->api->output->button(array('command' => 'plugin.myplugin.command1', 'type' => 'link', 'class' => 'myclass1', 'label' => 'myplugin.command1')));
-$li .= html::tag('li', null, $this->api->output->button(array('command' => 'plugin.myplugin.command2', 'type' => 'link', 'class' => 'myclass2', 'label' => 'myplugin.command2')));
-$li .= html::tag('li', null, $this->api->output->button(array('command' => 'plugin.myplugin.command3', 'type' => 'link', 'class' => 'myclass3', 'label' => 'myplugin.command3')));
+$li .= html::tag('li', null, $rcube->output->button(array('command' => 'plugin.myplugin.command1', 'type' => 'link', 'class' => 'myclass1', 'label' => 'myplugin.command1')));
+$li .= html::tag('li', null, $rcube->output->button(array('command' => 'plugin.myplugin.command2', 'type' => 'link', 'class' => 'myclass2', 'label' => 'myplugin.command2')));
+$li .= html::tag('li', null, $rcube->output->button(array('command' => 'plugin.myplugin.command3', 'type' => 'link', 'class' => 'myclass3', 'label' => 'myplugin.command3')));
 $out = html::tag('ul', array('id' => 'mymenu'), $li);
-$this->api->output->add_footer(html::div(array('style' => 'display: none;'), $out));
+$rcube->output->add_footer(html::div(array('style' => 'display: none;'), $out));
 ```
 The Contextmenu can then be invoked like this:
 ```js
-var menu = rcm_callbackmenu_init({menu_name: 'mymenu', menu_source: '#mymenu'});
+var menu = rcmail.contextmenu.init({menu_name: 'mymenu', menu_source: '#mymenu'});
 ```
 A JSON object can also be used instead of an element selector to add simple elements to the Contextmenu. For example:
 ```js
-var menu = rcm_callbackmenu_init({menu_name: 'mymenu', menu_source: ['#mymenu', {lable: 'extra item', command: 'plugin.myplugin.command', props: '', class: 'myclass'}]});
+var menu = rcmail.contextmenu.init({menu_name: 'mymenu', menu_source: ['#mymenu', {label: 'extra item', command: 'plugin.myplugin.command', props: '', class: 'myclass'}]});
 ```
 The JSON object can have:
 * `label` (string) required - text for the menu element
@@ -122,11 +158,11 @@ On the address book screen:
 * contactlist - attached to rows in the contacts list
 * abooklist - attached to addressbooks and groups
 
-To prevent an element from appearing in a Contextmenu give it the class `rcm_ignore`.
+To prevent an element from appearing in a Contextmenu give it the class `rcm-ignore`.
 
-To make sure an element in the Contextmenu is always active give it the class `rcm_active`.
+To make sure an element in the Contextmenu is always active give it the class `rcm-active`.
 
-The environmental variable `rcmail.env.context_menu_source_id` contains the ID of the specific element that the Contextmenu was triggered on, this is the `source_id` passed to `rcm_show_menu`
+The environmental variable `rcmail.env.context_menu_source_id` contains the ID of the specific element that the Contextmenu was triggered on, this is the `source_id` passed to `rcmail.contextmenu.show`
 
 ## Events
 
@@ -135,6 +171,13 @@ The following events are triggered by Contextmenu:
 `init` - Triggered once the Contextmenu object has been initalized
 * ref - The Contextmenu object
 
+`addmenuitem` - Triggered when an element is being added to the menu
+* ref - The Contextmenu object
+* el - The element being added
+This function can return the following in a JSON object:
+* result - The element to be added to the menu
+* abort - Boolean, abort the default command execution
+
 `beforecommand` - Triggered when an element in the menu is clicked
 * ref - The Contextmenu object
 * el - The HTML object being clicked
@@ -156,17 +199,8 @@ By default the following function is used:
 
 ```js
 function(p) {
-  if (!$(p.el).hasClass('active'))
-    return false;
-
-  if (p.ref.list_object) {
-    var prev_display_next = rcmail.env.display_next;
-
-    if (!(p.ref.list_object.selection.length == 1 && p.ref.list_object.in_selection(rcmail.env.context_menu_source_id)))
-      rcmail.env.display_next = false;
-
-    var prev_sel = p.ref.list_selection(true);
-  }
+  if (!$(p.el).hasClass(rcmail.contextmenu.settings.classes.button_active))
+    return;
 
   // enable the required command
   var prev_command = rcmail.commands[p.command];
@@ -174,14 +208,12 @@ function(p) {
   var result = rcmail.command(p.command, p.args, p.el, p.evt);
   rcmail.enable_command(p.command, prev_command);
 
-  if (p.ref.list_object) {
-    p.ref.list_selection(false, prev_sel);
-    rcmail.env.display_next = prev_display_next;
+  // leave commands in always_enable_commands enabled, they are disabled when menu is closes
+  if ($.inArray(p.command, rcmail.contextmenu.settings.always_enable_commands) >= 0 && prev_command === false) {
+      rcmail.contextmenu.vars.commands_disable_on_hide.push(p.command);
   }
-
-  if ($.inArray(p.command, rcmail.context_menu_overload_commands) >= 0) {
-    rcmail.context_menu_commands[p.command] = rcmail.commands[p.command];
-    rcmail.enable_command(p.command, true);
+  else {
+      rcmail.enable_command(p.command, prev_command);
   }
 
   return result;
@@ -196,9 +228,15 @@ The Contextmenu works by faking a message selection and calling the normal Round
 * command - The Roundcube command to run
 * args - The arguments being passed to the Roundcube command
 
+`submenu_toggle` - Triggered when a hidden menu is being loaded for display in the Contextmenu
+* id - The ID of the menu being shown
+* ref - The Contextmenu object
+* show - Boolean, show the menu or not
+
 `beforeactivate` - Triggered when a Contextmenu is displayed
 * ref - The Contextmenu object
 * source - The element the Contextmenu has been triggered on
+* originalEvent - The triggering event
 This function can return the following in a JSON object:
 * abort - Boolean, abort the default activation process, other events like `activate` and `afteractivat` will not be executed
 * show - Boolean, show the menu or not
@@ -209,21 +247,30 @@ This function can return the following in a JSON object:
 * source - The element the Contextmenu has been triggered on
 * command - The command the menu element executes
 * enabled - Boolean, if the menu element is active or not
-This function can return a boolean value: true to activate the element, false to disable it
+This function can return the following in a JSON object:
+* abort - Boolean, abort the default activation process
+* enabled - Boolean, set the menu element to active or not
 
 `afteractivate` - Triggered when a Contextmenu is displayed
 * ref - The Contextmenu object
 * source - The element the Contextmenu has been triggered on
+* originalEvent - The triggering event
 
 `insertitem` - Triggered each time an item is added to a Contextmenu
+* ref - The Contextmenu object
 * item - The HTML object to be added to the menu
+* originalElement - The original element from the UI
+
+`hide_menu` - Triggered a menu is hidden
+* ref - The Contextmenu object
+* originalElement - The original element from the UI
 
 For example permanently deactivating the delete option on the message list Contextmenu could be done like this:
 ```js
 rcmail.addEventListener('contextmenu_init', function(menu) {
   if (menu.menu_name == 'messagelist') {
     menu.addEventListener('activate', function(p) {
-	  var is_delete = false;
+      var is_delete = false;
 
       $.each(rcmail.buttons['delete'], function() {
         if (this.id == p.btn) {
@@ -238,9 +285,11 @@ rcmail.addEventListener('contextmenu_init', function(menu) {
 });
 ```
 
+Note: A plus sign (+) can be prepended to an event name, for example `+beforeactivate`, to add the new event handler to the existing one used by the core rather than replacing it.
+
 ## Contextmenu and skins
 
-In the plugin folder there is a skins folder, and inside that there is a folder for each skin. Two files are needed for each skin: contextmenu.css - CSS for the menu, and functions.js containing the JavaScript to create Contextmenus in the skin. This plugin provides some helper functions for adding the default menus to the UI, they are: `rcm_listmenu_init()` for attaching a Contextmenu to a Roundcube list object, `rcm_foldermenu_init()` for attaching a Contextmenu to the folder list on the mail screen, and `rcm_abookmenu_init()` for attaching a Contextmenu to the address book and groups list on the address book screen. Each function expects the same 3 parameters:
+In the plugin folder there is a skins folder, and inside that there is a folder for each skin. Two files are needed for each skin: contextmenu.css - CSS for the menu, and functions.js containing the JavaScript to create Contextmenus in the skin. This plugin provides some helper functions for adding the default menus to the UI, they are: `rcmail.contextmenu.init_list()` for attaching a Contextmenu to a Roundcube list object, `rcmail.contextmenu.init_folder()` for attaching a Contextmenu to the folder list on the mail screen, `rcmail.contextmenu.init_addressbook()` for attaching a Contextmenu to the address book and groups list on the address book screen, and `rcmail.contextmenu.init_settings()` for attaching a Contextmenu to the settings list. Each function expects the same 3 parameters:
 * The HTML object or jQuery selector of the element to attach to.
 * A props object, see [Creating a new Contextmenu](#creating-a-new-contextmenu)
 * An events object, see [Events](#events)
diff --git a/README.md b/README.md
index a6767aa..6902925 100644
--- a/README.md
+++ b/README.md
@@ -3,6 +3,15 @@ Roundcube Webmail ContextMenu
 This plugin creates contextmenus for various parts of Roundcube using commands
 from the toolbars.
 
+ATTENTION
+---------
+This is just a snapshot from the GIT repository and is **NOT A STABLE version
+of ContextMenu**. It is Intended for use with the **GIT-master** version of
+Roundcube and it may not be compatible with older versions. Stable versions of
+ContextMenu are available from the [Roundcube plugin repository][rcplugrepo]
+(for 1.0 and above) or the [releases section][releases] of the GitHub
+repository.
+
 License
 -------
 This plugin is released under the [GNU General Public License Version 3+][gpl].
@@ -21,6 +30,12 @@ Install
 directory called contextmenu and place the files in there, ignoring the root
 directory in the downloaded archive.
 
-[rcplugrepo]: http://plugins.roundcube.net/packages/johndoh/contextmenu
-[releases]: http://github.com/JohnDoh/Roundcube-Plugin-Context-Menu/releases
-[gpl]: http://www.gnu.org/licenses/gpl.html
\ No newline at end of file
+Contextmenu manual
+------------------
+The MANUAL.md file shipped with this plugin contains information for plugin and
+skin developers. The Contextmenu plugin can be extended by other plugins; new
+menus can be created and existing menus manipulated.
+
+[rcplugrepo]: https://plugins.roundcube.net/packages/johndoh/contextmenu
+[releases]: https://github.com/johndoh/roundcube-contextmenu/releases
+[gpl]: https://www.gnu.org/licenses/gpl.html
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 188e9f0..7488d6d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,10 +2,10 @@
   "name": "johndoh/contextmenu",
   "description": "Adds context menus with common tasks to various parts of Roundcube",
   "keywords": ["context","menu","right-click"],
-  "homepage": "http://github.com/JohnDoh/Roundcube-Plugin-Context-Menu/",
+  "homepage": "https://github.com/johndoh/roundcube-contextmenu/",
   "license": "GPL-3.0",
   "type": "roundcube-plugin",
-  "version": "2.3",
+  "version": "3.0-git",
   "authors": [
     {
       "name": "Philip Weir",
@@ -16,7 +16,7 @@
   "repositories": [
     {
       "type": "composer",
-      "url": "http://plugins.roundcube.net"
+      "url": "https://plugins.roundcube.net"
     }
   ],
   "require": {
@@ -25,7 +25,7 @@
   },
   "extra": {
     "roundcube": {
-      "min-version": "1.3"
+      "min-version": "1.4-dev"
     }
   }
 }
\ No newline at end of file
diff --git a/contextmenu.js b/contextmenu.js
index 40c1705..97b6a75 100644
--- a/contextmenu.js
+++ b/contextmenu.js
@@ -4,7 +4,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2009-2014 Philip Weir
+ * Copyright (C) Philip Weir
  *
  * The JavaScript code in this page is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License
@@ -15,1013 +15,1107 @@
  * for the JavaScript code in this file.
  */
 
-rcube_webmail.prototype.context_menu_skip_commands = new Array('mail-checkmail', 'mail-compose', 'addressbook-add', 'addressbook-import', 'addressbook-advanced-search', 'addressbook-search-create');
-rcube_webmail.prototype.context_menu_overload_commands = new Array('move', 'copy');
-rcube_webmail.prototype.context_menu_commands = new Array();
-rcube_webmail.prototype.context_menu_popup_menus = new Array();
-rcube_webmail.prototype.context_menu_popup_commands = {};
-
-rcube_webmail.prototype.context_menu_command_pattern = /rcmail\.command\(\'([^\']+)\',\s?\'((?:\\\'|[^\'])*)\'/;
-
-function rcm_listmenu_init(row, props, events) {
-	if (!events)
-		events = {};
-
-	var menu = rcm_callbackmenu_init(props, $.extend({
-		'beforeactivate': function(p) {
-			rcmail.env.contextmenu_selection = p.ref.list_selection(true);
-		},
-		'afteractivate': function(p) {
-			p.ref.menu_selection = p.ref.list_object.get_selection();
-			p.ref.list_selection(false, rcmail.env.contextmenu_selection);
-		}
-	}, events));
-
-	var list_object = props.list_object ? props.list_object : rcmail.message_list;
-	$("#" + row).on("contextmenu", function(e) {
-		if (uid = list_object.get_row_uid(this)) {
-			rcm_show_menu(e, this, uid, menu);
-		}
-	});
-}
-
-function rcm_foldermenu_init(el, props, events) {
-	if (!events)
-		events = {};
-
-	var menu = rcm_callbackmenu_init($.extend({'menu_name': 'folderlist', 'list_object': null}, props), $.extend({
-		'beforeactivate': function(p) {
-			if (rcmail.env.contextmenu_messagecount_request) {
-				rcmail.env.contextmenu_messagecount_request.abort();
-			}
-			rcmail.env.contextmenu_messagecount_request = null;
-		},
-		'activate': function(p) {
-			if ($.inArray(p.command, Array('expunge', 'purge', 'mark-all-read')) >= 0) {
-				// disable the commands by default
-				$(p.el).addClass('disabled').removeClass('active');
-
-				// if menu is opened on current folder (or special mark-all-read command) then enable the commands same as in UI
-				if ((rcmail.env.context_menu_source_id == rcmail.env.mailbox || p.command == 'mark-all-read') && rcm_check_button_state(p.btn, true)) {
-					$(p.el).addClass('active').removeClass('disabled');
-				}
-				// if menu is opened on difference folder then get message count for the folder
-				else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && !rcmail.env.contextmenu_messagecount_request) {
-					// folder check called async to prevent slowdown on menu load
-					rcmail.env.contextmenu_messagecount_request = $.ajax({
-						type: 'POST', url: rcmail.url('plugin.contextmenu.messagecount'), data: {'_mbox': rcmail.env.context_menu_source_id}, dataType: 'json', async: true,
-						success: function(data) {
-							if (data.messagecount > 0 && $('#rcm_folderlist').is(':visible')) {
-								// override the environment to check if commands should be abled
-								var temp_exists = rcmail.env.exists;
-								var temp_mailbox = rcmail.env.mailbox;
-								rcmail.env.exists = data.messagecount;
-								rcmail.env.mailbox = rcmail.env.context_menu_source_id;
-
-								$('#rcm_folderlist').find('a.cmd_expunge').addClass('active').removeClass('disabled');
-								if (rcmail.purge_mailbox_test()) {
-									$('#rcm_folderlist').find('a.cmd_purge').addClass('active').removeClass('disabled');
-								}
-
-								rcmail.env.exists = temp_exists;
-								rcmail.env.mailbox = temp_mailbox;
-							}
-						}
-					});
-				}
-			}
-		},
-		'beforecommand': function(p) {
-			if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && $.inArray(p.command, Array('expunge', 'purge')) >= 0) {
-				var result = rcmail[p.command + '_mailbox'](rcmail.env.context_menu_source_id);
-
-				// update the unread count and trash icon
-				if (p.command == 'purge' && result !== false) {
-					rcmail.set_unread_count(rcmail.env.context_menu_source_id, 0, false);
-
-					if (rcmail.env.context_menu_source_id == rcmail.env.trash_mailbox)
-						rcmail.set_trash_count(0);
-				}
-
-				return {'abort': true, 'result': true};
-			}
-			else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && p.command == 'mark-all-read') {
-				rcmail.mark_all_read(rcmail.env.context_menu_source_id);
-				return {'abort': true, 'result': true};
-			}
-		}
-	}, events));
-
-	$(el).click(function(e) {
-		// hide menu when changing folder
-		menu.hide(e);
-	})
-	.on("contextmenu", function(e) {
-		var source = $(this).children('a');
-
-		// remove focus (and keyboard nav highlighting) from A
-		source.blur();
-
-		if (source.attr('rel') && source.attr('onclick') && source.attr('onclick').match(rcmail.context_menu_command_pattern)) {
-			rcm_show_menu(e, this, source.attr('rel'), menu);
-		}
-	});
-}
-
-function rcm_abookmenu_init(el, props, events) {
-	if (!events)
-		events = {};
-
-	var menu = rcm_callbackmenu_init($.extend({'menu_name': 'abooklist'}, props), $.extend({
-		'beforeactivate': function(p) {
-			p.ref.container.find('li.submenu').remove();
-		},
-		'activate': function(p) {
-			var ids = rcmail.env.context_menu_source_id.split(':', 2);
-			cur_source = ids[0];
-
-			if (p.command == 'group-create') {
-				// addressbook
-				if ($(p.source).hasClass('addressbook') && rcmail.env.address_sources[cur_source].groups && !rcmail.env.address_sources[cur_source].readonly) {
-					$(p.el).addClass('active').removeClass('disabled');
-				}
-				else {
-					$(p.el).addClass('disabled').removeClass('active');
-				}
-			}
-			else if (p.command == 'group-rename' || p.command == 'group-delete') {
-				// group
-				if ($(p.source).hasClass('contactgroup') && !rcmail.env.address_sources[cur_source].readonly) {
-					$(p.el).addClass('active').removeClass('disabled');
-				}
-				else {
-					$(p.el).addClass('disabled').removeClass('active');
-				}
-			}
-			else if (p.command == 'search-delete') {
-				// saved search
-				if ($(p.source).hasClass('contactsearch')) {
-					$(p.el).addClass('active').removeClass('disabled');
-				}
-				else {
-					$(p.el).addClass('disabled').removeClass('active');
-				}
-			}
-		},
-		'command': function(p) {
-			if (!$(p.el).hasClass('active'))
-				return;
-
-			var prev_source = rcmail.env.source;
-			var prev_group = rcmail.env.group;
-			var result = false;
-
-			var ids = rcmail.env.context_menu_source_id.split(':', 2);
-			cur_source = ids[0];
-			cur_id = ids[1];
-
-			rcmail.env.source = cur_source;
-			rcmail.env.group = cur_id;
-
-			// enable the required command
-			var prev_command = rcmail.commands[p.command];
-			rcmail.enable_command(p.command, true);
-
-			switch (p.command) {
-				case 'search-delete':
-					var result = false;
-
-					if ($(p.ref.selected_object).children('a').attr('rel')) {
-						var prev_search_id = rcmail.env.search_id;
-						var prev_search_request = rcmail.env.search_request;
-						rcmail.env.search_request = true;
-						rcmail.env.search_id = $(p.ref.selected_object).children('a').attr('rel').replace('S', '');
-
-						result = rcmail.command(p.command, p.args, p.el, p.evt);
-
-						rcmail.env.search_request = prev_search_request;
-						rcmail.env.search_id = prev_search_id;
-					}
-					break;
-				default:
-					result = rcmail.command(p.command, p.args, p.el, p.evt);
-					break;
-			}
-
-			rcmail.enable_command(p.command, prev_command);
-			rcmail.env.source = prev_source;
-			rcmail.env.group = prev_group;
-
-			return result;
-		}
-	}, events));
-
-	$(el).click(function(e) {
-		// hide menu when changing address book
-		menu.hide(e);
-	})
-	.on("contextmenu",function(e) {
-		var source = $(this).children('a');
-
-		// remove focus (and keyboard nav highlighting) from A
-		source.blur();
-
-		if (source.attr('rel') && source.attr('rel').match(/([A-Z0-9\-_]+(:[A-Z0-9\-_]+)?)/i)) {
-			rcm_show_menu(e, this, RegExp.$1, menu);
-		}
-	});
-}
-
-function rcm_callbackmenu_init(props, events) {
-	var std_events = {
-		'command': function(p) {
-			if (!$(p.el).hasClass('active'))
-				return;
-
-			if (p.ref.list_object) {
-				var prev_display_next = rcmail.env.display_next;
-
-				if (!(p.ref.list_object.selection.length == 1 && p.ref.list_object.in_selection(rcmail.env.context_menu_source_id)))
-					rcmail.env.display_next = false;
-
-				var prev_sel = p.ref.list_selection(true);
-			}
-
-			// enable the required command
-			var prev_command = rcmail.commands[p.command];
-			rcmail.enable_command(p.command, true);
-			var result = rcmail.command(p.command, p.args, p.el, p.evt);
-			rcmail.enable_command(p.command, prev_command);
-
-			if (p.ref.list_object) {
-				p.ref.list_selection(false, prev_sel);
-				rcmail.env.display_next = prev_display_next;
-			}
-
-			if ($.inArray(p.command, rcmail.context_menu_overload_commands) >= 0) {
-				rcmail.context_menu_commands[p.command] = rcmail.commands[p.command];
-				rcmail.enable_command(p.command, true);
-			}
-
-			return result;
-		},
-		'activate': function(p) {
-			$(p.el).addClass(p.enabled ? 'active' : 'disabled');
-		}
-	}
-
-	if (events)
-		$.extend(std_events, events);
-
-	if (!rcmail.env.contextmenus[props.menu_name]) {
-		var menu = new rcube_context_menu(props);
-		$.each(std_events, function(trigger, func) {
-			menu.addEventListener(trigger, function(p) { return func(p); });
-		});
-		menu.init();
-		rcmail.env.contextmenus[props.menu_name] = menu;
-	}
-	else {
-		var menu = rcmail.env.contextmenus[props.menu_name];
-	}
-
-	return menu;
-}
-
-function rcm_show_menu(e, obj, id, menu) {
-	// if contextmenus have been disabled then show browser context menu as normal
-	if (!rcmail.env.contextmenu)
-		return true;
-
-	e.preventDefault();
-	e.cancelBubble = true;
-	if (e.stopPropagation)
-		e.stopPropagation();
-
-	// hide any other open menus
-	for (var i = 0; i < rcmail.menu_stack.length; i++) {
-		rcmail.hide_menu(rcmail.menu_stack[i], e);
-	}
-
-	rcmail.env.context_menu_source_id = id;
-	menu.show(obj, e);
-}
-
-function rcm_hide_menu(e, sub_only) {
-	$.each($(sub_only ? '.rcmsubmenu' : 'div.contextmenu'), function() {
-		if ($(this).is(':visible')) {
-			$(this).hide();
-			rcmail.triggerEvent('menu-close', { name: $(this).attr('id'), props:{ menu: $(this).attr('id') }, originalEvent: e });
-		}
-	});
-
-	// close popup menus opened by the contextmenu
-	for (var i = rcmail.context_menu_popup_menus.length - 1; i >= 0; i--) {
-		rcmail.hide_menu(rcmail.context_menu_popup_menus[i], e);
-		rcmail.context_menu_popup_menus.pop();
-	}
-}
-
-function rcube_context_menu(p) {
-	this.menu_name = null;
-	this.menu_source = null;
-	this.list_object = rcmail.message_list;
-	this.source_class = 'contextRow';
-	this.mouseover_timeout = 400;
-
-	this.is_submenu = false;
-	this.parent_menu = this;
-	this.parent_object = null;
-	this.selected_object = null
-	this.container = null;
-	this.original_selection = new Array();
-	this.menu_selection = new Array();
-	this.submenus = new Array();
-	this.timers = new Array();
-
-	// overwrite default parameters
-	if (p && typeof p === 'object')
-		for (var n in p)
-			this[n] = p[n];
-
-	var ref = this;
-
-	this.init = function() {
-		if (!this.container) {
-			rcmail.triggerEvent('contextmenu_init', this);
-
-			this.container = $('<div id="rcm_'+ this.menu_name +'" style="display: none;"></div>');
-			this.container.addClass('contextmenu popupmenu');
-			this.container.addClass(this.is_submenu ? 'rcmsubmenu' : 'rcmmainmenu');
-
-			var rows = [], ul = $('<ul role="menu">'),
-			li = $('<li>'),	link = $('<a>'), span = $('<span>');
-
-			ul.addClass('toolbarmenu iconized');
-			li.attr('role', 'menuitem');
-
-			link.attr('href', '#');
-			link.addClass('icon active');
-			link.attr('role', 'button');
-			link.attr('tabindex', '-1');
-			link.attr('aria-disabled', 'true');
-
-			span.addClass('icon');
-
-			// loop over possible menu elements and build settings object
-			sources = typeof this.menu_source == 'string' ? [this.menu_source] : this.menu_source;
-			this.menu_source = {}
-			$.each(sources, function(i) {
-				var source_elements;
-				if (typeof sources[i] == 'string') {
-					ref.menu_source[sources[i]] = {
-						'toggle': !$(sources[i]).is(':visible')
-					};
-					source_elements = $(sources[i]).children();
-				}
-				else {
-					ref.menu_source[i] = {
-						'toggle': false
-					};
-					source_elements = $(sources[i]);
-				}
-
-				ul.attr('aria-labelledby', $(sources[i]).attr('aria-labelledby'));
-
-				$.each(source_elements, function() {
-					var elem, command, args;
-
-					if ($(this).is('a')) {
-						elem = $(this).clone();
-					}
-					else if ($(this).is('span') && $(this).children().length == 2) {
-						elem = $(this).children(':first').clone();
-
-						if ($(this).children(':last').attr('onclick').match(rcmail.context_menu_popup_pattern)) {
-							$(elem).attr('onclick', $(this).children(':last').attr('onclick'));
-						}
-					}
-					else if ($(this).is('li') && $(this).children('a').length == 1) {
-						elem = $(this).children('a').clone();
-
-						if (!elem.attr('onclick') || !elem.attr('onclick').match(rcmail.context_menu_command_pattern))
-							return;
-					}
-					else if ($(this).parent().is('a')) {
-						elem = $(this).parent().clone();
-					}
-					else if (this.command && this.label) {
-						elem = $('<a>').attr('href', '#')
-								.attr('id', 'rcmjs')
-								.attr('onclick', "return rcmail.command('"+ this.command +"','"+ this.props +"',this,event)")
-								.addClass(this.classes)
-								.html(this.label);
-					}
-					else {
-						return;
-					}
-
-					// skip any element that does not look like a Roundcube button
-					if (!elem.attr('onclick')) {
-						return;
-					}
-
-					if (elem.attr('onclick').match(rcmail.context_menu_command_pattern)) {
-						command = RegExp.$1;
-						args = RegExp.$2;
-					}
-
-					// skip elements we don't need
-					if ($.inArray(rcmail.env.task + '-' + command, rcmail.context_menu_skip_commands) > -1 || elem.hasClass('rcm_ignore')) {
-						return;
-					}
-
-					var a = link.clone(), row = li.clone();
-
-					// add command name element
-					tmp = span.clone();
-					tmp.text($.trim(elem.text()).length > 0 ? $.trim(elem.text()) : elem.attr('title'));
-					tmp.addClass(elem.children('span').attr('class'));
-					a.append(tmp);
-					a.addClass(elem.attr('class'));
-					a.removeClass('button').removeClass('disabled');
-					a.addClass('rcm_elem_' + elem.attr('id'));
-
-					if (elem.attr('onclick').match(rcmail.context_menu_popup_pattern)) {
-						a.data('command', RegExp.$1);
-						a.append($('<span>').addClass('right-arrow'));
-						row.addClass('submenu');
-						a.click(function(e) {
-							if (!$(this).hasClass('active'))
-								return;
-
-							ref.submenu(a, e);
-							return false;
-						});
-
-						if (ref.mouseover_timeout > -1) {
-							a.mouseover(function(e) {
-								if (!$(this).hasClass('active'))
-									return;
-
-								ref.timers['submenu_show'] = window.setTimeout(function(a, e) {
-									ref.submenu(a, e);
-								}, ref.mouseover_timeout, a, e);
-							});
-
-							a.mouseout(function(e) {
-								if (!$(this).hasClass('active'))
-									return;
-
-								$(this).blur(); clearTimeout(ref.timers['submenu_show']);
-							});
-						}
-					}
-					else {
-						a.addClass('cmd_' + command);
-						a.data('command', command);
-						if (elem.attr('target'))
-							a.attr('target', elem.attr('target'));
-
-						a.click(function(e) {
-							if ($(this).parents('.rcmsubmenu').length == 0) {
-								rcm_hide_menu(e, true);
-								clearTimeout(ref.timers['submenu_hide']);
-							}
-
-							var cur_popups = rcmail.menu_stack.length;
-							var result;
-
-							var callback = ref.parent_menu.triggerEvent('beforecommand', {ref: ref, el: this, command: command, args: args});
-							if (!callback || !callback.abort) {
-								result = ref.parent_menu.triggerEvent('command', {ref: ref, el: this, command: command, args: args, evt: e});
-							}
-							else {
-								result = callback.result;
-							}
-
-							if (!callback || !callback.skipaftercommand)
-								ref.parent_menu.triggerEvent('aftercommand', {ref: ref, el: this, command: command, args: args});
-
-							if (rcmail.menu_stack.length > cur_popups) {
-								var popup_name = rcmail.menu_stack[rcmail.menu_stack.length - 1];
-								rcmail.context_menu_popup_menus.push(popup_name);
-
-								// make sure enabled commands match context menu message selection
-								$.each(rcmail.context_menu_popup_commands[popup_name], function(cmd, state) {
-									rcmail.enable_command(cmd, state);
-								});
-							}
-
-							// ensure menu is always hidden after action (for Safari)
-							ref.hide(e);
-
-							return result;
-						});
-
-						if (ref.mouseover_timeout > -1 && !ref.is_submenu) {
-							a.mouseover(function(e) {
-								ref.timers['submenu_hide'] = window.setTimeout(function(e) {
-									rcm_hide_menu(e, true);
-								}, ref.mouseover_timeout, e);
-							});
-
-							a.mouseout(function(e) { clearTimeout(ref.timers['submenu_hide']); });
-						}
-					}
-
-					row.append(a);
-					ref.parent_menu.triggerEvent('insertitem', {item: row});
-					rows.push(row);
-				});
-			});
-
-			ul.append(rows).appendTo(this.container);
-			this.parent_menu.triggerEvent('init', {ref: this});
-			this.container.appendTo($('body'));
-		}
-	};
-
-	this.show = function(obj, e) {
-		if (obj) {
-			this.hide(e);
-		}
-
-		var callback = this.parent_menu.triggerEvent('beforeactivate', {ref: this, source: obj});
-		if (!callback || !callback.abort) {
-			if (obj) {
-				$(obj).addClass(this.source_class);
-			}
-
-			$.each(ref.menu_source, function(id, props) {
-				if (props.toggle) {
-					$(id).parent().show();
-				}
-			});
-
-			$.each(this.container.find('a'), function() {
-				if ($(this).hasClass('rcm_active')) {
-					$(this).addClass('active');
-				}
-				else if (btn = $(this).attr('class').match(/rcm_elem_([a-z0-9]+)/)) {
-					$(this).parent('li')[(btn[1] == 'rcmjs' || $('#' + btn[1]).is(':visible')) ? 'show' : 'hide']();
-					$(this).removeClass('active').removeClass('disabled');
-
-					var enabled = false;
-					if (!rcm_check_button_state(btn[1], false) && (!ref.is_submenu || rcm_check_button_state(btn[1], true))) {
-						enabled = true;
-					}
-
-					var ret = ref.parent_menu.triggerEvent('activate', {el: this, btn: btn[1], source: obj, command: $(this).data('command'), enabled: enabled});
-					if (ret === true) {
-						$(this).addClass('active').removeClass('disabled');
-					}
-					else if (ret === false) {
-						$(this).addClass('disabled').removeClass('active');
-					}
-				}
-			});
-
-			$.each(ref.menu_source, function(id, props) {
-				if (props.toggle) {
-					$(id).parent().hide();
-				}
-			});
-
-			this.parent_menu.triggerEvent('afteractivate', {ref: this, source: obj});
-		}
-
-		// position menu on the screen
-		if (this.is_submenu) {
-			rcmail.element_position(this.container, this.parent_object);
-		}
-		else {
-			this.position(e, this.container);
-		}
-
-		if (!callback || callback.show !== false) {
-			this.selected_object = obj;
-			this.container.show();
-			rcmail.triggerEvent('menu-open', { name: this.container.attr('id'), props:{ menu: this.container.attr('id') }, originalEvent: e });
-		}
-	};
-
-	this.hide = function(e) {
-		// use window.event when e is not defined (legacy support for IE8)
-		var target = e ? e.target : window.event.srcElement;
-
-		if ($('div.contextmenu').is(':visible') && (rcmail.context_menu_popup_menus.length == 0 || $(target).parents('div.contextmenu').length == 0)) {
-			this.selected_object = null;
-			$('.' + this.source_class).removeClass(this.source_class);
-			rcm_hide_menu(e);
-
-			for (var i in rcmail.context_menu_commands) {
-				if (!rcmail.context_menu_commands[i]) {
-					rcmail.enable_command(i, false);
-				}
-			}
-
-			rcmail.context_menu_commands = new Array();
-		}
-	};
-
-	this.submenu = function(link, e) {
-		// use window.event when e is not defined (legacy support for IE8)
-		if (!e)
-			e = window.event;
-
-		if (e) {
-			e.cancelBubble = true;
-			if (e.stopPropagation)
-				e.stopPropagation();
-		}
-
-		rcm_hide_menu(e, true);
-
-		var id = rcmail.gui_containers[$(link).data('command')] ? rcmail.gui_containers[$(link).data('command')].attr('id') : $(link).data('command');
-		if (!this.submenus[id]) {
-			var elem = !$('#' + id).is('ul') ? '#' + id + ' ul' : '#' + id; // check if the container returned is a ul else there should be one directly beneath it
-			this.submenus[id] = new rcube_context_menu({'menu_name': id, 'menu_source': elem, 'parent_menu': this, 'parent_object': link, 'is_submenu': true, 'list_object': this.list_object});
-			this.submenus[id].init();
-		}
-
-		this.submenus[id].show(null, e);
-	};
-
-	this.position = function(e, menu) {
-		// temporarily show element to calculate its size
-		menu.css({left: '-1000px', top: '-1000px'}).show();
-
-		var win = $(window),
-		win_height = win.height(),
-		elem_height = $(menu).height(),
-		elem_width = $(menu).width(),
-		top = e.pageY,
-		left = e.pageX;
-
-		if (top + elem_height > win_height) {
-			top -= elem_height;
-
-			if (top < 0)
-				top = Math.max(0, (win_height - elem_height) / 2);
-		}
-
-		if (left + elem_width > win.width())
-			left -= elem_width;
-
-		menu.hide();
-		menu.css({left: left + 'px', top: top + 'px'});
-	};
-
-	this.list_selection = function(show, prev_sel) {
-		// make the system think no preview pane exists while we do some fake message selects
-		// to enable/disable relevent commands for current selection
-		var prev_contentframe = rcmail.env.contentframe;
-		rcmail.env.contentframe = null;
-
-		if (show) {
-			if (this.list_object.selection.length == 0 || !this.list_object.in_selection(rcmail.env.context_menu_source_id)) {
-				prev_sel = this.list_object.get_selection();
-				this.list_object.highlight_row(rcmail.env.context_menu_source_id, true);
-
-				for (var i in prev_sel)
-					this.list_object.highlight_row(prev_sel[i], true);
-
-				this.list_object.triggerEvent('select');
-			}
-			else {
-				// trigger a select event to update active commands
-				// use case: select multiple message, open contextmenu; open contextmenu on a message not in selection; open contextmenu on selection
-				this.list_object.triggerEvent('select');
-			}
-		}
-		else if (prev_sel) {
-			for (var i in prev_sel)
-				this.list_object.highlight_row(prev_sel[i], true);
-
-			this.list_object.highlight_row(rcmail.env.context_menu_source_id, true);
-			this.list_object.triggerEvent('select');
-		}
-
-		rcmail.env.contentframe = prev_contentframe;
-
-		return prev_sel;
-	};
-
-	this.addEventListener = rcube_event_engine.prototype.addEventListener;
-	this.removeEventListener = rcube_event_engine.prototype.removeEventListener;
-	this.triggerEvent = rcube_event_engine.prototype.triggerEvent;
+rcube_webmail.prototype.contextmenu = {
+    settings: {
+        no_right_click_on_menu: true,
+        skip_commands: ['mail-checkmail', 'mail-compose', 'addressbook-add', 'addressbook-import', 'addressbook-advanced-search', 'addressbook-search-create'],
+        command_pattern: /rcmail\.command\(\x27([^\x27]+)\x27,\s?\x27((?:\\\x27|[^\x27])*)\x27/,
+        addressbook_pattern: /([A-Z0-9\-_]+(:[A-Z0-9\-_]+)?)/i,
+        popup_attrib: 'onclick',
+        popup_pattern: '',
+        popup_func: '',
+        classes: {
+                container: 'contextmenu popupmenu',
+                mainmenu: 'rcmmainmenu rcm-mainmenu', // rcmmainmenu class depreciated in v3.0
+                submenu: 'rcmsubmenu submenu rcm-submenu', // rcmsubmenu submenu classes depreciated in v3.0
+                button_remove: 'button',
+                button_active: 'active',
+                button_disabled: 'disabled'
+            },
+        menu_defaults: {},
+        menu_events: {
+            'command': function(p) {
+                if (!$(p.el).is('.' + rcmail.contextmenu.settings.classes.button_active.replace(/ /g, ', .')))
+                    return;
+
+                // enable the required command
+                var prev_command = rcmail.commands[p.command];
+                rcmail.enable_command(p.command, true);
+                var result = rcmail.command(p.command, p.args, p.el, p.evt);
+                rcmail.enable_command(p.command, prev_command);
+
+                return result;
+            },
+            'submenu_toggle' : function(p) {
+                $(p.id).parent()[(p.show) ? 'show' : 'hide']();
+            }
+        }
+    },
+
+    vars: {
+        popup_menus: [],
+        popup_commands: {},
+    },
+
+    skin_funcs: {},
+
+    init_list: function(row, props, events) {
+        if (!events)
+            events = {};
+
+        // backwards compatibility, list_object changed to string in v3.0
+        if (typeof props.list_object == 'object') {
+            console.log('Roundcube Contextmenu plugin: init_list() list_object param object detected, expected string.');
+            var id = $(props.list_object.list).attr('id');
+            props.list_object = null;
+
+            if (id == 'contacts-table') {
+                props.list_object = 'contact_list';
+            }
+        }
+
+        if (!props.list_object)
+            props.list_object = 'message_list';
+
+        var trigger_list_select = function(list) {
+            var prev_contentframe = rcmail.env.contentframe;
+            rcmail.env.contentframe = null;
+            rcmail[list].triggerEvent('select');
+            rcmail.env.contentframe = prev_contentframe;
+        };
+
+        var menu = rcmail.contextmenu.init(props, $.extend({
+            'beforeactivate': function(p) {
+                if (p.ref.is_submenu) {
+                    p.ref.menu_selection = p.ref.parent_menu.menu_selection;
+                }
+                else if (rcmail[p.ref.list_object].selection.length == 0 || !rcmail[p.ref.list_object].in_selection(rcmail.env.context_menu_source_id)) {
+                    p.ref.menu_selection = [rcmail.env.context_menu_source_id];
+                }
+                else {
+                    p.ref.menu_selection = rcmail[p.ref.list_object].get_selection();
+                }
+
+                if (!rcmail[p.ref.list_object].in_selection(rcmail.env.context_menu_source_id)) {
+                    rcmail.env.contextmenu_opening = 'beforeactivate';
+                    trigger_list_select(p.ref.list_object);
+                }
+
+                if (rcmail.task == 'settings' && p.ref.menu_name != 'settingslist') {
+                    p.ref.container.find('a.openextwin').parent().remove();
+                }
+            },
+            'afteractivate': function(p) {
+                rcmail.env.contextmenu_opening = 'afteractivate';
+                if (!rcmail[p.ref.list_object].in_selection(rcmail.env.context_menu_source_id))
+                    trigger_list_select(p.ref.list_object);
+
+                rcmail.env.contextmenu_opening = null;
+            },
+            'beforecommand': function(p) {
+                if (rcmail.task == 'settings' && p.ref.menu_name != 'settingslist' && p.command == 'plugin.contextmenu.openinline') {
+                    rcmail[p.ref.list_object].select_row(rcmail.env.context_menu_source_id);
+                    return {'abort': true, 'result': true};
+                }
+            },
+            'aftercommand': function(p) {
+                if (p.command == 'group-remove-selected') {
+                    // update contactlist after contact remove (not done by core because there is no selection)
+                    rcmail.command('listgroup', {'source': rcmail.env.source, 'id': rcmail.env.group}, p.el);
+                }
+            }
+        }, events));
+
+        $("#" + row).on('contextmenu', function(e) {
+            var uid;
+            if (uid = rcmail[props.list_object].get_row_uid(this)) {
+                rcmail.contextmenu.hide_all(e);
+                rcmail.contextmenu.show_one(e, this, uid, menu);
+            }
+        });
+
+        rcmail[props.list_object].addEventListener('getselection', function(p) {
+            if (rcmail.env.contextmenu_opening == 'afteractivate')
+                return;
+
+            var uids = null;
+            $.each(rcmail.env.contextmenus, function() {
+                if ((rcmail.env.contextmenu_opening == 'beforeactivate' || $(this.container).is(':visible')) && this.menu_selection.length > 0) {
+                    uids = this.menu_selection;
+                    return false;
+                }
+            });
+
+            if (uids) {
+                p.res = uids;
+                return false;
+            }
+        });
+    },
+
+    init_folder: function(el, props, events) {
+        if (!events)
+            events = {};
+
+        var menu = rcmail.contextmenu.init($.extend({'menu_name': 'folderlist', 'list_object': null}, props), $.extend({
+            'beforeactivate': function() {
+                if (rcmail.env.contextmenu_messagecount_request) {
+                    rcmail.env.contextmenu_messagecount_request.abort();
+                }
+                rcmail.env.contextmenu_messagecount_request = null;
+            },
+            'activate': function(p) {
+                return rcmail.contextmenu.activate_folder_commands(p);
+            },
+            'beforecommand': function(p) {
+                if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && $.inArray(p.command, Array('expunge', 'purge')) >= 0) {
+                    var result = rcmail[p.command + '_mailbox'](rcmail.env.context_menu_source_id);
+
+                    // update the unread count and trash icon
+                    if (p.command == 'purge' && result !== false) {
+                        rcmail.set_unread_count(rcmail.env.context_menu_source_id, 0, false);
+
+                        if (rcmail.env.context_menu_source_id == rcmail.env.trash_mailbox)
+                            rcmail.set_trash_count(0);
+                    }
+
+                    return {'abort': true, 'result': true};
+                }
+                else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && p.command == 'mark-all-read') {
+                    rcmail.mark_all_read(rcmail.env.context_menu_source_id);
+                    return {'abort': true, 'result': true};
+                }
+            }
+        }, events));
+
+        $(el).on('click', function(e) {
+            // hide menu when changing folder
+            rcmail.contextmenu.hide_all(e);
+        })
+        .on('contextmenu', function(e) {
+            var source = $(this).find('a[rel][onclick]').filter(function() { return $(this).attr('onclick').match(rcmail.contextmenu.settings.command_pattern); }).first();
+            source.blur(); // remove focus (and keyboard nav highlighting) from source element
+
+            rcmail.contextmenu.hide_all(e);
+            rcmail.contextmenu.show_one(e, this, source.attr('rel'), menu);
+        });
+    },
+
+    init_addressbook: function(el, props, events) {
+        if (!events)
+            events = {};
+
+        var menu = rcmail.contextmenu.init($.extend({'menu_name': 'abooklist'}, props), $.extend({
+            'beforeactivate': function(p) {
+                p.ref.container.find('li.' + rcmail.contextmenu.settings.classes.submenu.replace(/ /g, '.')).remove();
+            },
+            'activate': function(p) {
+                var ids = rcmail.env.context_menu_source_id.split(':', 2);
+                var cur_source = ids[0];
+
+                if (p.command == 'group-create') {
+                    // addressbook
+                    if ($(p.source).hasClass('addressbook') && rcmail.env.address_sources[cur_source].groups && !rcmail.env.address_sources[cur_source].readonly) {
+                        p.enabled = true;
+                    }
+                    else {
+                        p.enabled = false;
+                    }
+                }
+                else if (p.command == 'group-rename' || p.command == 'group-delete') {
+                    // group
+                    if ($(p.source).hasClass('contactgroup') && !rcmail.env.address_sources[cur_source].readonly) {
+                        p.enabled = true;
+                    }
+                    else {
+                        p.enabled = false;
+                    }
+                }
+                else if (p.command == 'search-delete') {
+                    // saved search
+                    if ($(p.source).hasClass('contactsearch')) {
+                        p.enabled = true;
+                    }
+                    else {
+                        p.enabled = false;
+                    }
+                }
+
+                return p;
+            },
+            'command': function(p) {
+                if (!$(p.el).is('.' + rcmail.contextmenu.settings.classes.button_active.replace(/ /g, ', .')))
+                    return;
+
+                var prev_source = rcmail.env.source;
+                var prev_group = rcmail.env.group;
+                var result = false;
+
+                var ids = rcmail.env.context_menu_source_id.split(':', 2);
+                var cur_source = ids[0];
+                var cur_id = ids[1];
+
+                rcmail.env.source = cur_source;
+                rcmail.env.group = cur_id;
+
+                // enable the required command
+                var prev_command = rcmail.commands[p.command];
+                rcmail.enable_command(p.command, true);
+
+                switch (p.command) {
+                    case 'search-delete':
+                        if ($(p.ref.selected_object).children('a').attr('rel')) {
+                            var prev_search_id = rcmail.env.search_id;
+                            var prev_search_request = rcmail.env.search_request;
+                            rcmail.env.search_request = true;
+                            rcmail.env.search_id = $(p.ref.selected_object).children('a').attr('rel').replace('S', '');
+
+                            result = rcmail.command(p.command, p.args, p.el, p.evt);
+
+                            rcmail.env.search_request = prev_search_request;
+                            rcmail.env.search_id = prev_search_id;
+                        }
+                        break;
+                    default:
+                        result = rcmail.command(p.command, p.args, p.el, p.evt);
+                        break;
+                }
+
+                rcmail.enable_command(p.command, prev_command);
+                rcmail.env.source = prev_source;
+                rcmail.env.group = prev_group;
+
+                return result;
+            }
+        }, events));
+
+        $(el).on('click', function(e) {
+            // hide menu when changing address book
+            rcmail.contextmenu.hide_all(e);
+        })
+        .on('contextmenu', function(e) {
+            var source = $(this).find('a[rel]').filter(function() { return $(this).attr('rel').match(rcmail.contextmenu.settings.addressbook_pattern); }).first(), matches;
+            source.blur(); // remove focus (and keyboard nav highlighting) from source element
+
+            if (matches = source.attr('rel').match(rcmail.contextmenu.settings.addressbook_pattern)) {
+                rcmail.contextmenu.hide_all(e);
+                rcmail.contextmenu.show_one(e, this, matches[1], menu);
+            }
+        });
+    },
+
+    init_settings: function(el, props, events) {
+        if (!events)
+            events = {};
+
+        var menu = rcmail.contextmenu.init(props, $.extend({
+            'beforeactivate': function(p) {
+                if (p.ref.menu_name != 'settingslist') {
+                    p.ref.container.find('a.openextwin').parent().remove();
+                }
+
+                if (p.ref.menu_name == 'folderlist') {
+                    if (rcmail.env.contextmenu_messagecount_request) {
+                        rcmail.env.contextmenu_messagecount_request.abort();
+                    }
+                    rcmail.env.contextmenu_messagecount_request = null;
+                }
+            },
+            'activate': function(p) {
+                if (p.ref.menu_name == 'folderlist') {
+                    p = rcmail.contextmenu.activate_folder_commands(p);
+                }
+
+                return p;
+            },
+            'beforecommand': function(p) {
+                if (p.ref.menu_name == 'folderlist') {
+                    var result;
+                    if ($.inArray(p.command, Array('delete-folder', 'purge')) >= 0) {
+                        result = rcmail[p.command == 'delete-folder' ? 'delete_folder' : p.command + '_mailbox'](rcmail.env.context_menu_source_id);
+                    }
+                    else if (p.command == 'plugin.contextmenu.openinline') {
+                        rcmail[p.ref.list_object].select(rcmail.env.context_menu_source_id);
+                    }
+                    else {
+                        result = rcmail.command(p.command, p.args);
+                    }
+
+                    return {'abort': true, 'result': true};
+                }
+            }
+        }, events));
+
+        $(el).on('contextmenu', function(e) {
+            var source = $(this).find('a').first();
+            source.blur(); // remove focus (and keyboard nav highlighting) from source element
+
+            if (props.menu_name == 'settingslist') {
+                var matches;
+                if (matches = source.attr('onclick').match(rcmail.contextmenu.settings.command_pattern)) {
+                    rcmail.contextmenu.hide_all(e);
+                    rcmail.contextmenu.show_one(e, this, matches[2], menu);
+                }
+            }
+            else if (props.menu_name == 'folderlist') {
+                rcmail.contextmenu.hide_all(e);
+                rcmail.contextmenu.show_one(e, this, rcmail.folder_id2name($(this).attr('id')), menu);
+            }
+        });
+    },
+
+    init: function(props, ext_events) {
+        var events = $.extend({}, rcmail.contextmenu.settings.menu_events, ext_events), menu;
+
+        if (!rcmail.env.contextmenus[props.menu_name]) {
+            menu = new rcube_context_menu(props);
+            $.each(events, function(trigger, func) {
+                // additional events
+                if (trigger.slice(0, 1) == '+') {
+                    trigger = trigger.slice(1);
+                }
+
+                menu.addEventListener(trigger, function(p) { return func(p); });
+            });
+            menu.init();
+            rcmail.env.contextmenus[props.menu_name] = menu;
+        }
+        else {
+            menu = rcmail.env.contextmenus[props.menu_name];
+        }
+
+        return menu;
+    },
+
+    show_one: function(e, src_elm, src_id, menu_obj) {
+        // if contextmenus have been disabled then show browser context menu as normal
+        if (!rcmail.env.contextmenu)
+            return true;
+
+        rcube_event.cancel(e);
+
+        // hide any other open menus
+        for (var i = 0; i < rcmail.contextmenu.vars.popup_menus.length; i++) {
+            rcmail.hide_menu(rcmail.contextmenu.vars.popup_menus[i], e);
+        }
+
+        rcmail.env.context_menu_source_id = src_id;
+        menu_obj.show_menu(src_elm, e);
+    },
+
+    hide_all: function(e, sub_only, no_trigger) {
+        var remove_menu = function(e, menu) {
+            if (!menu.container.is(':visible'))
+                return;
+
+            menu.hide_menu(e);
+
+            if (!no_trigger) {
+                var menu_name = 'rcm_' + menu.menu_name;
+                rcmail.triggerEvent('menu-close', { name: menu_name, props:{ menu: menu_name }, originalEvent: e });
+            }
+        }
+
+        $.each(rcmail.env.contextmenus, function() {
+            if (!sub_only) {
+                remove_menu(e, this);
+            }
+            else {
+                $.each(this.submenus, function() {
+                    remove_menu(e, this);
+                });
+            }
+        });
+
+        // close popup menus opened by the contextmenu
+        for (var i = rcmail.contextmenu.vars.popup_menus.length - 1; i >= 0; i--) {
+            rcmail.hide_menu(rcmail.contextmenu.vars.popup_menus[i], e);
+        }
+    },
+
+    activate_folder_commands: function(p) {
+        if ($.inArray(p.command, Array('expunge', 'purge', 'mark-all-read')) >= 0) {
+            // disable the commands by default
+            p.enabled = false;
+
+            // if menu is opened on current folder (or special mark-all-read command) then enable the commands same as in UI
+            if ((rcmail.env.context_menu_source_id == rcmail.env.mailbox || p.command == 'mark-all-read') && rcmail.commands[p.command]) {
+                p.enabled = true;
+            }
+            // if menu is opened on difference folder then get message count for the folder
+            else if (rcmail.env.context_menu_source_id != rcmail.env.mailbox && !rcmail.env.contextmenu_messagecount_request) {
+                p.abort = true;
+
+                // folder check called async to prevent slowdown on menu load
+                rcmail.env.contextmenu_messagecount_request = $.ajax({
+                    type: 'POST', url: rcmail.url('plugin.contextmenu.messagecount'), data: {'_mbox': rcmail.env.context_menu_source_id}, dataType: 'json', async: true,
+                    success: function(data) {
+                        if (data.messagecount > 0 && $('#rcm_folderlist').is(':visible')) {
+                            // override the environment to check if commands should be abled
+                            var temp_exists = rcmail.env.exists;
+                            var temp_mailbox = rcmail.env.mailbox;
+                            rcmail.env.exists = data.messagecount;
+                            rcmail.env.mailbox = rcmail.env.context_menu_source_id;
+
+                            $('#rcm_folderlist').find('a.cmd_expunge').addClass(rcmail.contextmenu.settings.classes.button_active).removeClass(rcmail.contextmenu.settings.classes.button_disabled);
+                            if (rcmail.purge_mailbox_test() || (rcmail.env.task == 'settings' && data.messagecount > 0)) {
+                                $('#rcm_folderlist').find('a.cmd_purge').addClass(rcmail.contextmenu.settings.classes.button_active).removeClass(rcmail.contextmenu.settings.classes.button_disabled);
+                            }
+
+                            rcmail.env.exists = temp_exists;
+                            rcmail.env.mailbox = temp_mailbox;
+                        }
+                    }
+                });
+            }
+        }
+        else if ($.inArray(p.command, Array('plugin.contextmenu.collapseall', 'plugin.contextmenu.expandall')) >= 0) {
+            var list_obj = rcmail.gui_objects[rcmail.env.task == 'settings' ? 'subscriptionlist' : 'mailboxlist'];
+            var class_name = p.command == 'plugin.contextmenu.collapseall' ? 'expanded' : 'collapsed';
+
+            p.enabled = false;
+            if ($(list_obj).find('div.' + class_name + ':visible').length > 0) {
+                p.enabled = true;
+            }
+        }
+        else if (rcmail.env.task == 'settings' && p.command == 'delete-folder') {
+            p.enabled = false;
+            // From rcmail::subscription_select()
+            var folder;
+            if ((folder = rcmail.env.subscriptionrows[rcmail.env.context_menu_source_id]) && !folder[2]) {
+                p.enabled = true;
+            }
+        }
+
+        return p;
+    },
+
+    ui_button_check: function(btn, active) {
+        var classes = (active ? rcmail.contextmenu.settings.classes.button_active : rcmail.contextmenu.settings.classes.button_disabled);
+        classes = '.' + classes.replace(/ /g, ', .');
+
+        return $('#' + btn).is(classes);
+    },
+
+    settings_menus: function(menus) {
+        var default_events = {'init': function(p) {
+            // remove options like create, import etc from the settings menu
+            // addgroup class is used in Classic skin
+            p.ref.container.find('a.addgroup,a.create,a.search,a.import').parent().remove();
+        }};
+
+        $.each(menus, function() {
+            var menu = this;
+
+            if ($('#' + menu.obj).length > 0) {
+                rcmail.addEventListener('init', function() {
+                    if (menu.props.init_func) {
+                        rcmail.contextmenu[menu.props.init_func]('#' + menu.obj, menu.props, menu.events || default_events);
+                    }
+                    else if (rcmail[menu.props.list_object]) {
+                        rcmail.contextmenu.init_list(menu.obj, menu.props, menu.events || default_events);
+
+                        rcmail[menu.props.list_object].addEventListener('initrow', function(props) {
+                            rcmail.contextmenu.init_list(props.id, menu.props, menu.events || default_events);
+                        });
+                    }
+                });
+            }
+            else if (menu.props.list_object && menu.props.list_id) {
+                rcmail.addEventListener('initlist', function(props) {
+                    if ($(props.obj).attr('id') == menu.props.list_id) {
+                        rcmail[menu.props.list_object].addEventListener('initrow', function(props) {
+                            rcmail.contextmenu.init_list(props.id, menu.props, menu.events || default_events);
+                        });
+                    }
+                });
+            }
+        });
+    }
 };
 
-function rcm_override_mailbox_command(menu, props, before) {
-	if ($('div.contextmenu').is(':visible') && $.inArray(props.action, rcmail.context_menu_overload_commands) >= 0) {
-		if (before) {
-			rcmail.env.context_menu_prev_display_next = rcmail.env.display_next;
-			if (!(menu.list_object.selection.length == 1 && menu.list_object.in_selection(rcmail.env.context_menu_source_id)))
-				rcmail.env.display_next = false;
-
-			rcmail.env.context_menu_prev_sel = menu.list_selection(true);
-		}
-		else if (rcmail.env.context_menu_prev_sel) {
-			menu.list_selection(false, rcmail.env.context_menu_prev_sel);
-			rcmail.env.display_next = rcmail.env.context_menu_prev_display_next;
-		}
-	}
-}
-
-function rcm_check_button_state(btn, active) {
-	var classes = active ? rcmail.context_menu_button_active_class : rcmail.context_menu_button_disabled_class;
-	var found = false;
-
-	$.each(classes, function(i) {
-		if ($('#' + btn).hasClass(classes[i])) {
-			found = true;
-
-			// stop processing
-			return false;
-		}
-	});
+// backwards compatibility, functions renamed in v3.0
+function rcm_listmenu_init(row, props, events) { rcm_log('rcm_listmenu_init'); rcmail.contextmenu.init_list(row, props, events); }
+function rcm_foldermenu_init(el, props, events) { rcm_log('rcm_foldermenu_init'); rcmail.contextmenu.init_folder(el, props, events); }
+function rcm_abookmenu_init(el, props, events) { rcm_log('rcm_abookmenu_init'); rcmail.contextmenu.init_addressbook(el, props, events); }
+function rcm_callbackmenu_init(props, ext_events) { rcm_log('rcm_callbackmenu_init'); return rcmail.contextmenu.init(props, ext_events); }
+function rcm_show_menu(e, obj, id, menu) { rcm_log('rcm_show_menu'); rcmail.contextmenu.show_one(e, obj, id, menu); }
+function rcm_hide_menu(e, sub_only, no_trigger) { rcm_log('rcm_hide_menu'); rcmail.contextmenu.hide_all(e, sub_only, no_trigger); }
+function rcm_check_button_state(btn, active) { rcm_log('rcm_check_button_state'); return rcmail.contextmenu.ui_button_check(btn, active); }
+function rcm_log(fname) { console.log('Roundcube Contextmenu plugin: Use of ' + fname + ' is depreciated. This will be removed in future versions.'); }
 
-	return found;
-}
-
-function rcm_addressbook_selector(event, command, callback) {
-	var container = rcmail.rcm_addressbook_selector_element;
-
-	if (!container) {
-		var rows = [],
-			ul = $('<ul class="toolbarmenu">');
-
-		container = $('<div id="addressbook-selector" class="popupmenu"></div>');
-
-		// loop over address books
-		$.each(rcmail.env.address_sources, function() {
-			if (!this.readonly) {
-				rows.push(rcm_addressbook_selector_item(this));
-
-				if (this.groups) {
-					var ref = this;
-					$.each(rcmail.env.contactgroups, function() {
-						rows.push(rcm_addressbook_selector_item(this, ref.id));
-					});
-				}
-			}
-		});
-
-		ul.append(rows).appendTo(container);
-
-		// temporarily show element to calculate its size
-		container.css({left: '-1000px', top: '-1000px'})
-			.appendTo($('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, container.data('command'), e);
-			return false;
-		});
-
-		rcmail.rcm_addressbook_selector_element = container;
-	}
-
-	container.data('command', command);
-	container.data('callback', callback);
-
-	// customize menu for move or copy
-	container.find('li').show();
-
-	// search result may contain contacts from many sources, but if there is only one...
-	var source = rcmail.env.source;
-	if (source == '' && rcmail.env.selection_sources.length == 1)
-		source = rcmail.env.selection_sources[0];
-
-	// hide currently open address book from menu
-	if (source) {
-		$.each(container.find('a'), function() {
-			if (($(this).data('source') && $(this).data('source') == source) || $(this).data('id') == source)
-				$(this).parent('li').hide();
-		});
-	}
-
-	// position menu on the screen
-	rcmail.show_menu('addressbook-selector', true, event);
-}
-
-function rcm_group_selector(event, command, callback) {
-	var container = rcmail.rcm_addressgroup_selector_element;
-
-	if (!container) {
-		var rows = [],
-			ul = $('<ul class="toolbarmenu">');
-
-		container = $('<div id="addressgroup-selector" class="popupmenu"></div>');
-
-		// loop over address books
-		$.each(rcmail.env.address_sources, function() {
-			if (this.id === rcmail.env.source) {
-				var ref = this;
-				$.each(rcmail.env.contactgroups, function() {
-					rows.push(rcm_addressbook_selector_item(this, ref.id));
-				});
-			}
-		});
-
-		ul.append(rows).appendTo(container);
-
-		// remove indent added by rcm_addressbook_selector_item()
-		$(ul).find('a').removeAttr('style');
-
-		// temporarily show element to calculate its size
-		container.css({left: '-1000px', top: '-1000px'})
-			.appendTo($('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', {cmd: command}, function(e) {
-			container.data('callback')(this, e);
-			return false;
-		});
-
-		rcmail.rcm_addressgroup_selector_element = container;
-	}
-
-	container.data('callback', callback);
-
-	// customize menu for move or copy
-	container.find('li').show();
-
-	// hide currently open group from menu
-	if (rcmail.env.group) {
-		$.each(container.find('a'), function() {
-			if ($(this).data('id') == rcmail.env.group)
-				$(this).parent('li').hide();
-		});
-	}
-
-	// position menu on the screen
-	rcmail.show_menu('addressgroup-selector', true, event);
-}
-
-function rcm_addressbook_selector_item(obj, abook_id) {
-	if (abook_id && abook_id === obj.source || !abook_id) {
-		var a = $('<a>').attr('href', '#').addClass('icon'),
-			row = $('<li>');
-
-		if (obj.type == 'group') {
-			a.addClass('active contactgroup')
-			a.data('source', obj.source);
-			a.data('id', obj.id);
-			a.css('padding-left', '16px');
-		}
-		else {
-			a.addClass('addressbook active').data('id', obj.id);
-		}
-
-		// add address book name element
-		a.append($('<span>').text(obj.name));
-
-		return row.append(a);
-	}
+function rcube_context_menu(p) {
+    this.menu_name = null;
+    this.menu_source = new Array();
+    this.menu_source_obj = null;
+    this.list_object = null;
+    this.mouseover_timeout = rcmail.env.contextmenu_mouseover_timeout;
+    this.classes = {
+        source: 'contextRow context-source', // contextRow class depreciated in v3.0
+        ul: 'toolbarmenu iconized',
+        a: 'icon',
+        span: 'icon',
+        sub_button_a: null,
+        sub_button_span: 'right-arrow sub-button' // right-arrow class depreciated in v3.0
+    }
+
+    this.modal = false;
+    this.is_submenu = false;
+    this.submenu_position = 'right';
+    this.skinable = false;
+    this.parents = 0;
+    this.parent_menu = this;
+    this.parent_object = null;
+    this.selected_object = null
+    this.container = null;
+    this.menu_selection = new Array();
+    this.submenus = {};
+    this.timers = {};
+
+    // add global config defaults and instance config
+    $.extend(true, this, rcmail.contextmenu.settings.menu_defaults, p);
+
+    // ensure manu_source option is always an array
+    if (typeof this.menu_source == 'string')
+        this.menu_source = [this.menu_source];
+
+    var ref = this;
+
+    this.init = function() {
+        if (!this.container) {
+            rcmail.triggerEvent('contextmenu_init', this);
+
+            this.container = $('<div>').attr('id', 'rcm_' + this.menu_name).css('display', 'none');
+            this.container.addClass(rcmail.contextmenu.settings.classes.container);
+            this.container.addClass(this.is_submenu ? rcmail.contextmenu.settings.classes.submenu : rcmail.contextmenu.settings.classes.mainmenu);
+
+            var rows = [], ul = $('<ul role="menu">'),
+            li = $('<li>'), link = $('<a>'), span = $('<span>');
+
+            ul.addClass(this.classes.ul);
+            li.attr('role', 'menuitem');
+
+            link.attr('href', '#');
+            link.addClass(this.classes.a);
+            link.attr('role', 'button');
+            link.attr('tabindex', '-1');
+            link.attr('aria-disabled', 'true');
+
+            span.addClass(this.classes.span);
+
+            this.menu_source_obj = {};
+            $.each(this.menu_source, function(i) {
+                var source_elements;
+                if (typeof ref.menu_source[i] == 'string') {
+                    ref.menu_source_obj[ref.menu_source[i]] = {
+                        'toggle': !$(ref.menu_source[i]).is(':visible')
+                    };
+                    source_elements = $(ref.menu_source[i]).children();
+                }
+                else {
+                    ref.menu_source_obj[i] = {
+                        'toggle': false
+                    };
+                    source_elements = $(ref.menu_source[i]);
+                }
+
+                ul.attr('aria-labelledby', $(ref.menu_source[i]).attr('aria-labelledby'));
+
+                $.each(source_elements, function() {
+                    var src_elem, elem, command, args;
+
+                    var callback = ref.triggerEvent('addmenuitem', {ref: ref, el: this});
+                    if (!callback || (!callback.abort && !callback.result)) {
+                        if ($(this).is('li')&& $(this).children().length == 1) {
+                            src_elem = $(this).children()[0];
+                        }
+                        else {
+                            src_elem = this;
+                        }
+
+                        if ($(src_elem).is('a')) {
+                            elem = $(src_elem).clone();
+
+                            if (!elem[0].hasAttribute('onclick') || !elem.attr('onclick').match(rcmail.contextmenu.settings.command_pattern)) {
+                                if (elem[0].hasAttribute(rcmail.contextmenu.settings.popup_attrib) && !elem.attr(rcmail.contextmenu.settings.popup_attrib).match(rcmail.contextmenu.settings.popup_pattern)) {
+                                    return;
+                                }
+                            }
+                        }
+                        else if ($(src_elem).is('span') && $(src_elem).children().length == 2) {
+                            elem = $(src_elem).children().first().clone();
+
+                            if ($(src_elem).children().last().attr(rcmail.contextmenu.settings.popup_attrib).match(rcmail.contextmenu.settings.popup_pattern)) {
+                                $(elem).attr(rcmail.contextmenu.settings.popup_attrib, $(src_elem).children().last().attr(rcmail.contextmenu.settings.popup_attrib));
+                                $(elem).addClass('rcm-uidropdown');
+                            }
+                        }
+                        else if ($(src_elem).parent().is('a')) {
+                            elem = $(src_elem).parent().clone();
+                        }
+                        else if (src_elem.command && src_elem.label) {
+                            elem = $('<a>').attr('href', '#')
+                                    .attr('id', 'rcmjs')
+                                    .attr('onclick', "return rcmail.command('"+ src_elem.command +"','"+ src_elem.props +"',src_elem,event)")
+                                    .addClass(src_elem.classes)
+                                    .html(src_elem.label);
+                        }
+                        else {
+                            return;
+                        }
+                    }
+                    else if (callback.abort) {
+                        return;
+                    }
+                    else {
+                        elem = callback.result;
+                    }
+
+                    // turn custom popup function into onclick
+                    if (rcmail.contextmenu.settings.popup_func.length > 0 && elem[0].hasAttribute(rcmail.contextmenu.settings.popup_attrib) && elem.attr(rcmail.contextmenu.settings.popup_attrib).match(rcmail.contextmenu.settings.popup_pattern)) {
+                        elem.attr('onclick', elem.attr(rcmail.contextmenu.settings.popup_attrib).replace(rcmail.contextmenu.settings.popup_pattern, rcmail.contextmenu.settings.popup_func));
+                    }
+
+                    // skip any element that does not look like a Roundcube button
+                    if (!elem[0].hasAttribute('onclick')) {
+                        return;
+                    }
+
+                    command = '';
+                    var matches;
+                    if (matches = elem.attr('onclick').match(rcmail.contextmenu.settings.command_pattern)) {
+                        command = matches[1];
+                        args = matches[2];
+                    }
+
+                    // skip elements we don't need
+                    if ($.inArray(rcmail.env.task + '-' + command, rcmail.contextmenu.settings.skip_commands) >= 0 || elem.hasClass('rcm_ignore') || elem.hasClass('rcm-ignore')) { // rcm_ignore class depreciated in v3.0
+                        return;
+                    }
+
+                    var a = link.clone(), row = li.clone();
+
+                    // add command name element
+                    var tmp = span.clone();
+                    tmp.text($.trim(elem.text()).length > 0 ? $.trim(elem.text()) : elem.attr('title'));
+                    tmp.addClass(elem.children('span').attr('class'));
+                    a.append(tmp);
+                    a.addClass(elem.attr('class'));
+                    a.removeClass(rcmail.contextmenu.settings.classes.button_remove);
+                    a.removeClass(rcmail.contextmenu.settings.classes.button_disabled);
+                    a.addClass('rcm_elem_' + elem.attr('id'));
+
+                    if (matches = elem.attr('onclick').match(rcmail.contextmenu.settings.popup_pattern)) {
+                        // check the popup menu exists
+                        var popup_id = rcmail.gui_containers[matches[1]] ? rcmail.gui_containers[matches[1]].attr('id') : matches[1];
+                        if ($('#' + popup_id).length == 0) {
+                            return;
+                        }
+
+                        a.data('command', matches[1]);
+                        a.data('menu-pos', ref.submenu_position);
+                        a.addClass(ref.classes.sub_button_a);
+                        if (ref.classes.sub_button_span)
+                            a.append($('<span>').addClass(ref.classes.sub_button_span));
+                        row.addClass(rcmail.contextmenu.settings.classes.submenu);
+                        a.on('click', function(e) {
+                            if (!$(this).is('.' + rcmail.contextmenu.settings.classes.button_active.replace(/ /g, ', .')))
+                                return;
+
+                            ref.submenu(a, e);
+                            return false;
+                        })
+                        .on('mouseover', function(e) {
+                            if (ref.mouseover_timeout < 0)
+                                return;
+
+                            var el = this;
+                            ref.timers['submenu_show'] = window.setTimeout(function(a, e) {
+                                if (!$(el).is('.' + rcmail.contextmenu.settings.classes.button_active.replace(/ /g, ', .'))) {
+                                    rcmail.contextmenu.hide_all(e, true);
+                                }
+                                else {
+                                    ref.submenu(a, e);
+                                }
+                            }, ref.mouseover_timeout, a, e);
+                        })
+                        .on('mouseout', function() {
+                            if (ref.mouseover_timeout < 0 || !$(this).is('.' + rcmail.contextmenu.settings.classes.button_active.replace(/ /g, ', .')))
+                                return;
+
+                            $(this).blur();
+                            clearTimeout(ref.timers['submenu_show']);
+                        });
+                    }
+                    else {
+                        // skip elements for which we could not identify a command
+                        if (!command) {
+                            return;
+                        }
+
+                        a.addClass('cmd_' + command.replace(/\./g, '-'));
+                        a.data('command', command);
+                        if (elem.attr('target'))
+                            a.attr('target', elem.attr('target'));
+
+                        a.on('click', function(e) {
+                            if ($(this).parents('div.' + rcmail.contextmenu.settings.classes.submenu.replace(/ /g, '.')).length == 0) {
+                                rcmail.contextmenu.hide_all(e, true);
+                                clearTimeout(ref.timers['submenu_hide']);
+                            }
+
+                            var cur_popups = rcmail.contextmenu.vars.popup_menus.length;
+                            var result;
+
+                            var callback = ref.parent_menu.triggerEvent('beforecommand', {ref: ref, el: this, command: command, args: args});
+                            if (!callback || !callback.abort) {
+                                result = ref.parent_menu.triggerEvent('command', {ref: ref, el: this, command: command, args: args, evt: e});
+                            }
+                            else {
+                                result = callback.result;
+                            }
+
+                            if (!callback || !callback.skipaftercommand)
+                                ref.parent_menu.triggerEvent('aftercommand', {ref: ref, el: this, command: command, args: args});
+
+                            if (rcmail.contextmenu.vars.popup_menus.length > cur_popups) {
+                                var popup_name = rcmail.contextmenu.vars.popup_menus[rcmail.contextmenu.vars.popup_menus.length - 1];
+
+                                // make sure enabled commands match context menu message selection
+                                $.each(rcmail.contextmenu.vars.popup_commands[popup_name], function(cmd, state) {
+                                    rcmail.enable_command(cmd, state);
+                                });
+                            }
+
+                            // ensure menu is always hidden after action
+                            ref.parent_menu.hide_menu(e);
+
+                            return result;
+                        });
+
+                        if (ref.mouseover_timeout > -1 && !ref.is_submenu) {
+                            a.mouseover(function(e) {
+                                ref.timers['submenu_hide'] = window.setTimeout(function(e) {
+                                    rcmail.contextmenu.hide_all(e, true);
+                                }, ref.mouseover_timeout, e);
+                            });
+
+                            a.mouseout(function() { clearTimeout(ref.timers['submenu_hide']); });
+                        }
+                    }
+
+                    row.append(a);
+                    ref.parent_menu.triggerEvent('insertitem', {ref: ref, item: row, originalElement: elem});
+                    rows.push(row);
+                });
+            });
+
+            ul.append(rows).appendTo(this.container);
+            this.parent_menu.triggerEvent('init', {ref: this});
+            this.container.appendTo($('body'));
+        }
+    };
+
+    this.show_menu = function(obj, e) {
+        if (obj) {
+            this.hide_menu(e);
+        }
+
+        var callback = this.parent_menu.triggerEvent('beforeactivate', {ref: this, source: obj, originalEvent: e});
+        if (!callback || !callback.abort) {
+            // don't add source class when selected row is part of current selection, current selection is styled already (#113)
+            if (obj && !(this.list_object && rcmail[this.list_object].in_selection(rcmail.env.context_menu_source_id))) {
+                $(obj).addClass(this.classes.source);
+            }
+
+            if (this.modal && !this.is_submenu && ($('#rcm_modal').length == 0 || (rcmail.contextmenu.settings.classes.modal_overlay && $('.' + rcmail.contextmenu.settings.classes.modal_overlay.replace(/ /g, '.')).length == 0))) {
+                $('<div>').attr('id', 'rcm_modal').addClass(rcmail.contextmenu.settings.classes.modal_overlay)
+                    .on('contextmenu', function(e) { $(e.target).trigger('click'); rcube_event.cancel(e); })
+                    .insertBefore('#rcm_' + this.menu_name);
+            }
+
+            $.each(ref.menu_source_obj, function(id, props) {
+                if (props.toggle) {
+                    // wait for return
+                    var ret = ref.parent_menu.triggerEvent('submenu_toggle', {id: id, ref: ref, show: true});
+                }
+            });
+
+            $.each(this.container.find('a'), function() {
+                var btn;
+                if ($(this).hasClass('rcm_active') || $(this).hasClass('rcm-active')) { // rcm_active class depreciated in v3.0
+                    $(this).addClass(rcmail.contextmenu.settings.classes.button_active);
+                }
+                else if (btn = $(this).attr('class').match(/rcm_elem_([a-z0-9]+)/)) {
+                    $(this).parent('li')[(btn[1] == 'rcmjs' || $('#' + btn[1]).is(':visible')) ? 'show' : 'hide']();
+                    $(this).removeClass(rcmail.contextmenu.settings.classes.button_active).removeClass(rcmail.contextmenu.settings.classes.button_disabled);
+
+                    var enabled = false;
+                    if ($(this).parent('li').is('.' + rcmail.contextmenu.settings.classes.submenu.replace(/ /g, ', .'))) {
+                        // check of active commands in submenu to activate submenu link (https://github.com/roundcube/roundcubemail/issues/6444)
+                        // based on rcmail.set_menu_buttons()
+                        var id = rcmail.gui_containers[$(this).data('command')] ? rcmail.gui_containers[$(this).data('command')].attr('id') : $(this).data('command');
+                        if (rcmail.menu_buttons[id]) {
+                            $.each(rcmail.menu_buttons[id][1], function() {
+                                var is_func = typeof(this) == 'function';
+                                if ((is_func && this()) || (!is_func && rcmail.commands[this])) {
+                                    return !(enabled = true);
+                                }
+                            });
+                        }
+                        else {
+                            // cant find the submenu, enable the link just in case
+                            enabled = true;
+                        }
+                    }
+                    else if (!rcmail.contextmenu.ui_button_check(btn[1], false) && (!ref.is_submenu || rcmail.contextmenu.ui_button_check(btn[1], true))) {
+                        enabled = true;
+                    }
+
+                    var args = {ref: ref, el: this, btn: btn[1], source: obj, command: $(this).data('command'), enabled: enabled};
+                    var p = ref.parent_menu.triggerEvent('activate', args);
+
+                    if (typeof(p) === "boolean") { // backwards compatibility pre v3.0
+                        args.enabled = p;
+                        p = args;
+                    }
+                    else if (!p) {
+                        p = args;
+                    }
+
+                    if (!p.abort) {
+                        $(this).addClass(p.enabled == true ? rcmail.contextmenu.settings.classes.button_active : rcmail.contextmenu.settings.classes.button_disabled);
+                    }
+                }
+            });
+
+            $.each(ref.menu_source_obj, function(id, props) {
+                if (props.toggle) {
+                    // wait for return
+                    var ret = ref.parent_menu.triggerEvent('submenu_toggle', {id: id, ref: ref, show: false});
+                }
+            });
+
+            this.parent_menu.triggerEvent('afteractivate', {ref: this, source: obj, originalEvent: e});
+        }
+
+        // sanity check, make sure there are items contained in the menu
+        if (this.container.find('li > a').length == 0) {
+            $('.' + this.classes.source.replace(/ /g, '.')).removeClass(this.classes.source);
+            return;
+        }
+
+        // position menu on the screen
+        if (this.is_submenu) {
+            rcmail.element_position(this.container, this.parent_object);
+        }
+        else {
+            this.position(e, this.container);
+        }
+
+        if (!callback || callback.show !== false) {
+            this.selected_object = obj;
+            this.container.show();
+            rcmail.triggerEvent('menu-open', { name: this.container.attr('id'), props:{ menu: this.container.attr('id'), skinable: this.skinable }, originalEvent: e });
+        }
+    };
+
+    this.hide_menu = function(e) {
+        if ($('div.' + rcmail.contextmenu.settings.classes.container.replace(/ /g, '.')).is(':visible') && (rcmail.contextmenu.vars.popup_menus.length == 0 || $(e.target).parents('div.' + rcmail.contextmenu.settings.classes.container.replace(/ /g, '.')).length == 0)) {
+            if (!this.is_submenu) {
+                this.selected_object = null;
+                $('.' + this.classes.source.replace(/ /g, '.')).removeClass(this.classes.source);
+
+                if (this.modal)
+                    $('#rcm_modal').remove();
+            }
+
+            // if the menu has submenus they should be hidden to
+            $.each(this.submenus, function() {
+                this.container.hide();
+            });
+
+            this.menu_selection = new Array(); // reset selection ready for next event
+            this.container.hide();
+            this.parent_menu.triggerEvent('hide_menu', { ref: this, originalEvent: e });
+        }
+    };
+
+    this.submenu = function(link, e) {
+        if (e) {
+            rcube_event.cancel(e);
+        }
+
+        rcmail.contextmenu.hide_all(e, true);
+
+        var id = rcmail.gui_containers[$(link).data('command')] ? rcmail.gui_containers[$(link).data('command')].attr('id') : $(link).data('command');
+        if (!this.submenus[id]) {
+            var elem = !$('#' + id).is('ul') ? '#' + id + ' ul' : '#' + id; // check if the container returned is a ul else there should be one directly beneath it
+            this.submenus[id] = new rcube_context_menu({'menu_name': id, 'menu_source': elem, 'parents': (this.parents + 1), 'parent_menu': this, 'parent_object': link, 'is_submenu': true, 'list_object': this.list_object});
+            this.submenus[id].init();
+        }
+
+        this.submenus[id].show_menu(null, e);
+    };
+
+    this.position = function(e, menu) {
+        // temporarily show element to calculate its size
+        menu.css({left: '-1000px', top: '-1000px'}).show();
+
+        var win = $(window),
+        win_height = win.height(),
+        elem_height = $(menu).height(),
+        elem_width = $(menu).width(),
+        top = e.pageY,
+        left = e.pageX;
+
+        if (top + elem_height > win_height) {
+            top -= elem_height;
+
+            if (top < 0)
+                top = Math.max(0, (win_height - elem_height) / 2);
+        }
+
+        if (left + elem_width > win.width())
+            left -= ((left + elem_width) - win.width()) + 10;
+
+        // sanity check
+        if (left < 0) left = 0;
+
+        menu.hide();
+        menu.css({left: left + 'px', top: top + 'px'});
+    };
+
+    this.destroy = function() {
+        $.each(this.submenus, function() {
+            this.destroy();
+        });
+
+        // remove the menu from the UI
+        this.container.remove();
+
+        if (this.is_submenu)
+            delete rcmail.env.contextmenus[this.parent_menu.menu_name].submenus[this.menu_name];
+        else
+            delete rcmail.env.contextmenus[this.menu_name];
+    };
+
+    this.addEventListener = rcube_event_engine.prototype.addEventListener;
+    this.removeEventListener = rcube_event_engine.prototype.removeEventListener;
+    this.triggerEvent = rcube_event_engine.prototype.triggerEvent;
 }
 
 $(document).ready(function() {
-	if (window.rcmail) {
-		rcmail.env.contextmenus = {};
-
-		rcmail.addEventListener('init', function() {
-			// no need to reattach events inside iframe
-			if (rcmail.is_framed())
-				return;
-
-			var body_mouseup = function(e) { $.each(rcmail.env.contextmenus, function() { this.hide(e); }); };
-			$(document.body).on('click contextmenu', body_mouseup);
-
-			// Hide menu after clicks in iframes (eg. preview pane)
-			$('iframe').on('load', function(e) {
-				try { $(this.contentDocument || this.contentWindow).on('mouseup', body_mouseup) }
-				catch (e) { /* catch possible "Permission denied" error in IE */ }
-			})
-			.contents().on('mouseup', body_mouseup);
-		});
-
-		if ((rcmail.env.task == 'mail' || rcmail.env.task == 'addressbook') && rcmail.env.action == '') {
-			// special handeling for move/copy functions (folder/address book selector)
-			rcmail.addEventListener('actionbefore', function(props) {
-				var menu = rcmail.env.task == 'addressbook' ? rcmail.env.contextmenus['contactlist'] : rcmail.env.contextmenus['messagelist'];
-				rcm_override_mailbox_command(menu, props, true);
-			});
-
-			rcmail.addEventListener('actionafter', function(props) {
-				var menu = rcmail.env.task == 'addressbook' ? rcmail.env.contextmenus['contactlist'] : rcmail.env.contextmenus['messagelist'];
-				rcm_override_mailbox_command(menu, props, false);
-			});
-		}
-
-		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
-			rcmail.register_command('plugin.contextmenu.collapseall', function(props, obj) {
-				$("#mailboxlist div.expanded").each(function() { $(this).click(); });
-			}, false);
-
-			rcmail.register_command('plugin.contextmenu.expandall', function(props, obj) {
-				$("#mailboxlist div.collapsed").each(function() { $(this).click(); });
-			}, false);
-
-			rcmail.register_command('plugin.contextmenu.openfolder', function(props, obj) {
-				var button_id = rcmail.buttons['plugin.contextmenu.openfolder'][0].id;
-
-				rcube_find_object(button_id).href = '?_task=mail&_mbox='+urlencode(rcmail.env.context_menu_source_id);
-				rcmail.sourcewin = window.open(rcube_find_object(button_id).href);
-				if (rcmail.sourcewin)
-					window.setTimeout(function() { rcmail.sourcewin.focus(); }, 20);
-
-				rcube_find_object(button_id).href = '#';
-			}, false);
-		}
-
-		if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
-			// address book selector
-			rcmail.addEventListener('actionbefore', function(props) {
-				if ((props.action == 'move' || props.action == 'copy') && props.props == '') {
-					rcm_addressbook_selector(props.originalEvent, props.action, function(obj, cmd, evt) {
-						// search result may contain contacts from many sources, but if there is only one...
-						var source = rcmail.env.source;
-						if (source == '' && rcmail.env.selection_sources.length == 1)
-							source = rcmail.env.selection_sources[0];
-
-						if ($(obj).data('source')) {
-							rcmail.command(cmd, rcmail.env.contactgroups['G' + $(obj).data('source') + $(obj).data('id')], evt);
-						}
-						else {
-							rcmail.command(cmd, rcmail.env.address_sources[$(obj).data('id')], evt);
-						}
-					});
-
-					return false;
-				}
-			});
-
-			// address book group selector
-			rcmail.register_command('plugin.contextmenu.assigngroup', function(props, obj, event) {
-				rcm_group_selector(event, props, function(obj, evt) {
-					// search result may contain contacts from many sources, but if there is only one...
-					rcm_override_mailbox_command(rcmail.env.contextmenus['contactlist'], { action: 'copy' } , true);
-					rcmail.group_member_change('add', rcmail.contact_list.get_selection().join(','), rcmail.env.source, $(obj).data('id'));
-					rcm_override_mailbox_command(rcmail.env.contextmenus['contactlist'], { action: 'copy' } , false);
-				});
-			}, false);
-
-			// reset address book selector when groups change
-			rcmail.addEventListener('group_insert', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
-			rcmail.addEventListener('group_update', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
-			rcmail.addEventListener('group_delete', function() { $("#addressbook-selector").remove(); $("#addressgroup-selector").remove(); rcmail.rcm_addressbook_selector_element = undefined; rcmail.rcm_addressgroup_selector_element  = undefined; } );
-		}
-
-		// special event listeners for intreacting with plugins which open popup menus (eg: zipdownload)
-		rcmail.addEventListener('menu-open', function(p) {
-			// check for popupmenus that arent part of contextmenu
-			if ($('div.contextmenu').is(':visible') && p.name.indexOf('rcm_') != 0) {
-				rcmail.context_menu_popup_commands[p.name] = {};
-				$('#' + p.name).find('a').each(function() {
-					if ($(this).attr('onclick') && $(this).attr('onclick').match(rcmail.context_menu_command_pattern)) {
-						var cmd = RegExp.$1;
-						rcmail.context_menu_popup_commands[p.name][cmd] = rcmail.commands[cmd];
-					}
-				});
-			}
-		});
-
-		rcmail.addEventListener('menu-close', function(p) {
-			// check required args are present, other plugins trigger this event too
-			if (!p.originalEvent) {
-				return;
-			}
-
-			// check for popupmenus that arent part of contextmenu
-			var e = p.originalEvent.currentTarget ? p.originalEvent.currentTarget : p.originalEvent.srcElement;
-			if ($('div.contextmenu').is(':visible') && p.name.indexOf('rcm_') != 0 && $(e).attr('class').indexOf('rcm_elem_') == -1) {
-				rcm_hide_menu(p.originalEvent);
-			}
-		});
-
-		rcmail.addEventListener('get_single_uid', function() {
-			if ($('#rcm_messagelist').is(':visible') && rcmail.env.contextmenus['messagelist'].menu_selection.length == 1) {
-				return rcmail.env.contextmenus['messagelist'].menu_selection[0];
-			}
-		});
-
-		rcmail.addEventListener('get_single_cid', function() {
-			if ($('#rcm_contactlist').is(':visible') && rcmail.env.contextmenus['contactlist'].menu_selection.length == 1) {
-				return rcmail.env.contextmenus['contactlist'].menu_selection[0];
-			}
-			else if ($('#rcm_composeto').is(':visible') && rcmail.env.contextmenus['composeto'].menu_selection.length == 1) {
-				return rcmail.env.contextmenus['composeto'].menu_selection[0];
-			}
-		});
-	}
+    if (window.rcmail) {
+        rcmail.env.contextmenus = {};
+
+        // backwards compatibility with old settings code removed in v3.0
+        var old_settings = ['context_menu_skip_commands', 'context_menu_overload_commands', 'context_menu_command_pattern', 'context_menu_popup_pattern', 'context_menu_button_active_class', 'context_menu_button_disabled_class'];
+        $.each(old_settings, function() {
+            if (rcmail[this]) {
+                rcm_log('rcmail.' + this);
+                var opt = this.replace(/^context_menu_/, '');
+
+                if ((this == 'context_menu_button_active_class' || this == 'context_menu_button_disabled_class') && $.isArray(rcmail[this])) {
+                    rcmail.contextmenu.settings[opt] = rcmail[this].join(' ');
+                }
+                else {
+                    rcmail.contextmenu.settings[opt] = rcmail[this];
+                }
+            }
+        });
+
+        rcmail.addEventListener('init', function() {
+            // no need to reattach events inside iframe
+            if (rcmail.is_framed())
+                return;
+
+            var body_mouseup = function(e) {
+                $.each(rcmail.env.contextmenus, function() {
+                    if (rcmail.contextmenu.settings.no_right_click_on_menu && e.which == 3 && $(e.target).parents('.contextmenu').length > 0) {
+                        // useability - on the contextmenu make right click the same as left (sometimes users think they have to right click because they right clicked to get there)
+                        $(e.target).trigger('click');
+                        rcube_event.cancel(e);
+                    }
+                    else {
+                        rcmail.contextmenu.hide_all(e);
+                    }
+                });
+            };
+            $(document.body).on('click contextmenu', body_mouseup);
+
+            // Hide menu after clicks in iframes (eg. preview pane)
+            $('iframe').on('load', function() {
+                try { $(this.contentDocument || this.contentWindow).on('mouseup', body_mouseup) }
+                catch (e) { /* catch possible "Permission denied" error in IE */ }
+            })
+            .contents().on('mouseup', body_mouseup);
+        });
+
+        rcmail.register_command('plugin.contextmenu.collapseall', function(obj) {
+            rcmail[obj].collapse_all();
+        }, true);
+
+        rcmail.register_command('plugin.contextmenu.expandall', function(obj) {
+            rcmail[obj].expand_all();
+        }, true);
+
+        rcmail.register_command('plugin.contextmenu.openextwin', function() {
+            var button_id = rcmail.buttons['plugin.contextmenu.openextwin'][0].id;
+
+            if (rcmail.env.task == 'settings') {
+                rcube_find_object(button_id).href = '?_task=settings&_action=' + urlencode(rcmail.env.context_menu_source_id);
+            }
+            else {
+                rcube_find_object(button_id).href = '?_task=mail&_mbox=' + urlencode(rcmail.env.context_menu_source_id);
+            }
+
+            rcmail.sourcewin = window.open(rcube_find_object(button_id).href);
+            if (rcmail.sourcewin)
+                window.setTimeout(function() { rcmail.sourcewin.focus(); }, 20);
+
+            rcube_find_object(button_id).href = '#';
+        }, false);
+
+        rcmail.register_command('plugin.contextmenu.openinline', function() {
+            rcmail.goto_url('settings/' + rcmail.env.context_menu_source_id, {_framed: 0});
+        }, false);
+
+        // special event listeners for intreacting with plugins which open popup menus (eg: zipdownload)
+        rcmail.addEventListener('menu-open', function(p) {
+            // check for popupmenus that arent part of contextmenu
+            if ($('div.' + rcmail.contextmenu.settings.classes.container.replace(/ /g, '.')).is(':visible') && p.name.indexOf('rcm_') != 0) {
+                rcmail.contextmenu.vars.popup_commands[p.name] = {};
+                $('#' + p.name).find('a').each(function() {
+                    var matches;
+                    if ($(this).attr('onclick') && (matches = $(this).attr('onclick').match(rcmail.contextmenu.settings.command_pattern))) {
+                        rcmail.contextmenu.vars.popup_commands[p.name][matches[1]] = rcmail.commands[matches[1]];
+                    }
+                });
+
+                // keep track of whats open
+                rcmail.contextmenu.vars.popup_menus.push(p.name);
+            }
+        });
+
+        rcmail.addEventListener('menu-close', function(p) {
+            // keep track of whats open
+            var idx;
+            if ((idx = $.inArray(p.name, rcmail.contextmenu.vars.popup_menus)) >= 0) {
+                rcmail.contextmenu.vars.popup_menus.splice(idx, 1);
+            }
+
+            // check required args are present, other plugins trigger this event too
+            if (p.originalEvent && $('div.' + rcmail.contextmenu.settings.classes.container.replace(/ /g, '.')).is(':visible')) {
+                var e = p.originalEvent.currentTarget ? p.originalEvent.currentTarget : p.originalEvent.srcElement;
+                // check target is an HTML Element (ie not HTML Document #105)
+                if (e instanceof HTMLElement) {
+                    // check if target is in a contextmenu, and is so hide the menu
+                    if (p.name.indexOf('rcm_') != 0 && $(e).prop('class').indexOf('rcm_elem_') == -1) {
+                        rcmail.contextmenu.hide_all(p.originalEvent, false, true);
+                    }
+                }
+            }
+        });
+    }
 });
\ No newline at end of file
diff --git a/contextmenu.php b/contextmenu.php
index 93a3a13..10ec335 100644
--- a/contextmenu.php
+++ b/contextmenu.php
@@ -7,9 +7,9 @@
  *
  * @author Philip Weir
  *
- * Copyright (C) 2009-2014 Philip Weir
+ * Copyright (C) Philip Weir
  *
- * This program is a Roundcube (http://www.roundcube.net) plugin.
+ * This program is a Roundcube (https://roundcube.net) plugin.
  * For more information see README.md.
  * See MANUAL.md for information about extending this plugin.
  *
@@ -24,77 +24,55 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Roundcube. If not, see http://www.gnu.org/licenses/.
+ * along with Roundcube. If not, see https://www.gnu.org/licenses/.
  */
 class contextmenu extends rcube_plugin
 {
-	public $task = 'mail|addressbook';
+    public $task = '^((?!login).)*$';
+    private $rcube;
 
-	function init()
-	{
-		$rcmail = rcube::get_instance();
+    public function init()
+    {
+        $this->rcube = rcube::get_instance();
 
-		if ($rcmail->output->type == 'html') {
-			$this->include_script('contextmenu.js');
-			$this->include_stylesheet($this->local_skin_path() . '/contextmenu.css');
-			$this->include_script($this->local_skin_path() . '/functions.js');
-			$this->api->output->set_env('contextmenu', true);
-		}
+        if ($this->rcube->output->type == 'html') {
+            $this->include_script('contextmenu.js');
+            $this->include_stylesheet($this->local_skin_path() . '/contextmenu.css');
+            $this->include_script($this->local_skin_path() . '/functions.js');
+            $this->rcube->output->set_env('contextmenu', true);
+            $this->rcube->output->set_env('contextmenu_mouseover_timeout', $this->rcube->config->get('contextmenu_mouseover_timeout', 400));
+            $this->add_hook('render_page', array($this, 'additional_menus'));
+        }
 
-		if ($rcmail->task == 'mail') {
-			$this->register_action('plugin.contextmenu.messagecount', array($this, 'messagecount'));
+        $this->register_action('plugin.contextmenu.messagecount', array($this, 'messagecount'));
+    }
 
-			// on the mailbox screen only add some additional options for the folder menu
-			if ($rcmail->action == '') {
-				$this->addition_folder_options();
-			}
-		}
-		elseif ($rcmail->task == 'addressbook' && $rcmail->action == '') {
-			// give other plugins a change to add address books before checking if they exist for the menu
-			$this->add_hook('render_page', array($this, 'addition_addressbook_options'));
-		}
-	}
+    public function additional_menus($args)
+    {
+        // Other plugins may use template parsing method, this causes more than one render_page execution.
+        // We have to make sure the menu is added only once (when content is going to be written to client).
+        if (!$args['write']) {
+            return;
+        }
 
-	public function addition_folder_options()
-	{
-		$this->add_texts('localization/');
+        // add additional menus from skins folder
+        $path = '/' . $this->local_skin_path() . '/includes/' . $this->rcube->task . '.html';
+        $filepath = slashify($this->home) . $path;
+        if (is_file($filepath) && is_readable($filepath)) {
+            $this->add_texts('localization/');
+            $html = $this->rcube->output->just_parse("<roundcube:include file=\"$path\" skinpath=\"plugins/contextmenu\" />");
+            $this->rcube->output->add_footer($html);
+        }
+    }
 
-		$li = '';
-		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.collapseall', 'type' => 'link', 'class' => 'collapseall rcm_active', 'label' => 'contextmenu.collapseall', 'tabindex' => '-1', 'aria-disabled' => 'true')));
-		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.expandall', 'type' => 'link', 'class' => 'expandall rcm_active', 'label' => 'contextmenu.expandall', 'tabindex' => '-1', 'aria-disabled' => 'true')));
-		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.openfolder', 'type' => 'link', 'class' => 'openfolder rcm_active', 'label' => 'openinextwin', 'tabindex' => '-1', 'aria-disabled' => 'true')));
+    public function messagecount()
+    {
+        $storage = $this->rcube->get_storage();
+        $mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
 
-		$out = html::tag('ul', array('id' => 'rcmFolderMenu', 'role' => 'menu'), $li);
-		$this->api->output->add_footer(html::div(array('style' => 'display: none;', 'aria-hidden' => 'true'), $out));
-	}
-
-	public function addition_addressbook_options()
-	{
-		$this->add_texts('localization/');
-
-		$li = '';
-		$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'plugin.contextmenu.assigngroup', 'type' => 'link', 'class' => 'assigngroup disabled', 'classact' => 'assigngroup active', 'label' => 'contextmenu.assigngroup', 'tabindex' => '-1', 'aria-disabled' => 'true')));
-
-		if (count(rcube::get_instance()->get_address_sources(true)) > 1) {
-			// only show the move option if there are sources to move between
-			$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'move', 'type' => 'link', 'class' => 'movecontact disabled', 'classact' => 'movecontact active', 'label' => 'moveto', 'tabindex' => '-1', 'aria-disabled' => 'true')));
-			$li .= html::tag('li', array('role' => 'menuitem'), $this->api->output->button(array('command' => 'copy', 'type' => 'link', 'class' => 'copycontact disabled', 'classact' => 'copycontact active', 'label' => 'copyto', 'tabindex' => '-1', 'aria-disabled' => 'true')));
-		}
-
-		$out = html::tag('ul', array('id' => 'rcmAddressBookMenu', 'role' => 'menu'), $li);
-		$this->api->output->add_footer(html::div(array('style' => 'display: none;', 'aria-hidden' => 'true'), $out));
-	}
-
-	public function messagecount()
-	{
-		$storage = rcube::get_instance()->storage;
-		$mbox = rcube_utils::get_input_value('_mbox', rcube_utils::INPUT_POST);
-
-		// send output
-		header("Content-Type: application/json; charset=".RCUBE_CHARSET);
-		echo json_encode(array('messagecount' => $storage->count($mbox, 'EXISTS')));
-		exit;
-	}
+        // send output
+        header("Content-Type: application/json; charset=" . RCUBE_CHARSET);
+        echo json_encode(array('messagecount' => $storage->count($mbox, 'EXISTS')));
+        exit;
+    }
 }
-
-?>
\ No newline at end of file
diff --git a/localization/ca_ES.inc b/localization/ca_ES.inc
old mode 100755
new mode 100644
diff --git a/localization/cs_CZ.inc b/localization/cs_CZ.inc
old mode 100755
new mode 100644
index 8612177..9279ecc
--- a/localization/cs_CZ.inc
+++ b/localization/cs_CZ.inc
@@ -1,5 +1,5 @@
 <?php
-/* Author: Martin Frajdl */
+/* Author: Martin Frajdl, et al. */
 
 $labels = array();
 $labels['collapseall'] = 'Sbalit všechny složky';
diff --git a/localization/da_DK.inc b/localization/da_DK.inc
old mode 100755
new mode 100644
diff --git a/localization/de_CH.inc b/localization/de_CH.inc
old mode 100755
new mode 100644
index 43d2484..b147a85
--- a/localization/de_CH.inc
+++ b/localization/de_CH.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Alle Unterordner einklappen';
 $labels['expandall'] = 'Alle Unterordner ausklappen';
-$labels['assigngroup'] = 'Gewählte Kontakte einer Gruppe zuordnen';
 
 $messages = array();
diff --git a/localization/de_DE.inc b/localization/de_DE.inc
old mode 100755
new mode 100644
index 43d2484..b147a85
--- a/localization/de_DE.inc
+++ b/localization/de_DE.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Alle Unterordner einklappen';
 $labels['expandall'] = 'Alle Unterordner ausklappen';
-$labels['assigngroup'] = 'Gewählte Kontakte einer Gruppe zuordnen';
 
 $messages = array();
diff --git a/localization/en_GB.inc b/localization/en_GB.inc
old mode 100755
new mode 100644
index f5ec1bf..cfd51f1
--- a/localization/en_GB.inc
+++ b/localization/en_GB.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Collapse all folders';
 $labels['expandall'] = 'Expand all folders';
-$labels['assigngroup'] = 'Assign selected contacts to group...';
 
 $messages = array();
diff --git a/localization/en_US.inc b/localization/en_US.inc
old mode 100755
new mode 100644
index f5ec1bf..cfd51f1
--- a/localization/en_US.inc
+++ b/localization/en_US.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Collapse all folders';
 $labels['expandall'] = 'Expand all folders';
-$labels['assigngroup'] = 'Assign selected contacts to group...';
 
 $messages = array();
diff --git a/localization/es_AR.inc b/localization/es_AR.inc
index 835be66..29b63c5 100644
--- a/localization/es_AR.inc
+++ b/localization/es_AR.inc
@@ -2,10 +2,8 @@
 /* Author: Sergio Loyola */
 
 $labels = array();
-$labels['markreadfolder'] = 'Marcar todo como leído';
 $labels['collapseall'] = 'Compactar todas las carpetas';
 $labels['expandall'] = 'Expandir todas las carpetas';
-$labels['assigngroup'] = 'Asignar contactos seleccionados al grupo ...';
 
 $messages = array();
 
diff --git a/localization/es_ES.inc b/localization/es_ES.inc
old mode 100755
new mode 100644
diff --git a/localization/fr_FR.inc b/localization/fr_FR.inc
old mode 100755
new mode 100644
diff --git a/localization/gl_ES.inc b/localization/gl_ES.inc
old mode 100755
new mode 100644
diff --git a/localization/hu_HU.inc b/localization/hu_HU.inc
old mode 100755
new mode 100644
diff --git a/localization/it_IT.inc b/localization/it_IT.inc
old mode 100755
new mode 100644
diff --git a/localization/ja_JP.inc b/localization/ja_JP.inc
old mode 100755
new mode 100644
diff --git a/localization/nl_NL.inc b/localization/nl_NL.inc
old mode 100755
new mode 100644
index b4df125..f7f1052
--- a/localization/nl_NL.inc
+++ b/localization/nl_NL.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Alle mappen inklappen';
 $labels['expandall'] = 'Alle mappen uitklappen';
-$labels['assigngroup'] = 'Geselecteerde contacten toewijzen aan groep...';
 
 $messages = array();
diff --git a/localization/pl_PL.inc b/localization/pl_PL.inc
old mode 100755
new mode 100644
index cffb365..f465ace
--- a/localization/pl_PL.inc
+++ b/localization/pl_PL.inc
@@ -1,5 +1,7 @@
 <?php
-/* Author: Michał Jałocha */
+/* Author: Michał Jałocha
+   Updated by: Marcin D. "Perry" Mikielewicz
+*/
 
 $labels = array();
 $labels['collapseall'] = 'Zwiń wszystkie foldery';
diff --git a/localization/pt_BR.inc b/localization/pt_BR.inc
old mode 100755
new mode 100644
index bba9c7a..ef4d682
--- a/localization/pt_BR.inc
+++ b/localization/pt_BR.inc
@@ -4,6 +4,5 @@
 $labels = array();
 $labels['collapseall'] = 'Recolher todas as pastas';
 $labels['expandall'] = 'Expandir todas as pastas';
-$labels['assigngroup'] = 'Atribuir contatos selecionados ao grupo...';
 
 $messages = array();
diff --git a/localization/pt_PT.inc b/localization/pt_PT.inc
old mode 100755
new mode 100644
diff --git a/localization/ro_RO.inc b/localization/ro_RO.inc
old mode 100755
new mode 100644
diff --git a/localization/ru_RU.inc b/localization/ru_RU.inc
old mode 100755
new mode 100644
diff --git a/localization/sv_SE.inc b/localization/sv_SE.inc
old mode 100755
new mode 100644
diff --git a/localization/tr_TR.inc b/localization/tr_TR.inc
old mode 100755
new mode 100644
diff --git a/localization/uk_UA.inc b/localization/uk_UA.inc
old mode 100755
new mode 100644
diff --git a/localization/zh_CN.inc b/localization/zh_CN.inc
new file mode 100644
index 0000000..a30fd6d
--- /dev/null
+++ b/localization/zh_CN.inc
@@ -0,0 +1,8 @@
+<?php
+/* Author: thomasysliu */
+
+$labels = array();
+$labels['collapseall'] = '全部收起';
+$labels['expandall'] = '全部展开';
+
+$messages = array();
diff --git a/localization/zh_TW.inc b/localization/zh_TW.inc
old mode 100755
new mode 100644
diff --git a/skins/classic/contextmenu.css b/skins/classic/contextmenu.css
index 33ed29f..6add928 100644
--- a/skins/classic/contextmenu.css
+++ b/skins/classic/contextmenu.css
@@ -2,9 +2,10 @@
  * ContextMenu plugin styles
  */
 
-.contextRow td,
-#mailboxlist li.contextRow,
-#directorylistbox li.contextRow
+.context-source td,
+#mailboxlist li.context-source,
+#directorylistbox li.context-source,
+#subscription-table li.context-source
 {
   background-color: #EEEEEE;
 }
@@ -38,12 +39,12 @@ div.contextmenu ul.iconized li a span.icon
   background: url(images/contexticons.png) no-repeat 0 20px;
 }
 
-div.contextmenu ul.iconized li.submenu a span.icon
+div.contextmenu ul.iconized li.rcm-submenu a span.icon
 {
   padding-right: 15px;
 }
 
-div.contextmenu ul.iconized li.submenu a span.right-arrow
+div.contextmenu ul.iconized li.rcm-submenu a span.sub-button
 {
   position: absolute;
   top: 0;
@@ -58,11 +59,7 @@ div.contextmenu ul.iconized li a.reply span.icon
   background-position: 7px -119px;
 }
 
-div.contextmenu ul.iconized li a.replyAll span.icon
-{
-  background-position: 7px -392px;
-}
-
+div.contextmenu ul.iconized li a.replyAll span.icon,
 div.contextmenu ul.iconized li a.replyalllink span.icon
 {
   background-position: 7px -392px;
@@ -73,11 +70,7 @@ div.contextmenu ul.iconized li a.replylistlink span.icon
   background-position: 7px -377px;
 }
 
-div.contextmenu ul.iconized li a.forward span.icon
-{
-  background-position: 7px -102px;
-}
-
+div.contextmenu ul.iconized li a.forward span.icon,
 div.contextmenu ul.iconized li a.forwardlink span.icon
 {
   background-position: 7px -102px;
@@ -88,11 +81,33 @@ div.contextmenu ul.iconized li a.forwardattachmentlink span.icon
   background-position: 7px -361px;
 }
 
-div.contextmenu ul.iconized li a.delete span.icon
+div.contextmenu ul.iconized li a.bouncelink span.icon
+{
+  background-position: 7px -561px;
+}
+
+div.contextmenu ul.iconized li a.delete span.icon,
+div.contextmenu ul.iconized li a.deletelink span.icon,
+div.contextmenu ul.iconized li a.delgroup span.icon,
+div.contextmenu ul.iconized li a.cmd_group-delete span.icon,
+div.contextmenu ul.iconized li a.cmd_search-delete span.icon,
+div.contextmenu ul.iconized li a.cmd_delete-folder span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-del span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setdel span.icon
 {
   background-position: 7px -187px;
 }
 
+div.contextmenu ul.iconized li a.junk span.icon
+{
+  background-position: 7px -577px;
+}
+
+div.contextmenu ul.iconized li a.archive span.icon
+{
+  background-position: 7px -596px;
+}
+
 div.contextmenu ul.iconized li a.markmessage span.icon
 {
   background-position: 7px -457px;
@@ -117,7 +132,9 @@ div.contextmenu ul.iconized li a.unflaggedlink span.icon
   background-position: 7px -153px;
 }
 
-div.contextmenu ul.iconized li a.messagemenu span.icon
+div.contextmenu ul.iconized li a.messagemenu span.icon,
+div.contextmenu ul.iconized li a.contactmenu span.icon,
+div.contextmenu ul.iconized li a.keymenu span.icon
 {
   background-position: 7px -475px;
 }
@@ -139,11 +156,11 @@ div.contextmenu ul.iconized li a.cmd_mark-all-read span.icon
 
 div.contextmenu ul.iconized li a.collapseall span.icon
 {
-  background-position: 7px -203px;
+  background-position: 7px -219px;
 }
 div.contextmenu ul.iconized li a.expandall span.icon
 {
-  background-position: 7px -219px;
+  background-position: 7px -203px;
 }
 
 div.contextmenu ul.iconized li a.cmd_expunge span.icon
@@ -156,6 +173,11 @@ div.contextmenu ul.iconized li a.cmd_purge span.icon
   background-position: 7px -271px;
 }
 
+div.contextmenu ul.iconized li a.openinline span.icon
+{
+  background-position: 7px -618px;
+}
+
 div.contextmenu ul.iconized li a.openfolder span.icon
 {
   background: url(images/messageactions.png) no-repeat 6px -52px;
@@ -171,7 +193,9 @@ div.contextmenu ul.iconized li a.copycontact span.icon
   background: url(images/messageactions.png) no-repeat 5px -143px;
 }
 
-div.contextmenu ul.iconized li a.export span.icon
+div.contextmenu ul.iconized li a.export span.icon,
+div.contextmenu ul.iconized li a.exportsellink span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setget span.icon
 {
   background-position: 7px -510px;
 }
@@ -181,47 +205,27 @@ div.contextmenu ul.iconized li a.exportalllink span.icon
   background-position: 7px -527px;
 }
 
-div.contextmenu ul.iconized li a.exportsellink span.icon
-{
-  background-position: 7px -510px;
-}
-
 div.contextmenu ul.iconized li a.cmd_add-recipient span.icon
 {
   background-position: 8px -236px;
 }
 
-div.contextmenu ul.iconized li a.vcard span.icon
+div.contextmenu ul.iconized li a.vcard span.icon,
+#rcm_contactmenumenu ul.iconized li a.vcard span.icon
 {
-  background-position: 7px -546px;
+  background: url(images/contexticons.png) no-repeat 7px -546px;
 }
 
-div.contextmenu ul.iconized li a.cmd_group-create span.icon,
-div.contextmenu ul.iconized li a.assigngroup span.icon
+div.contextmenu ul.iconized li a.cmd_group-create span.icon
 {
   background-position: 7px -441px;
 }
 
-div.contextmenu ul.iconized li a.cmd_group-remove-selected span.icon
-{
-  background-position: 7px -492px;
-}
-
 div.contextmenu ul.iconized li a.cmd_group-rename span.icon
 {
   background-position: 7px -426px;
 }
 
-div.contextmenu ul.iconized li a.cmd_group-delete span.icon
-{
-  background-position: 7px -186px;
-}
-
-div.contextmenu ul.iconized li a.cmd_search-delete span.icon
-{
-  background-position: 7px -186px;
-}
-
 #rcm_messagemenumenu ul.iconized li a span.icon
 {
   background: url(images/messageactions.png) no-repeat 5px 20px;
@@ -262,40 +266,51 @@ div.contextmenu ul.iconized li a.cmd_search-delete span.icon
   background-position: 5px -52px;
 }
 
-/*** address book selector ***/
+#rcm_messagemenumenu ul.iconized li a.filterlink span.icon
+{
+  background-position: 5px -178px;
+}
 
-#addressbook-selector li a,
-#addressgroup-selector li a
+#rcm_contactmenumenu ul.iconized li a span.icon
 {
-  padding: 0;
+  background: url(images/contactactions.png) no-repeat 5px 20px;
 }
 
-#addressbook-selector li a span,
-#addressgroup-selector li a span
+#rcm_contactmenumenu ul.iconized li a.qrcode span.icon
 {
-  background: url(images/contexticons.png) no-repeat 0 20px;
-  display: block;
-  height: 15px;
-  min-height: 14px;
-  padding: 2px 4px 2px 28px;
-  overflow: hidden;
-  max-width: 120px;
-  text-overflow: ellipsis;
+  background-position: 5px -40px;
 }
 
-#addressbook-selector li a.active:hover span,
-#addressgroup-selector li a.active:hover span
+#rcm_contactmenumenu ul.iconized li a.assigngroup span.icon
 {
-  color: white;
+  background-position: 5px 0;
 }
 
-#addressbook-selector li a.addressbook span
+#rcm_contactmenumenu ul.iconized li a.removegroup span.icon
 {
-  background-position: 5px -306px;
+  background-position: 5px -19px;
+}
+
+#rcm_contactmenumenu ul.iconized li a.movelink span.icon
+{
+  background: url(images/messageactions.png) no-repeat 7px 0;
+  background-position: 5px -160px;
+}
+
+#rcm_contactmenumenu ul.iconized li a.copylink span.icon
+{
+  background: url(images/messageactions.png) no-repeat 7px 0;
+  background-position: 5px -142px;
+}
+
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-seteditraw span.icon
+{
+  background: url(images/messageactions.png) no-repeat 5px 20px;
+  background-position: 5px -70px;
 }
 
-#addressbook-selector li a.contactgroup span,
-#addressgroup-selector li a.contactgroup span
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setact span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-act span.icon
 {
-  background-position: 5px -343px;
+  background-position: 7px -640px;
 }
\ No newline at end of file
diff --git a/skins/classic/functions.js b/skins/classic/functions.js
index 66ae7b9..e867dc2 100644
--- a/skins/classic/functions.js
+++ b/skins/classic/functions.js
@@ -4,7 +4,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014 Philip Weir
+ * Copyright (C) Philip Weir
  *
  * The JavaScript code in this page is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License
@@ -15,75 +15,53 @@
  * for the JavaScript code in this file.
  */
 
-rcube_webmail.prototype.context_menu_popup_pattern = /rcmail_ui\.show_popup\(\'([^\']+)\'/;
-rcube_webmail.prototype.context_menu_button_active_class = new Array('active', 'button');
-rcube_webmail.prototype.context_menu_button_disabled_class = new Array('disabled', 'buttonPas');
+rcube_webmail.prototype.contextmenu.skin_funcs.compose_menu_text = function(p) {
+    if ($(p.item).children('a').hasClass('vcard')) {
+        $(p.item).children('a').children('span').text($('#abookactions a.vcard').attr('title'));
+    }
+};
 
-function add_menu_text(p) {
-	if ($(p.item).children('a').hasClass('vcard')) {
-		$(p.item).children('a').children('span').text($('#abookactions a.vcard').attr('title'));
-	}
-}
-
-function reorder_contact_menu(p) {
-	// put export link last
-	var ul = p.ref.container.find('ul:first');
-	$(p.ref.container).find('a.export').parent('li').appendTo(ul);
-}
-
-function reorder_abook_menu(p) {
-	// remove the remove from group option from the address book menu
-	p.ref.container.find('a.cmd_group-remove-selected').remove();
-}
+rcube_webmail.prototype.contextmenu.skin_funcs.reorder_addressbook_menu = function(p) {
+    // remove the remove from group option from the address book menu
+    p.ref.container.find('a.rcm_elem_groupmenulink').remove();
+    p.ref.container.find('a.cmd_group-remove-selected').remove();
+};
 
 $(document).ready(function() {
-	if (window.rcmail) {
-		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
-			rcmail.add_onload("rcm_foldermenu_init('#mailboxlist li', {'menu_source': ['#rcmFolderMenu', '#mailboxoptionsmenu ul']})");
-		}
-		else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'composeto', 'menu_source': '#abookactions', 'list_object': rcmail.contact_list}, {'insertitem': function(p) { add_menu_text(p); }}); } );
-		}
-		else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
-			rcmail.addEventListener('contextmenu_init', function(menu) {
-				if (menu.menu_name == 'contactlist') {
-					// copy the remove from group option in the contact menu
-					if (btn = $('#' + rcmail.buttons['group-remove-selected'][0].id).clone()) {
-						// remove the ID and add override class
-						btn.removeAttr('id').addClass('rcm_active');
-						btn = $('<li>').attr('role', 'menuitem').append(btn);
-						btn.insertAfter($('#rcmAddressBookMenu').find('a.assigngroup').parent('li'));
-					}
-				}
-			});
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#abooktoolbar', '#rcmAddressBookMenu'], 'list_object': rcmail.contact_list}, {
-				'init': function(p) { reorder_contact_menu(p); },
-				'afteractivate': function(p) {
-					p.ref.list_selection(false, rcmail.env.contextmenu_selection);
-
-					// count the number of groups in the current addressbook
-					if (!rcmail.env.group || rcmail.env.readonly)
-						p.ref.container.find('a.cmd_group-remove-selected').removeClass('active').addClass('disabled');
-
-					// count the number of groups in the current addressbook
-					var groupcount = 0;
-					if (!rcmail.env.readonly && rcmail.env.address_sources[rcmail.env.source] && rcmail.env.address_sources[rcmail.env.source].groups)
-						$.each(rcmail.env.contactgroups, function(){ if (this.source === rcmail.env.source) groupcount++ });
+    if (window.rcmail) {
+        $.extend(true, rcmail.contextmenu.settings, {
+            popup_pattern: /rcmail_ui\.show_popup\(\x27([^\x27]+)\x27/,
+            classes: {
+                button_active: 'active button',
+                button_disabled: 'disabled buttonPas'
+            }
+        });
 
-					if (groupcount > 0)
-						p.ref.container.find('a.assigngroup').removeClass('disabled').addClass('active');
-					else
-						p.ref.container.find('a.assigngroup').removeClass('active').addClass('disabled');
-				},
-				'aftercommand': function(p) {
-					if ($(p.el).hasClass('active') && p.command == 'group-remove-selected')
-						rcmail.command('listgroup', {'source': rcmail.env.source, 'id': rcmail.env.group}, p.el);
-				}
-			}); } );
-			rcmail.add_onload("rcm_abookmenu_init('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}, {'init': function(p) { reorder_abook_menu(p); }})");
-			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
-			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
-		}
-	}
+        if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
+            rcmail.add_onload("rcmail.contextmenu.init_folder('#mailboxlist li', {'menu_source': ['#rcmfoldermenu > ul', '#mailboxoptionsmenu ul']})");
+        }
+        else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'composeto', 'menu_source': '#abookactions', 'list_object': 'contact_list'}, {
+                'insertitem': function(p) { rcmail.contextmenu.skin_funcs.compose_menu_text(p); }
+            }); } );
+        }
+        else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#abooktoolbar'], 'list_object': 'contact_list'}); } );
+            rcmail.add_onload("rcmail.contextmenu.init_addressbook('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}, {'init': function(p) { rcmail.contextmenu.skin_funcs.reorder_addressbook_menu(p); }})");
+            rcmail.addEventListener('group_insert', function(props) { rcmail.contextmenu.init_addressbook(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
+            rcmail.addEventListener('abook_search_insert', function(props) { rcmail.contextmenu.init_addressbook(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu ul']}); } );
+        }
+        else if (rcmail.env.task == 'settings') {
+            rcmail.contextmenu.settings_menus([
+                {'obj': 'sections-table tr', 'props': {'menu_name': 'preferenceslist', 'menu_source': '#rcmsettingsmenu > ul', 'list_object': 'sections_list'}},
+                {'obj': 'subscription-table li', 'props': {'menu_name': 'folderlist', 'menu_source': ['#rcmfoldermenu > ul', '#rcmsettingsmenu > ul', '#mailboxoptionsmenu > ul'], 'list_object': 'subscription_list', 'init_func': 'init_settings'}},
+                {'obj': 'identities-table tr', 'props': {'menu_name': 'identiteslist', 'menu_source': ['#rcmsettingsmenu > ul', '#identities-list div.boxfooter'], 'list_object': 'identity_list'}},
+                {'obj': 'responses-table tr', 'props': {'menu_name': 'responseslist', 'menu_source': ['#rcmsettingsmenu > ul', '#responses-list div.boxfooter'], 'list_object': 'responses_list'}},
+                {'obj': 'filtersetslist tr', 'props': {'menu_name': 'managesievesetlist', 'menu_source': ['#rcmsettingsmenu > ul', '#filtersetmenu > ul'], 'list_object': 'filtersets_list'}},
+                {'obj': 'filterslist tr', 'props': {'menu_name': 'managesieverulelist', 'menu_source': ['#rcmsettingsmenu > ul', '#filtermenu > ul'], 'list_object': 'filters_list'}},
+                {'obj': 'keys-table tr', 'props': {'menu_name': 'enigmakeylist', 'menu_source': ['#rcmsettingsmenu > ul', '#keystoolbar'], 'list_object': 'keys_list', 'list_id': 'keys-table'}}
+            ]);
+        }
+    }
 });
\ No newline at end of file
diff --git a/skins/classic/images/contactactions.png b/skins/classic/images/contactactions.png
new file mode 100644
index 0000000..8eda538
Binary files /dev/null and b/skins/classic/images/contactactions.png differ
diff --git a/skins/classic/images/contexticons.png b/skins/classic/images/contexticons.png
index caff82f..4395004 100644
Binary files a/skins/classic/images/contexticons.png and b/skins/classic/images/contexticons.png differ
diff --git a/skins/classic/images/messageactions.png b/skins/classic/images/messageactions.png
old mode 100755
new mode 100644
index 0dc6554..f11bee4
Binary files a/skins/classic/images/messageactions.png and b/skins/classic/images/messageactions.png differ
diff --git a/skins/classic/includes/mail.html b/skins/classic/includes/mail.html
new file mode 100644
index 0000000..fea057e
--- /dev/null
+++ b/skins/classic/includes/mail.html
@@ -0,0 +1,9 @@
+<roundcube:if condition="env:action == ''" />
+<div id="rcmfoldermenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="plugin.contextmenu.collapseall" prop="treelist" type="link" label="contextmenu.collapseall" classAct="collapseall active" class="collapseall" /></li>
+        <li><roundcube:button command="plugin.contextmenu.expandall" prop="treelist" type="link" label="contextmenu.expandall" classAct="expandall active" class="expandall" /></li>
+        <li><roundcube:button command="plugin.contextmenu.openextwin" type="link" label="openinextwin" class="openfolder rcm-active" /></li>
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/classic/includes/settings.html b/skins/classic/includes/settings.html
new file mode 100644
index 0000000..319099e
--- /dev/null
+++ b/skins/classic/includes/settings.html
@@ -0,0 +1,13 @@
+<div id="rcmsettingsmenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="plugin.contextmenu.openinline" type="link" label="open" class="openinline rcm-active" /></li>
+    </ul>
+</div>
+<roundcube:if condition="env:action == 'folders'" />
+<div id="rcmfoldermenu" class="popupmenu">
+    <ul>
+        <li><roundcube:button command="plugin.contextmenu.collapseall" prop="subscription_list" type="link" label="contextmenu.collapseall" classAct="collapseall active" class="collapseall" /></li>
+        <li><roundcube:button command="plugin.contextmenu.expandall" prop="subscription_list" type="link" label="contextmenu.expandall" classAct="expandall active" class="expandall" /></li>
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/elastic/contextmenu.less b/skins/elastic/contextmenu.less
new file mode 100644
index 0000000..f7152f1
--- /dev/null
+++ b/skins/elastic/contextmenu.less
@@ -0,0 +1,84 @@
+/**
+ * ContextMenu plugin styles
+ */
+
+@import (reference) "../../../../skins/elastic/styles/variables";
+@import (reference) "../../../../skins/elastic/styles/mixins";
+
+.contextmenu-source-highlight(@background-color) {
+  .listing:not(.treelist) li.context-source:not(.selected), // e.g. Settings actions list
+  .listing tbody tr.context-source:not(.selected) > td {
+    background-color: darken(@background-color, 2.5%);
+  }
+
+  ul.treelist li.context-source:not(.selected) {
+    & > div > a, // this is used e.g. by kolab_addressbook
+    & > a {
+      background-color: darken(@background-color, 2.5%);
+    }
+  }
+}
+
+.contextmenu-source-highlight(@color-layout-list-background);
+
+body > #layout > div.sidebar {
+  .contextmenu-source-highlight(@color-layout-sidebar-background);
+}
+
+div.contextmenu {
+  ul.menu {
+    min-width: 180px;
+  }
+
+  html.layout-small &,
+  html.layout-phone & {
+    top: 0 !important;
+  }
+}
+
+.contextmenu_content {
+  display: block !important;
+  flex: 0 !important;
+  min-width: 0 !important;
+  width: 0;
+
+  #toolbar-menu {
+    display: block !important;
+  }
+}
+
+// replace :hover with :active on phones to prevent misleading highlighting of menu items
+html.layout-phone {
+  div.contextmenu {
+    .menu.listing li:hover a.active {
+      color: @color-list;
+      background-color: transparent;
+    }
+
+    .menu.listing li:active a.active {
+      color: @color-menu-hover;
+      background-color: @color-menu-hover-background;
+    }
+  }
+}
+
+// additional icons
+div.contextmenu {
+  a {
+    &.cmd_plugin-contextmenu-collapseall::before {
+      content: @fa-var-angle-right;
+    }
+
+    &.cmd_plugin-contextmenu-expandall::before {
+      content: @fa-var-angle-down;
+    }
+
+    &.cmd_plugin-contextmenu-openextwin::before {
+      content: @fa-var-external-link-square-alt;
+    }
+
+    &.cmd_plugin-contextmenu-openinline::before {
+      .font-icon-regular(@fa-var-folder-open);
+    }
+  }
+}
\ No newline at end of file
diff --git a/skins/elastic/contextmenu.min.css b/skins/elastic/contextmenu.min.css
new file mode 100644
index 0000000..5504b33
--- /dev/null
+++ b/skins/elastic/contextmenu.min.css
@@ -0,0 +1 @@
+.contextmenu_content,.contextmenu_content #toolbar-menu{display:block!important}.listing tbody tr.context-source:not(.selected)>td,.listing:not(.treelist) li.context-source:not(.selected),body>#layout>div.sidebar .listing tbody tr.context-source:not(.selected)>td,body>#layout>div.sidebar .listing:not(.treelist) li.context-source:not(.selected),body>#layout>div.sidebar ul.treelist li.context-source:not(.selected)>a,body>#layout>div.sidebar ul.treelist li.context-source:not(.selected)>div>a,ul.treelist li.context-source:not(.selected)>a,ul.treelist li.context-source:not(.selected)>div>a{background-color:#f9f9f9}div.contextmenu ul.menu{min-width:180px}html.layout-phone div.contextmenu,html.layout-small div.contextmenu{top:0!important}.contextmenu_content{flex:0!important;min-width:0!important;width:0}html.layout-phone div.contextmenu .menu.listing li:hover a.active{color:#2c363a;background-color:transparent}html.layout-phone div.contextmenu .menu.listing li:active a.active{color:#fff;background-color:#37beff}div.contextmenu a.cmd_plugin-contextmenu-collapseall::before{content:"\f105"}div.contextmenu a.cmd_plugin-contextmenu-expandall::before{content:"\f107"}div.contextmenu a.cmd_plugin-contextmenu-openextwin::before{content:"\f360"}div.contextmenu a.cmd_plugin-contextmenu-openinline::before{content:"\f07c";font-weight:400}
\ No newline at end of file
diff --git a/skins/elastic/functions.js b/skins/elastic/functions.js
new file mode 100644
index 0000000..55c60b9
--- /dev/null
+++ b/skins/elastic/functions.js
@@ -0,0 +1,136 @@
+/**
+ * ContextMenu plugin script
+ *
+ * @licstart  The following is the entire license notice for the
+ * JavaScript code in this file.
+ *
+ * Copyright (C) Philip Weir
+ *
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.
+ *
+ * @licend  The above is the entire license notice
+ * for the JavaScript code in this file.
+ */
+
+$(document).ready(function() {
+    if (window.rcmail) {
+        $.extend(true, rcmail.contextmenu.settings, {
+            popup_attrib: 'data-popup',
+            popup_func: "rcm_popup_wrapper('$2');",
+            popup_pattern: /rcm_popup_wrapper\(\x27([^\x27]+)\x27|^([a-z0-9\-]+)$/i,
+            classes: { container: 'contextmenu', button_remove: '', modal_overlay: 'popover-overlay' },
+            menu_defaults: {
+                modal: true,
+                classes: {
+                    ul: 'menu listing',
+                    a: 'button rcmbutton',
+                    sub_button_a: 'rcmsubbutton',
+                    sub_button_span: null
+                }
+            },
+            menu_events: {
+                '+init': function(p) {
+                    if (!p.ref.is_submenu) {
+                        var label = 'close',
+                            title = rcmail.gettext(label),
+                            class_name = 'button icon cancel';
+
+                        var header = $('<h3>').addClass('popover-header')
+                            .append($('<a>').attr('class', class_name).text(title))
+                            .on('click', function(e) {
+                                rcmail.contextmenu.hide_all(e, $('div.contextmenu').filter(':visible').length >= 1);
+                            });
+
+                        $(p.ref.container).addClass('popover').prepend(header).children('ul').wrap($('<div>').addClass('popover-body'));
+                    }
+                    else {
+                       p.ref.skinable = true;
+                    }
+                },
+                '+insertitem': function(p) {
+                    var elem = p.originalElement, a = p.item.children('a');
+
+                    if (elem.attr('data-popup') || elem.attr('aria-haspopup')) {
+                        a.data('level', (p.ref.parents + 2));
+                        a.attr('aria-haspopup', true);
+                    }
+                },
+                '+beforeactivate': function(p) {
+                    // force toolbar display on small screens while the contextmenu renders
+                    if (!$('#layout-content').is(':visible'))
+                        $('#layout-content').addClass('contextmenu_content');
+
+                    // do not show submenus on mouseover for small screens
+                    p.ref.mouseover_timeout = $('html').is('.layout-small,.layout-phone') ? -1 : rcmail.env.contextmenu_mouseover_timeout;
+                },
+                '+afteractivate': function() {
+                    $('#layout-content').removeClass('contextmenu_content');
+                },
+                'submenu_toggle': function(p) {
+                    var matches;
+                    if ($(p.id).length > 0 && (matches = p.id.match(/^(#[^\s]+(\s>\s\.[a-z]+\s>)?(\sdiv)?)/)) && p.id.indexOf('#taskmenu') == -1) {
+                        var source_id = matches[1];
+
+                        // make sure its a real submenu and not the toolbar on a small screen
+                        if ($(source_id).is('div') && !$(source_id).hasClass('footer')) {
+                            $(source_id)[p.show ? 'show' : 'hide']();
+                            $(source_id)[p.show ? 'removeClass' : 'addClass']('hidden');
+                        }
+                    }
+                },
+                'hide_menu': function(p) {
+                    // Hide Bootstrap popover styled sub menus
+                    $.each(p.ref.submenus, function() {
+                        if (this.container.parents('.popover.show').length == 1) {
+                            var container = this.container.parents('.popover.show'),
+                                popup = $('.popover-body', container),
+                                button = popup.children().first().data('button');
+
+                            if (button && p.originalEvent.target != button && !$(button).find(p.originalEvent.target).length && typeof button !== 'string') {
+                                $(button).popover('hide');
+                            }
+
+                            if (!button) {
+                                $(container).remove();
+                            }
+                        }
+                    });
+                }
+            }
+        });
+
+        // Remove any tooltips added to menu elements by Elastic UI JS
+        rcmail.addEventListener('enable-command', function() { $('div.contextmenu').find('a.rcmbutton').removeAttr('title'); });
+
+        // Ensure menus are always hidden when opening a dialog box (#114)
+        rcmail.addEventListener('dialog-open', function() { rcmail.contextmenu.hide_all(event, false, true); });
+
+        if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#toolbar-menu > li'}); } );
+            rcmail.add_onload("rcmail.contextmenu.init_folder('#mailboxlist li', {'menu_source': ['#rcmfolder-menu > ul', '#mailboxoptions-menu > ul > li']})");
+        }
+        else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+            // on small screens the compose button is not visible so use rcm-active class to ensure it shows up in the menu
+            $('#taskmenu > span > a.compose').addClass('rcm-active');
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#taskmenu > span > a.compose', '#toolbar-menu > li'], 'list_object': 'contact_list'}); } );
+            rcmail.add_onload("rcmail.contextmenu.init_addressbook('#directorylist li, #savedsearchlist li', {'menu_source': '#groupoptions-menu > ul > li'})");
+            rcmail.addEventListener('group_insert', function(props) { rcmail.contextmenu.init_addressbook(props.li, {'menu_source': '#groupoptions-menu > ul > li'}); } );
+            rcmail.addEventListener('abook_search_insert', function(props) { rcmail.contextmenu.init_addressbook(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': '#groupoptions-menu > ul > li'}); } );
+        }
+        else if (rcmail.env.task == 'settings') {
+            rcmail.contextmenu.settings_menus([
+                {'obj': 'settings-menu li', 'props': {'menu_name': 'settingslist', 'menu_source': '#rcmsettings-menu > ul', 'init_func': 'init_settings'}},
+                {'obj': 'sections-table tr', 'props': {'menu_name': 'preferenceslist', 'menu_source': '#rcmsettings-menu > ul', 'list_object': 'sections_list'}},
+                {'obj': 'subscription-table li', 'props': {'menu_name': 'folderlist', 'menu_source': ['#rcmfolder-menu > ul', '#rcmsettings-menu > ul', '#toolbar-menu'], 'list_object': 'subscription_list', 'init_func': 'init_settings'}},
+                {'obj': 'identities-table tr', 'props': {'menu_name': 'identiteslist', 'menu_source': ['#rcmsettings-menu > ul', '#toolbar-menu'], 'list_object': 'identity_list'}},
+                {'obj': 'responses-table tr', 'props': {'menu_name': 'responseslist', 'menu_source': ['#rcmsettings-menu > ul', '#toolbar-menu'], 'list_object': 'responses_list'}},
+                {'obj': 'filtersetslist tr', 'props': {'menu_name': 'managesievesetlist', 'menu_source': ['#rcmsettings-menu > ul', '#filterset-menu > ul > li'], 'list_object': 'filtersets_list'}},
+                {'obj': 'filterslist tr', 'props': {'menu_name': 'managesieverulelist', 'menu_source': ['#rcmsettings-menu > ul', '#toolbar-menu'], 'list_object': 'filters_list'}},
+                {'obj': 'keys-table tr', 'props': {'menu_name': 'enigmakeylist', 'menu_source': ['#rcmsettings-menu > ul', '#toolbar-menu'], 'list_object': 'keys_list', 'list_id': 'keys-table'}}
+            ]);
+        }
+    }
+});
\ No newline at end of file
diff --git a/skins/elastic/includes/mail.html b/skins/elastic/includes/mail.html
new file mode 100644
index 0000000..4cf601d
--- /dev/null
+++ b/skins/elastic/includes/mail.html
@@ -0,0 +1,10 @@
+<roundcube:if condition="env:action == ''" />
+<div id="rcmfolder-menu" class="popupmenu">
+    <h3 id="aria-label-rcmfolder-menu" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
+    <ul class="menu listing" role="menu" aria-labelledby="aria-label-rcmfolder-menu">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.collapseall" prop="treelist" label="contextmenu.collapseall" class="collapseall disabled" classAct="collapseall active" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.expandall" prop="treelist" label="contextmenu.expandall" class="expandall disabled" classAct="expandall active" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openextwin" label="openinextwin" class="openextwin rcm-active disabled" classAct="openextwin rcm_active active" />
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/elastic/includes/settings.html b/skins/elastic/includes/settings.html
new file mode 100644
index 0000000..ace1843
--- /dev/null
+++ b/skins/elastic/includes/settings.html
@@ -0,0 +1,16 @@
+<div id="rcmsettings-menu" class="popupmenu">
+    <h3 id="aria-label-rcmsettings-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
+    <ul class="menu listing" role="menu" aria-labelledby="aria-label-rcmsettings-menu">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openinline" label="open" class="openinline rcm-active disabled" classAct="openinline rcm-active active" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openextwin" label="openinextwin" class="openextwin rcm-active disabled" classAct="openextwin rcm-active active" />
+    </ul>
+</div>
+<roundcube:if condition="env:action == 'folders'" />
+<div id="rcmfolder-menu" class="popupmenu">
+    <h3 id="aria-label-rcmfolder-menu" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
+    <ul class="menu listing" role="menu" aria-labelledby="aria-label-rcmfolder-menu">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.collapseall" prop="subscription_list" label="contextmenu.collapseall" class="collapseall disabled" classAct="collapseall active" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.expandall" prop="subscription_list" label="contextmenu.expandall" class="expandall disabled" classAct="expandall active" />
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/larry/contextmenu.css b/skins/larry/contextmenu.css
index 54ee77a..ad829ef 100644
--- a/skins/larry/contextmenu.css
+++ b/skins/larry/contextmenu.css
@@ -2,16 +2,19 @@
  * ContextMenu plugin styles
  */
 
-.records-table tbody tr.contextRow td
+.records-table tbody tr.context-source td
 {
   background-color: #F2F2F2;
 }
 
-#mailboxlist li.contextRow,
-#directorylist li.contextRow,
-#savedsearchlist li.contextRow,
-#addresslist .contextRow,
-#contacts-table .contextRow
+#mailboxlist li.context-source,
+#directorylist li.context-source,
+#savedsearchlist li.context-source,
+#settings-tabs li.context-source,
+#subscription-table li.context-source,
+#addresslist .context-source,
+#contacts-table .context-source,
+#settings-right table.listing tbody tr.context-source td
 {
   background-color: #C7E3EF;
 }
@@ -23,17 +26,17 @@ div.contextmenu a
   cursor: default;
 }
 
-div.contextmenu.rcmmainmenu ul.iconized li a span.icon
+div.contextmenu.rcm-mainmenu ul.iconized li a span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 20px;
 }
 
-div.contextmenu ul li.submenu a span.icon
+div.contextmenu ul li.rcm-submenu a span.icon
 {
   padding-right: 18px;
 }
 
-div.contextmenu ul.iconized li.submenu a span.right-arrow
+div.contextmenu ul.iconized li.rcm-submenu a span.sub-button
 {
   position: absolute;
   top: 5px;
@@ -44,7 +47,7 @@ div.contextmenu ul.iconized li.submenu a span.right-arrow
   opacity: 0.2;
 }
 
-div.contextmenu ul.iconized li.submenu a.active span.right-arrow
+div.contextmenu ul.iconized li.rcm-submenu a.active span.sub-button
 {
   opacity: 0.99;
 }
@@ -54,11 +57,7 @@ div.contextmenu ul.iconized li a.reply span.icon
   background-position: 0 -122px;
 }
 
-div.contextmenu ul.iconized li a.reply-all span.icon
-{
-  background: url(images/contexticons.png) no-repeat 0 -147px;
-}
-
+div.contextmenu ul.iconized li a.reply-all span.icon,
 div.contextmenu ul.iconized li a.replyalllink span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 -147px;
@@ -69,11 +68,7 @@ div.contextmenu ul.iconized li a.replylistlink span.icon
   background: url(images/contexticons.png) no-repeat 0 -464px;
 }
 
-div.contextmenu ul.iconized li a.forward span.icon
-{
-  background: url(images/contexticons.png) no-repeat 0 -169px;
-}
-
+div.contextmenu ul.iconized li a.forward span.icon,
 div.contextmenu ul.iconized li a.forwardlink span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 -169px;
@@ -84,11 +79,32 @@ div.contextmenu ul.iconized li a.forwardattachmentlink span.icon
   background: url(images/contexticons.png) no-repeat 0 -445px;
 }
 
-div.contextmenu ul.iconized li a.delete span.icon
+div.contextmenu ul.iconized li a.bouncelink span.icon
+{
+  background: url(images/contexticons.png) no-repeat 0 -760px;
+}
+
+div.contextmenu ul.iconized li a.delete span.icon,
+div.contextmenu ul.iconized li a.deletelink span.icon,
+div.contextmenu ul.iconized li a.cmd_group-delete span.icon,
+div.contextmenu ul.iconized li a.cmd_search-delete span.icon,
+div.contextmenu ul.iconized li a.cmd_delete-folder span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-del span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setdel span.icon
 {
   background-position: 0 -96px;
 }
 
+div.contextmenu ul.iconized li a.junk span.icon
+{
+  background-position: 0 -777px;
+}
+
+div.contextmenu ul.iconized li a.archive span.icon
+{
+  background-position: 0 -795px;
+}
+
 div.contextmenu ul.iconized li a.markmessage span.icon
 {
   background-position: 0 -670px;
@@ -131,15 +147,20 @@ div.contextmenu ul.iconized li a.cmd_purge span.icon
 
 div.contextmenu ul.iconized li a.collapseall span.icon
 {
-  background-position: 0 -326px;
+  background-position: 0 -305px;
 }
 
 div.contextmenu ul.iconized li a.expandall span.icon
 {
-  background-position: 0 -305px;
+  background-position: 0 -326px;
 }
 
-div.contextmenu ul.iconized li a.openfolder span.icon
+div.contextmenu ul.iconized li a.openinline span.icon
+{
+  background-position: 0 -813px;
+}
+
+div.contextmenu ul.iconized li a.openextwin span.icon
 {
   background-position: 0 -484px;
 }
@@ -153,7 +174,7 @@ div.contextmenu ul.iconized li a.addbcc span.icon
 
 div.contextmenu ul.iconized li a.vcard span.icon
 {
-  background-position: 0 -738px;
+  background: url(images/contexticons.png) no-repeat 0 -738px;
 }
 
 div.contextmenu ul.iconized li a.movecontact span.icon
@@ -166,7 +187,9 @@ div.contextmenu ul.iconized li a.copycontact span.icon
   background-position: 0 -651px;
 }
 
-div.contextmenu ul.iconized li a.export span.icon
+div.contextmenu ul.iconized li a.export span.icon,
+div.contextmenu ul.iconized li a.exportsellink span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setget span.icon
 {
   background: url(images/contexticons.png) no-repeat 0 -543px;
 }
@@ -176,14 +199,7 @@ div.contextmenu ul.iconized li a.exportalllink span.icon
   background: url(images/contexticons.png) no-repeat 0 -568px;
 }
 
-div.contextmenu ul.iconized li a.exportsellink span.icon
-{
-  background: url(images/contexticons.png) no-repeat 0 -543px;
-}
-
-
-div.contextmenu ul.iconized li a.cmd_group-create span.icon,
-div.contextmenu ul.iconized li a.assigngroup span.icon
+div.contextmenu ul.iconized li a.cmd_group-create span.icon
 {
   background-position: 0 -613px;
 }
@@ -193,44 +209,13 @@ div.contextmenu ul.iconized li a.cmd_group-rename span.icon
   background-position: 0 -591px;
 }
 
-div.contextmenu ul.iconized li a.cmd_group-delete span.icon
-{
-  background-position: 0 -96px;
-}
-
-div.contextmenu ul.iconized li a.cmd_search-delete span.icon
-{
-  background-position: 0 -96px;
-}
-
-/*** address book selector ***/
-
-#addressbook-selector,
-#addressgroup-selector
-{
-	z-index: 1000;
-}
-
-#addressbook-selector li a span,
-#addressgroup-selector li a span
-{
-  background: url(images/contexticons.png) no-repeat 0 20px;
-  display: block;
-  height: 17px;
-  min-height: 14px;
-  padding: 4px 4px 1px 28px;
-  overflow: hidden;
-  max-width: 120px;
-  text-overflow: ellipsis;
-}
-
-#addressbook-selector li a.addressbook span
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-setact span.icon,
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-act span.icon
 {
-	background-position: 0 -397px;
+  background-position: 0 -832px;
 }
 
-#addressbook-selector li a.contactgroup span,
-#addressgroup-selector li a.contactgroup span
+div.contextmenu ul.iconized li a.cmd_plugin-managesieve-seteditraw span.icon
 {
-	background-position: 0 -418px;
+  background-position: 0 -851px;
 }
\ No newline at end of file
diff --git a/skins/larry/functions.js b/skins/larry/functions.js
index db6c58f..b8a2d8c 100644
--- a/skins/larry/functions.js
+++ b/skins/larry/functions.js
@@ -4,7 +4,7 @@
  * @licstart  The following is the entire license notice for the
  * JavaScript code in this file.
  *
- * Copyright (C) 2014 Philip Weir
+ * Copyright (C) Philip Weir
  *
  * The JavaScript code in this page is free software: you can redistribute it
  * and/or modify it under the terms of the GNU General Public License
@@ -15,81 +15,54 @@
  * for the JavaScript code in this file.
  */
 
-rcube_webmail.prototype.context_menu_popup_pattern = /UI\.toggle_popup\(\'([^\']+)\'/;
-rcube_webmail.prototype.context_menu_button_active_class = new Array('active');
-rcube_webmail.prototype.context_menu_button_disabled_class = new Array('disabled');
+rcube_webmail.prototype.contextmenu.skin_funcs.compose_menu_text = function(p) {
+    var matches;
+    if (matches = $(p.item).children('a').attr('class').match(/\b(addto|addcc|addbcc|vcard)\b/)) {
+        $(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.' + matches[1]).attr('title'));
+    }
+};
 
-function add_menu_text(menu, p) {
-	if (menu == 'composeto') {
-		if ($(p.item).children('a').hasClass('addto')) {
-			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.addto').attr('title'));
-		}
-		else if ($(p.item).children('a').hasClass('addcc')) {
-			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.addcc').attr('title'));
-		}
-		else if ($(p.item).children('a').hasClass('addbcc')) {
-			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.addbcc').attr('title'));
-		}
-		else if ($(p.item).children('a').hasClass('vcard')) {
-			$(p.item).children('a').children('span').text($('#compose-contacts div.boxfooter a.vcard').attr('title'));
-		}
-	}
-	else if (menu == 'contactlist') {
-		if ($(p.item).children('a').hasClass('delete')) {
-			$(p.item).children('a').children('span').text($('#addresslist div.boxfooter a.delete').attr('title'));
-		}
-		else if ($(p.item).children('a').hasClass('removegroup')) {
-			$(p.item).children('a').children('span').text($('#addresslist div.boxfooter a.removegroup').attr('title'));
-		}
-	}
-}
-
-function reorder_contact_menu(p) {
-	// put export link last
-	var ul = p.ref.container.find('ul:first');
-	$(p.ref.container).find('a.export').parent('li').appendTo(ul);
-
-	// put assign group link before remove
-	$(p.ref.container).find('a.assigngroup').parent('li').insertBefore($(p.ref.container).find('a.removegroup').parent('li'));
-}
+rcube_webmail.prototype.contextmenu.skin_funcs.reorder_contact_menu = function(p) {
+    // put export and more submenus last
+    var ul = p.ref.container.find('ul').first();
+    p.ref.container.find('a.export').parent('li').appendTo(ul);
+    p.ref.container.find('a.more').parent('li').appendTo(ul);
+};
 
 $(document).ready(function() {
-	if (window.rcmail) {
-		if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
-			rcmail.add_onload("rcm_foldermenu_init('#mailboxlist li', {'menu_source': ['#rcmFolderMenu', '#mailboxoptionsmenu']})");
-		}
-		else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'composeto', 'menu_source': '#compose-contacts div.boxfooter', 'list_object': rcmail.contact_list}, {'insertitem': function(p) { add_menu_text('composeto', p); }}); } );
-		}
-		else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
-			rcmail.addEventListener('insertrow', function(props) { rcm_listmenu_init(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#addressbooktoolbar','#addresslist div.boxfooter a.delete','#addresslist div.boxfooter a.removegroup', '#rcmAddressBookMenu'], 'list_object': rcmail.contact_list}, {
-				'insertitem': function(p) { add_menu_text('contactlist', p); },
-				'init': function(p) { reorder_contact_menu(p); },
-				'afteractivate': function(p) {
-					p.ref.list_selection(false, rcmail.env.contextmenu_selection);
-
-					// count the number of groups in the current addressbook
-					if (!rcmail.env.group || rcmail.env.readonly)
-						p.ref.container.find('a.removegroup').removeClass('active').addClass('disabled');
-
-					var groupcount = 0;
-					if (!rcmail.env.readonly && rcmail.env.address_sources[rcmail.env.source] && rcmail.env.address_sources[rcmail.env.source].groups)
-						$.each(rcmail.env.contactgroups, function(){ if (this.source === rcmail.env.source) groupcount++ });
+    if (window.rcmail) {
+        $.extend(rcmail.contextmenu.settings, {
+            popup_pattern: /UI\.toggle_popup\(\x27([^\x27]+)\x27/
+        });
 
-					if (groupcount > 0)
-						p.ref.container.find('a.assigngroup').removeClass('disabled').addClass('active');
-					else
-						p.ref.container.find('a.assigngroup').removeClass('active').addClass('disabled');
-				},
-				'aftercommand': function(p) {
-					if ($(p.el).hasClass('active') && p.command == 'group-remove-selected')
-						rcmail.command('listgroup', {'source': rcmail.env.source, 'id': rcmail.env.group}, p.el);
-				}
-			}); } );
-			rcmail.add_onload("rcm_abookmenu_init('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}, {'insertitem': function(p) { add_menu_text('abooklist', p); }})");
-			rcmail.addEventListener('group_insert', function(props) { rcm_abookmenu_init(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
-			rcmail.addEventListener('abook_search_insert', function(props) { rcm_abookmenu_init(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
-		}
-	}
+        if (rcmail.env.task == 'mail' && rcmail.env.action == '') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'messagelist', 'menu_source': '#messagetoolbar'}); } );
+            rcmail.add_onload("rcmail.contextmenu.init_folder('#mailboxlist li', {'menu_source': ['#rcmfoldermenu', '#mailboxoptionsmenu']})");
+        }
+        else if (rcmail.env.task == 'mail' && rcmail.env.action == 'compose') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'composeto', 'menu_source': '#compose-contacts div.boxfooter', 'list_object': 'contact_list'}, {
+                'insertitem': function(p) { rcmail.contextmenu.skin_funcs.compose_menu_text(p); }
+            }); } );
+        }
+        else if (rcmail.env.task == 'addressbook' && rcmail.env.action == '') {
+            rcmail.addEventListener('insertrow', function(props) { rcmail.contextmenu.init_list(props.row.id, {'menu_name': 'contactlist', 'menu_source': ['#addressbooktoolbar', '#addresslist div.boxfooter a.delete'], 'list_object': 'contact_list'}, {
+                'init': function(p) { rcmail.contextmenu.skin_funcs.reorder_contact_menu(p); }
+            }); } );
+            rcmail.add_onload("rcmail.contextmenu.init_addressbook('#directorylist li, #savedsearchlist li', {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']})");
+            rcmail.addEventListener('group_insert', function(props) { rcmail.contextmenu.init_addressbook(props.li, {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
+            rcmail.addEventListener('abook_search_insert', function(props) { rcmail.init_addressbook(rcmail.savedsearchlist.get_item('S' + props.id), {'menu_source': ['#directorylist-footer', '#groupoptionsmenu']}); } );
+        }
+        else if (rcmail.env.task == 'settings') {
+            rcmail.contextmenu.settings_menus([
+                {'obj': 'settings-tabs > ul > li', 'props': {'menu_name': 'settingslist', 'menu_source': '#rcmsettings > ul', 'init_func': 'init_settings'}},
+                {'obj': 'sections-table tr', 'props': {'menu_name': 'preferenceslist', 'menu_source': '#rcmsettings > ul', 'list_object': 'sections_list'}},
+                {'obj': 'subscription-table li', 'props': {'menu_name': 'folderlist', 'menu_source': ['#rcmfoldermenu', '#rcmsettings > ul', '#mailboxoptionsmenu'], 'list_object': 'subscription_list', 'init_func': 'init_settings'}},
+                {'obj': 'identities-table tr', 'props': {'menu_name': 'identiteslist', 'menu_source': ['#rcmsettings > ul', '#identitieslist div.boxfooter a.delete'], 'list_object': 'identity_list'}},
+                {'obj': 'responses-table tr', 'props': {'menu_name': 'responseslist', 'menu_source': ['#rcmsettings > ul', '#responseslist div.boxfooter a.delete'], 'list_object': 'responses_list'}},
+                {'obj': 'filtersetslist tr', 'props': {'menu_name': 'managesievesetlist', 'menu_source': ['#rcmsettings > ul', '#filtersetmenu-menu'], 'list_object': 'filtersets_list'}},
+                {'obj': 'filterslist tr', 'props': {'menu_name': 'managesieverulelist', 'menu_source': ['#rcmsettings > ul', '#filtermenu-menu'], 'list_object': 'filters_list'}},
+                {'obj': 'keys-table tr', 'props': {'menu_name': 'enigmakeylist', 'menu_source': ['#rcmsettings > ul', '#keyoptions > ul', '#keystoolbar'], 'list_object': 'keys_list', 'list_id': 'keys-table'}}
+            ]);
+        }
+    }
 });
\ No newline at end of file
diff --git a/skins/larry/images/contexticons.png b/skins/larry/images/contexticons.png
index 217ec03..6b7ac11 100644
Binary files a/skins/larry/images/contexticons.png and b/skins/larry/images/contexticons.png differ
diff --git a/skins/larry/includes/mail.html b/skins/larry/includes/mail.html
new file mode 100644
index 0000000..f6a5e58
--- /dev/null
+++ b/skins/larry/includes/mail.html
@@ -0,0 +1,10 @@
+<roundcube:if condition="env:action == ''" />
+<div id="rcmfolder" class="popupmenu">
+    <h3 id="aria-label-rcmfolder" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
+    <ul id="rcmfoldermenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-rcmfolder">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.collapseall" prop="treelist" label="contextmenu.collapseall" classAct="collapseall active" class="collapseall" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.expandall" prop="treelist" label="contextmenu.expandall" classAct="expandall active" class="expandall" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openextwin" label="openinextwin" class="openextwin rcm-active" />
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file
diff --git a/skins/larry/includes/settings.html b/skins/larry/includes/settings.html
new file mode 100644
index 0000000..2688ea0
--- /dev/null
+++ b/skins/larry/includes/settings.html
@@ -0,0 +1,16 @@
+<div id="rcmsettings" class="popupmenu">
+    <h3 id="aria-label-rcmsettings" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
+    <ul id="rcmsettingsmenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-rcmsettings">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openinline" label="open" class="openinline rcm-active" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.openextwin" label="openinextwin" class="openextwin rcm-active" />
+    </ul>
+</div>
+<roundcube:if condition="env:action == 'folders'" />
+<div id="rcmfolder" class="popupmenu">
+    <h3 id="aria-label-rcmfolder" class="voice"><roundcube:label name="arialabelmailboxmenu" /></h3>
+    <ul id="rcmfoldermenu" class="toolbarmenu" role="menu" aria-labelledby="aria-label-rcmfolder">
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.collapseall" prop="subscription_list" label="contextmenu.collapseall" classAct="collapseall active" class="collapseall" />
+        <roundcube:button type="link-menuitem" command="plugin.contextmenu.expandall" prop="subscription_list" label="contextmenu.expandall" classAct="expandall active" class="expandall" />
+    </ul>
+</div>
+<roundcube:endif />
\ No newline at end of file

Places

File HEAD.patch of Package roundcubemail-plugin-contextmenu (Revision d1d1cf6a0c39ef1d0cd21618bf4a86d7)

Places