diff --git a/skins/elastic/styles.css b/skins/elastic/styles.css
index 80c40782b..0cafc914e 100644
--- a/skins/elastic/styles.css
+++ b/skins/elastic/styles.css
@@ -73,6 +73,7 @@ body:not(.iframe) > *:not(#layout),
 body > #layout > div > .header > a.back-list-button,
 body > #layout > div > .header > a.back-sidebar-button,
 body > #layout > div > .header > .buttons,
+body > #layout > div > .header > a.toolbar-menu-button,
 body > #layout > div > .header > a.menu-button {
 	display: none;
 }
diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index b4ce62a43..8e9d3092d 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -86,6 +86,7 @@
 <!-- message preview -->
 <div id="content" class="content">
 	<div class="header">
+		<a class="button back-list-button" href="#back"><i class="chevron left icon"></i><roundcube:label name="back" /></a>
 		<roundcube:include file="/includes/mail-menu.html" />
 	</div>
 	<h2 id="aria-label-mailpreviewframe" class="voice"><roundcube:label name="arialabelmailpreviewframe" /></h2>
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 64b113a05..850f54bcb 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -127,11 +127,16 @@ function rcube_elastic_ui()
     // TODO: Active button state
     var form_buttons = [];
     $('.formbuttons').children(':not(.cancel)').each(function() {
+        // skip non-content buttons
+        if (!rcmail.is_framed() && !this.parents('.content').length) {
+            return;
+        }
+
         var target = this, button = $(this).clone();
 
         form_buttons.push(
             button.attr({'onclick': '', disabled: false, id: button.attr('id') + '-clone'})
-                .data('target', this)
+                .data('target', target)
                 .on('click', function(e) { $(target).click(); })
         );
     });