diff --git a/skins/elastic/styles/widgets/mail.less b/skins/elastic/styles/widgets/mail.less
index 5ce2e22db..f944388ae 100644
--- a/skins/elastic/styles/widgets/mail.less
+++ b/skins/elastic/styles/widgets/mail.less
@@ -44,26 +44,26 @@
             line-height: @mail-header-photo-height/2;
 
             & > span {
-                line-height: normal;
+                line-height: 1.5;
                 display: inline-block;
                 vertical-align: middle;
             }
         }
 
         div.header-links {
-            line-height: @mail-header-photo-height/2;
-
             a {
                 color: #aaa;
                 font-size: 90%;
                 margin-right: .5rem;
                 text-decoration: none;
                 white-space: nowrap;
+                line-height: 1.5;
+                display: inline-block;
 
                 &:before {
                     &:extend(.font-icon-class);
+                    display: inline-block;
                     float: none;
-                    display: inline;
                 }
 
                 &.extwin:before {
@@ -85,6 +85,10 @@
                 &.plain:before {
                     content: @fa-var-align-justify;
                 }
+
+                &.zipdownload:before {
+                    content: @fa-var-download;
+                }
             }
         }
 
diff --git a/skins/elastic/templates/message.html b/skins/elastic/templates/message.html
index 5e939202c..2cf00ef0b 100644
--- a/skins/elastic/templates/message.html
+++ b/skins/elastic/templates/message.html
@@ -44,6 +44,7 @@
 							<roundcube:button command="change-format" prop="html" type="link" class="html" innerClass="inner"
 								title="changeformathtml" label="htmltoggle" />
 						<roundcube:endif />
+						<roundcube:container name="headerlinks" id="header-links" />
 					</div>
 				</div>
 			</div>
diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js
index 3b4ecc164..b0f97f400 100644
--- a/skins/elastic/ui.js
+++ b/skins/elastic/ui.js
@@ -283,6 +283,9 @@ function rcube_elastic_ui()
                 }
             });
         }
+
+        // move "Download all attachments" button into a better location
+        $('#attachment-list + a.zipdownload').appendTo('.header-links');
     };
 
     /**