restore details button to toggle headers in message view

skins/elastic/styles/styles.less

@@ -205,15 +205,10 @@ body.task-error-login #layout {
             display: flex;
         }
 
-        div.header-toggle > a {
-            margin: 0 !important;
-        }
-
         div.header-subject > span {
             display: inline-block;
         }
 
-        div.header-toggle,
         div.header-links {
             a {
                 font-size: 90%;

skins/elastic/templates/message.html

@@ -28,11 +28,6 @@
 				<roundcube:object name="contactphoto" class="contactphoto" placeholder="/images/contactpic.svg" />
 				<div class="header-content">
 					<div class="header-envelope">
-						<div class="header-toggle">
-							<roundcube:add_label name="details" />
-							<roundcube:add_label name="summary" />
-							<a href="#headers" onclick="return UI.headers_show(true)"></a>
-						</div>
 						<roundcube:object name="messageSummary" addicon="virtual" class="header-subject" />
 						<div class="message-partheaders">
 							<roundcube:object name="messageHeaders" class="headers-table" addicon="virtual" exclude="subject" max="10" />
@@ -40,6 +35,9 @@
 						</div>
 					</div>
 					<div class="header-links">
+						<roundcube:add_label name="details" />
+						<roundcube:add_label name="summary" />
+						<a href="#headers" data-toggle="headers" onclick="return UI.headers_show(true)"></a>
 						<roundcube:add_label name="arialabelmessageheaders" />
 						<roundcube:if condition="env:optional_format=='text'" />
 							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"

skins/elastic/ui.js

@@ -2703,7 +2703,7 @@ function rcube_elastic_ui()
             css = 'headers-' + (show ? 'summary' : 'details'),
             headers = $('div.header-content');
 
-        $('div.header-toggle > a').removeClass().addClass(css).attr('title', label);
+        $("div.header-links > a[data-toggle='headers']").removeClass().addClass(css).text(label);
         headers[show ? 'addClass' : 'removeClass']('details-view');
 
         if (toggle) {