diff --git a/skins/elastic/templates/mail.html b/skins/elastic/templates/mail.html
index 98b535e5a..15940d497 100644
--- a/skins/elastic/templates/mail.html
+++ b/skins/elastic/templates/mail.html
@@ -52,9 +52,9 @@
 			<roundcube:if condition="env:threads" />
 				<a href="#threads" class="button threads" data-popup="threadselect-menu" title="<roundcube:label name="threads" />"><span class="inner"><roundcube:label name="threads" /></span></a>
 			<roundcube:endif />
-			<roundcube:object name="listmenulink" class="button settings" innerclass="inner" />
+			<roundcube:object name="listmenulink" class="button settings" label="options" innerclass="inner" />
+			<roundcube:container name="listcontrols" id="listcontrols" />
 		</div>
-		<roundcube:container name="listcontrols" id="listcontrols" />
 	</div>
 </div>