diff --git a/skins/elastic/styles/layout.less b/skins/elastic/styles/layout.less
index 67cf91af9..15ff3754a 100644
--- a/skins/elastic/styles/layout.less
+++ b/skins/elastic/styles/layout.less
@@ -238,7 +238,7 @@ html.iframe body {
     }
 
     body > #layout > div > .header {
-        &.with-search {
+        &.with-search:not(.no-toolbar) {
             .searchfilterbar {
                 right: (@layout-touch-icon-width * 2);
             }
diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index 86d461e30..4118a1a6e 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -5,7 +5,7 @@
 
 <!-- inline address book -->
 <div class="sidebar listbox" role="region" aria-labelledby="aria-label-composecontacts">
-	<div class="header">
+	<div class="header no-toolbar">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
 		<span id="aria-label-composecontacts" class="header-title"><roundcube:label name="contacts" /></span>
 		<roundcube:object name="searchform" id="searchform" wrapper="searchbar toolbar"
@@ -98,7 +98,7 @@
 		<span class="header-title"><roundcube:label name="compose" /></span>
 		<!-- toolbar -->
 		<div id="messagetoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
-			<a class="button settings" href="#options" onclick="UI.show_list()" data-hidden="big">
+			<a class="button settings" href="#options" onclick="UI.show_list(true)" data-hidden="big">
 				<span class="inner"><roundcube:label name="composeoptions"></span>
 			</a>
 			<a class="button addressbook" href="#contacts" onclick="UI.show_sidebar()" data-hidden="big">
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index dcd8f57b0..ce9e77a6a 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -941,7 +941,7 @@ function rcube_elastic_ui()
         screen_resize_headers();
     };
 
-    function show_list()
+    function show_list(scroll)
     {
         if (!layout.list.length && !layout.sidebar.length) {
             history.back();
@@ -954,6 +954,10 @@ function rcube_elastic_ui()
             if (mode == 'small' || mode == 'phone') {
                 hide_content();
             }
+
+            if (scroll) {
+                layout.list.children('.scroller').scrollTop(0);
+            }
         }
 
         screen_resize_headers();