diff --git a/skins/elastic/styles/widgets/toolbar.less b/skins/elastic/styles/widgets/toolbar.less
index 6657fa257..6d87ee89a 100644
--- a/skins/elastic/styles/widgets/toolbar.less
+++ b/skins/elastic/styles/widgets/toolbar.less
@@ -591,6 +591,12 @@
     a.vcard:before {
         content: @fa-var-paperclip;
     }
+    a.encrypt:before {
+        content: @fa-var-lock;
+    }
+    a.encrypt.sign:before {
+        content: @fa-var-lock; // TODO
+    }
 }
 
 .toolbarmenu.listing li {
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index 642ed216e..5028a2232 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -136,9 +136,14 @@
 				</a>
 			</span>
 			<roundcube:endif />
-			<roundcube:button command="compose-encrypted" type="link" class="button encrypt disabled"
-				classAct="button encrypt" classSel="button encrypt selected" innerclass="inner"
-				label="encrypt" title="encryptmessagemailvelope" tabindex="2" style="display:none" />
+			<span class="dropbutton" style="display:none">
+				<roundcube:button command="compose-encrypted" type="link" class="button encrypt disabled"
+					classAct="button encrypt" classSel="button encrypt selected" innerclass="inner"
+					label="encrypt" title="encryptmessagemailvelope" tabindex="2" />
+				<a href="#encryption" id="encryption-menu-button" class="button dropdown" tabindex="2" data-popup="encryption-menu">
+					<span class="inner"><roundcube:label name="encryptmessagemailvelope" /></span>
+				</a>
+			</span>
 			<roundcube:container name="toolbar" id="compose-toolbar" />
 		</div>
 	</div>
@@ -269,4 +274,11 @@
 	</ul>
 </div>
 
+<div id="encryption-menu" class="popupmenu">
+	<ul class="toolbarmenu listing" role="menu">
+		<roundcube:button command="compose-encrypted" type="link-menuitem" label="encryptmessage" class="encrypt" classAct="encrypt active" />
+		<roundcube:button command="compose-encrypted-signed" type="link-menuitem" label="encryptandsign" class="encrypt sign" classAct="encrypt sign active" />
+	</ul>
+</div>
+
 <roundcube:include file="includes/footer.html" />
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index ebbee61de..7d944e5f6 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -1164,10 +1164,15 @@ function rcube_elastic_ui()
             case 'compose-encrypted':
                 // show the toolbar button for Mailvelope
                 if (args.status) {
-                    $('a.button.encrypt').show();
+                    $('a.button.encrypt').parent().show();
                 }
                 break;
 
+            case 'compose-encrypted-signed':
+                // enable selector for encrypt and sign
+                $('#encryption-menu-button').show();
+                break;
+
             case 'mark':
                 // show the toolbar button for Mailvelope
                 $('a.button.markmessage')[args.status ? 'removeClass' : 'addClass']('disabled');