Get rid of Back button in mail compose, use Mail button in task menu

skins/elastic/templates/compose.html

@@ -98,13 +98,6 @@
 		<span class="header-title"><roundcube:label name="compose" /></span>
 		<!-- toolbar -->
 		<div id="messagetoolbar" class="toolbar" role="toolbar" aria-labelledby="aria-label-toolbar">
-<!--
-			<roundcube:button command="list" type="link" class="button back disabled" classAct="button back"
-				label="cancel" condition="!env:extwin" tabindex="2" innerclass="inner" />
-			<roundcube:button command="close" type="link" class="button closewin disabled" classAct="button closewin"
-				label="cancel" condition="env:extwin" tabindex="2" innerclass="inner" />
-			<span class="spacer"></span>
--->
 			<a class="button settings" href="#options" onclick="UI.show_list()" data-hidden="big">
 				<span class="inner"><roundcube:label name="composeoptions"></span>
 			</a>

skins/elastic/ui.js

@@ -391,6 +391,12 @@ function rcube_elastic_ui()
         rcmail.addEventListener('fileappended', function(e) { if (e.attachment.complete) attachmentmenu_append(e.item); });
 
         rcmail.init_pagejumper('.pagenav > input');
+
+        // In compose window we do not provide "Back' button, instead
+        // we modify the Mail button in the task menu to act like it (i.e. calls 'list' command)
+        if (rcmail.task == 'mail' && rcmail.env.action == 'compose' && !rcmail.env.extwin) {
+            $('a.button.mail', layout.menu).attr('onclick', "return rcmail.command('list','',this,event)");
+        }
     };
 
     /**