diff --git a/skins/elastic/templates/compose.html b/skins/elastic/templates/compose.html
index e37ab50bd..663c041e7 100644
--- a/skins/elastic/templates/compose.html
+++ b/skins/elastic/templates/compose.html
@@ -105,7 +105,7 @@
 				<span class="inner"><roundcube:label name="contacts"></span>
 			</a>
 			<roundcube:button command="savedraft" type="link" class="button save draft disabled" classAct="button save draft"
-				label="save" title="savemessage" tabindex="2" innerclass="inner" />
+				label="save" title="savemessage" tabindex="2" innerclass="inner" data-content-button="true" />
 			<span class="spacer"></span>
 			<roundcube:button name="addattachment" type="link" class="button attach"
 				label="attach" title="addattachment" onclick="rcmail.upload_input('uploadform')"
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 0db4478a4..015111d00 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -152,7 +152,7 @@ function rcube_elastic_ui()
         // Move some buttons to the frame footer toolbar
         $('a[data-content-button]').each(function() {
             var target = $(this),
-                target_id = target.attr('id')
+                target_id = target.attr('id'),
                 button_id = target_id + '-clone';
 
             content_buttons.push(create_cloned_button(target));
@@ -164,7 +164,7 @@ function rcube_elastic_ui()
         // Move form buttons from the content frame into the frame footer (on parent window)
         // TODO: Active button state
         $('.formbuttons').children().each(function() {
-            var target = $(this), btn_class = target[0].className;
+            var target = $(this);
 
             // skip non-content buttons
             if (!is_framed && !target.parents('.content').length) {
@@ -176,8 +176,6 @@ function rcube_elastic_ui()
                 return;
             }
 
-            btn_class = $.trim(btn_class.replace(/btn(-[a-z+]+)?/g, '')) + ' button';
-
             content_buttons.push(create_cloned_button(target, true));
         });