diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bf4afd59c2..e72bcca44b 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -455,6 +455,19 @@ div.mail-compose_fileselector {
 	margin-left: 1em;
 }
 .previewWrapper {height: 100%}
+
+.previewWrapper .et2_details.et2_details_expanded .et2_details_wrapper {
+	display: block;
+	position: absolute;
+	top: 4em;
+	box-shadow: 1px 1px 2px 1px silver;
+	width: calc(100% - 6em);
+	padding: 1em;
+	background: white;
+	max-height: 12em;
+	overflow-y: auto;
+}
+
 #mail-index_mailPreview .th {display: none}
 
 #mail-index_mailPreview > div, #mail-index_mailPreview > * {
@@ -659,6 +672,7 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 
 .mailPreviewHeaders {
     font-size: 0.875rem;
+	position: relative;
 }
 
 .mailPreviewHeaders :first-child, .mailDisplayHeaders :first-child {
@@ -1017,3 +1031,8 @@ div#mail-index_nm.splitter-pane {min-height: 100px;}
 	padding: 0px;
 }
 #mail-index_nm tbody tr et2-lavatar {max-width: 3.7em; min-width:3.7em !important;}
+
+.previewWrapper .firstColumnTitle {
+	width: 3em;
+	text-align: end;
+}
\ No newline at end of file
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index bc64f3ba86..e42a7fc0c2 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -24,7 +24,7 @@
 				<vbox class="previewWrapper">
 					<details class="details" title="details" toggle_align="left">
 							<hbox  disabled="!@from">
-                                <description value="From"/>
+                                <description value="From" class="firstColumnTitle"/>
                                 <grid id="from">
                                     <columns>
                                         <column/>
@@ -37,7 +37,7 @@
                                 </grid>
                             </hbox>
                             <hbox disabled="!@sender">
-                                <description value="Sender"/>
+                                <description value="Sender" class="firstColumnTitle"/>
                                 <grid id="sender">
                                     <columns>
                                         <column/>
@@ -50,7 +50,7 @@
                                 </grid>
                             </hbox>
                             <hbox disabled="!@to">
-                                <description value="To"/>
+                                <description value="To" class="firstColumnTitle"/>
                                 <grid id="to">
                                     <columns>
                                         <column/>
@@ -63,7 +63,7 @@
                                 </grid>
                             </hbox>
                             <hbox disabled="!@cc">
-                                <description value="Cc"/>
+                                <description value="Cc" class="firstColumnTitle"/>
                                 <grid id="cc">
                                     <columns>
                                         <column/>
@@ -76,7 +76,7 @@
                                 </grid>
                             </hbox>
                             <hbox disabled="!@bcc">
-                                <description value="Bcc"/>
+                                <description value="Bcc" class="firstColumnTitle"/>
                                 <grid id="bcc">
                                     <columns>
                                         <column/>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 0177eb40fb..e2fa5914e0 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -42,7 +42,7 @@
                                 <vbox>
                                     <details class="details" title="details" toggle_align="left">
                                         <hbox>
-                                            <description value="From"/>
+                                            <description value="From" class="firstColumnTitle"/>
                                             <grid id="additionalfromaddress">
                                                 <columns>
                                                     <column/>
@@ -55,7 +55,7 @@
                                             </grid>
                                         </hbox>
                                         <hbox disabled="!@toaddress" width="100%">
-                                            <description value="To"/>
+                                            <description value="To" class="firstColumnTitle"/>
                                             <grid id="additionaltoaddress">
                                                 <columns>
                                                     <column/>
@@ -68,7 +68,7 @@
                                             </grid>
                                         </hbox>
                                         <hbox disabled="!@ccaddress"  width="100%">
-                                            <description value="Cc"/>
+                                            <description value="Cc" class="firstColumnTitle"/>
                                             <grid id="ccaddress">
                                                 <columns>
                                                     <column/>
@@ -103,10 +103,10 @@
                                                     <description id="${row}[winmailFlag]" />
                                                     <description class="et2_link useEllipsis" id="${row}[filename]" no_lang="1" expose_view="true" mime="$row_cont[type]" mime_data="$row_cont[mime_data]" href="$row_cont[mime_url]"/>
                                                     <description align="right" id="${row}[size]"/>
-                                                    <buttononly id="${row}[save]" image="fileexport" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})"/>
-                                                    <buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})"/>
-                                                    <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})"/>
-                                                    <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" label="Save as Zip"/>
+                                                    <buttononly id="${row}[save]" image="fileexport" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'downloadOneAsFile', ${row})" statustext="Download as file"/>
+                                                    <buttononly id="${row}[saveAsVFS]" image="filemanager/navbar" readonly="false" onclick="app.mail.saveAttachmentHandler(widget,'saveOneToVfs', ${row})" statustext="Save to Filemanager"/>
+                                                    <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_all]" image="mail/save_all" onclick="app.mail.saveAttachmentHandler(widget,'saveAllToVfs', ${row})" statustext="Save all"/>
+                                                    <buttononly class="$row_cont[classSaveAllPossiblyDisabled]" readonly="false" id="${row}[save_zip]" image="mail/save_zip" onclick="app.mail.saveAttachmentHandler(widget,'downloadAllToZip', ${row})" statustext="Save as Zip"/>
                                                 </row>
                                             </rows>
                                         </grid>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index c9d32cdff3..a8510022ed 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -454,6 +454,17 @@ div.mail-compose_fileselector {
 .previewWrapper {
   height: 100%;
 }
+.previewWrapper .et2_details.et2_details_expanded .et2_details_wrapper {
+  display: block;
+  position: absolute;
+  top: 4em;
+  box-shadow: 1px 1px 2px 1px silver;
+  width: calc(100% - 6em);
+  padding: 1em;
+  background: white;
+  max-height: 12em;
+  overflow-y: auto;
+}
 #mail-index_mailPreview .th {
   display: none;
 }
@@ -653,6 +664,7 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 }
 .mailPreviewHeaders {
   font-size: 0.875rem;
+  position: relative;
 }
 .mailPreviewHeaders :first-child,
 .mailDisplayHeaders :first-child {
@@ -987,6 +999,10 @@ div#mail-index_nm.splitter-pane {
   max-width: 3.7em;
   min-width: 3.7em !important;
 }
+.previewWrapper .firstColumnTitle {
+  width: 3em;
+  text-align: end;
+}
 #popupMainDiv {
   height: 99%;
   padding: 5px;