diff --git a/skins/elastic/styles/widgets/mail.less b/skins/elastic/styles/widgets/mail.less
index 7fc943c40..cefeed58b 100644
--- a/skins/elastic/styles/widgets/mail.less
+++ b/skins/elastic/styles/widgets/mail.less
@@ -57,8 +57,9 @@
             a {
                 color: #aaa;
                 font-size: 90%;
-                padding-right: .25rem;
+                margin-right: .5rem;
                 text-decoration: none;
+                white-space: nowrap;
 
                 &:before {
                     &:extend(.font-icon-class);
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index b8e642cf8..049c2a03c 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -31,7 +31,7 @@
 						<roundcube:add_label name="arialabelmessageheaders" />
 						<roundcube:if condition="!env:message_context">
 							<roundcube:button command="extwin" type="link" class="extwin" innerClass="inner"
-								title="openinextwin" label="openinextwin" data-hidden="small" />
+								label="openinextwin" data-hidden="small" />
 						<roundcube:endif />
 						<roundcube:if condition="env:optional_format=='text'" />
 							<roundcube:button command="change-format" prop="text" type="link" class="plain" innerClass="inner"