diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index 6336f43ba..9a7788887 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -33,7 +33,7 @@
 <div class="list listbox">
 	<div class="header">
 		<a class="button icon back-content-button" href="#content" data-hidden="big"><span class="inner"><roundcube:label name="back" /></span></a>
-		<span class="header-title"><roundcube:label name="composeoptions" /></span>
+		<span class="header-title"><roundcube:label name="optionsandattachments" /></span>
 	</div>
 	<div class="scroller">
 		<!-- compose options -->
@@ -99,7 +99,7 @@
 		<!-- toolbar -->
 		<div id="messagetoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
 			<a class="button settings" href="#options" onclick="UI.show_list(true)" data-hidden="big">
-				<span class="inner"><roundcube:label name="composeoptions"></span>
+				<span class="inner"><roundcube:label name="optionsandattachments"></span>
 			</a>
 			<a class="button addressbook" href="#contacts" onclick="UI.show_sidebar()" data-hidden="big">
 				<span class="inner"><roundcube:label name="contacts"></span>