diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 33ba398a50..a409d10029 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -481,21 +481,16 @@ div.mail-compose_fileselector {
 	margin-bottom: 1em;
 	font-size: 1.2em;
 }
-et2-details.details::part(summary) {
+et2-details.details::part(summary),
+et2-details.attachments::part(summary){
 	padding-left: 1em;
 }
 
-et2-details.attachments::part(header) {
-	padding-left: 0px;
-}
 .mailDisplay et2-details::part(base),
 .previewWrapper et2-details::part(base){
 	border: none;
 }
-et2-details.attachments::part(content) {
-	padding-left: 0px;
-}
-
+.mailPreviewHeaders et2-details::part(header) {padding: 0;}
 #mail-index_mailPreview .et2_email > span {
     display: inline;
 }
@@ -681,10 +676,11 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 }
 
 .mailPreviewHeaders :first-child, .mailDisplayHeaders :first-child {
-    flex: 0 0 auto;
-	color: #7a7a7a;
+   color: #7a7a7a;
+}
+.mailPreviewHeaders et2-lavatar {
+	flex: 0 0 auto;
 }
-
 div.mailPreviewHeaders div.mail_extraEmails {
     display: inline-block;
     max-height: 1.3em;
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index bfd7e775f8..1308f79f4a 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -53,59 +53,58 @@
                                             <et2-select-email id="ccaddress" readonly="true"></et2-select-email>
                                         </hbox>
                                     </et2-details>
+                                    <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
+                                        <hbox slot="summary">
+                                            <grid class="previewAttachmentArea egwGridView_grid" >
+                                                <columns>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column disabled="!@showtempname"/>
+                                                    <column width="70%" />
+                                                    <column width="11%" />
+                                                    <column width="10%"/>
+                                                </columns>
+                                                <rows>
+                                                    <row class="row attachmentRow">
+                                                        <description id="attachmentsBlock[0][attachment_number]" />
+                                                        <description id="attachmentsBlock[0][partID]" />
+                                                        <description id="attachmentsBlock[0][type]" />
+                                                        <description id="attachmentsBlock[0][winmailFlag]" />
+                                                        <description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="attachmentsBlock[0][mime_data]" href="attachmentsBlock[0][mime_url]"/>
+                                                        <description align="right" id="attachmentsBlock[0][size]"/>
+                                                    </row>
+                                                </rows>
+                                            </grid>
+                                        </hbox>
+
+                                        <grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
+                                            <columns>
+                                                <column disabled="!@showtempname"/>
+                                                <column disabled="!@showtempname"/>
+                                                <column disabled="!@showtempname"/>
+                                                <column disabled="!@showtempname"/>
+                                                <column width="70%" />
+                                                <column width="11%" />
+                                                <column width="10%"/>
+                                            </columns>
+                                            <rows>
+                                                <row class="row attachmentRow" id="${row}">
+                                                    <description id="${row}[attachment_number]" />
+                                                    <description id="${row}[partID]" />
+                                                    <description id="${row}[type]" />
+                                                    <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]"/>
+                                                    <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
+                                                </row>
+                                            </rows>
+                                        </grid>
+                                    </et2-details>
                                 </vbox>
                                 <date-time-today align="right" id="date" readonly="true"/>
                             </hbox>
-                        <hbox>
-                            <et2-details  title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
-                                <hbox slot="summary">
-                                    <grid class="previewAttachmentArea egwGridView_grid" >
-                                        <columns>
-                                            <column disabled="!@showtempname"/>
-                                            <column disabled="!@showtempname"/>
-                                            <column disabled="!@showtempname"/>
-                                            <column disabled="!@showtempname"/>
-                                            <column width="70%" />
-                                            <column width="11%" />
-                                            <column width="10%"/>
-                                        </columns>
-                                        <rows>
-                                            <row class="row attachmentRow">
-                                                <description id="attachmentsBlock[0][attachment_number]" />
-                                                <description id="attachmentsBlock[0][partID]" />
-                                                <description id="attachmentsBlock[0][type]" />
-                                                <description id="attachmentsBlock[0][winmailFlag]" />
-                                                <description class="et2_link useEllipsis" id="attachmentsBlock[0][filename]" no_lang="1" expose_view="true" mime="0[type]" mime_data="attachmentsBlock[0][mime_data]" href="attachmentsBlock[0][mime_url]"/>
-                                                <description align="right" id="attachmentsBlock[0][size]"/>
-                                            </row>
-                                        </rows>
-                                    </grid>
-                                </hbox>
 
-                                <grid id="attachmentsBlock" class="previewAttachmentArea egwGridView_grid">
-                                    <columns>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column disabled="!@showtempname"/>
-                                        <column width="70%" />
-                                        <column width="11%" />
-                                        <column width="10%"/>
-                                    </columns>
-                                    <rows>
-                                        <row class="row attachmentRow" id="${row}">
-                                            <description id="${row}[attachment_number]" />
-                                            <description id="${row}[partID]" />
-                                            <description id="${row}[type]" />
-                                            <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]"/>
-                                            <et2-dropdown-button id="${row}[actions]" label="$row_cont[actionsDefaultLabel]" onchange="app.mail.attachmentsBlockActions" onclick="app.mail.attachmentsBlockActions"/>
-                                        </row>
-                                    </rows>
-                                </grid>
-                            </et2-details>
-                        </hbox>
                         <box id="mailPreviewContainer">
                             <iframe frameborder="1" id="messageIFRAME" scrolling="auto"/>
                         </box>
diff --git a/mail/templates/mobile/app.css b/mail/templates/mobile/app.css
index d599f288d3..54801253fa 100644
--- a/mail/templates/mobile/app.css
+++ b/mail/templates/mobile/app.css
@@ -2300,3 +2300,4 @@ table#mail-index_previewAttachmentArea::-webkit-scrollbar-thumb:hover {
     border-bottom: 1px solid silver;
   }
 }
+/*# sourceMappingURL=app.css.map */
\ No newline at end of file
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index b58259729e..7648de3334 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -481,18 +481,16 @@ div.mail-compose_fileselector {
   margin-bottom: 1em;
   font-size: 1.2em;
 }
-et2-details.details::part(summary) {
+et2-details.details::part(summary),
+et2-details.attachments::part(summary) {
   padding-left: 1em;
 }
-et2-details.attachments::part(header) {
-  padding-left: 0px;
-}
 .mailDisplay et2-details::part(base),
 .previewWrapper et2-details::part(base) {
   border: none;
 }
-et2-details.attachments::part(content) {
-  padding-left: 0px;
+.mailPreviewHeaders et2-details::part(header) {
+  padding: 0;
 }
 #mail-index_mailPreview .et2_email > span {
   display: inline;
@@ -671,9 +669,11 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 }
 .mailPreviewHeaders :first-child,
 .mailDisplayHeaders :first-child {
-  flex: 0 0 auto;
   color: #7a7a7a;
 }
+.mailPreviewHeaders et2-lavatar {
+  flex: 0 0 auto;
+}
 div.mailPreviewHeaders div.mail_extraEmails {
   display: inline-block;
   max-height: 1.3em;