diff --git a/CHANGELOG b/CHANGELOG
index 49996f048..19c553bb1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -40,6 +40,7 @@ CHANGELOG Roundcube Webmail
 - Elastic: Improved UX of search dialogs (#6416)
 - Elastic: Fix unwanted thread expanding when selecting a collapsed thread in non-mobile mode (#6445)
 - Elastic: Add "status bar" for mobile in mail composer
+- Elastic: Add selection options on contacts list (#6595)
 - Log errors caused by low pcre.backtrack_limit when sending a mail message (#6433)
 - Fix so max_message_size limit is checked also when forwarding messages as attachments (#6580)
 - Fix so performance stats are logged to the main console log also when per_user_logging=true
diff --git a/program/js/app.js b/program/js/app.js
index adfa82549..bb32f601c 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -1116,16 +1116,17 @@ function rcube_webmail()
       case 'select-all':
         this.select_all_mode = props ? false : true;
         this.dummy_select = true; // prevent msg opening if there's only one msg on the list
+        var list = this[this.task == 'addressbook' ? 'contact_list' : 'message_list'];
         if (props == 'invert')
-          this.message_list.invert_selection();
+          list.invert_selection();
         else
-          this.message_list.select_all(props == 'page' ? '' : props);
+          list.select_all(props == 'page' ? '' : props);
         this.dummy_select = null;
         break;
 
       case 'select-none':
         this.select_all_mode = false;
-        this.message_list.clear_selection();
+        this[this.task == 'addressbook' ? 'contact_list' : 'message_list'].clear_selection();
         break;
 
       case 'expand-all':
@@ -9216,7 +9217,7 @@ function rcube_webmail()
           var list = this.contact_list,
             uid = this.env.list_uid;
 
-          this.enable_command('export', (list && list.rowcount > 0));
+          this.enable_command('export', 'select-all', 'select-none', (list && list.rowcount > 0));
 
           if (response.action == 'list' || response.action == 'search') {
             this.enable_command('search-create', this.env.source == '');
diff --git a/skins/elastic/templates/addressbook.html b/skins/elastic/templates/addressbook.html
index 197fad65e..558a9446e 100644
--- a/skins/elastic/templates/addressbook.html
+++ b/skins/elastic/templates/addressbook.html
@@ -24,6 +24,10 @@
 		<a class="button icon menu-button" href="#menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 		<a class="button icon back-sidebar-button folders" href="#sidebar"><span class="inner"><roundcube:label name="groups" /></span></a>
 		<roundcube:object name="addresslisttitle" label="contacts" tag="span" class="header-title" />
+		<div class="toolbar" role="toolbar">
+			<a href="#select" class="button select disabled" data-popup="listselect-menu" data-toggle-button="list-toggle-button" title="<roundcube:label name="select" />"><span class="inner"><roundcube:label name="select" /></span></a>
+			<roundcube:container name="listcontrols" id="listcontrols" />
+		</div>
 		<a class="button icon toolbar-menu-button" href="#list-menu"><span class="inner"><roundcube:label name="menu" /></span></a>
 	</div>
 	<roundcube:object name="searchform" id="searchform" wrapper="searchbar toolbar"
@@ -118,6 +122,18 @@
 	</ul>
 </div>
 
+<div id="listselect-menu" class="popupmenu">
+	<h3 id="aria-label-listselect-menu" class="voice"><roundcube:label name="arialabellistselectmenu" /></h3>
+	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-listselect-menu">
+		<roundcube:button type="link-menuitem" label="selection" class="selection" classAct="selection active"
+			name="list-toggle-button" id="list-toggle-button"
+			onclick="if ($(this).is('.active')) $('#contacts-table').toggleClass('withselection');" />
+		<roundcube:button command="select-all" type="link-menuitem" prop="page" label="currpage" class="select page" classAct="select page active" />
+		<roundcube:button command="select-all" type="link-menuitem" prop="invert" label="invert" class="select invert" classAct="select invert active" />
+		<roundcube:button command="select-none" type="link-menuitem" label="none" class="select none" classAct="select none active" />
+	</ul>
+</div>
+
 <div id="dragcontact-menu" class="popupmenu">
 	<h3 id="aria-label-dragcontact-menu" class="voice"><roundcube:label name="arialabeldropactionmenu" /></h3>
 	<ul class="toolbarmenu listing" role="menu" aria-labelledby="aria-label-dragcontact-menu">