diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 47e89bbddd..61ae9f776f 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -3,7 +3,6 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="mail.display" template="" lang="" group="0" version="1.9.001">
-        <appicon class="onlyPrint"/>
         <html id="msg"/>
         <vbox class="mailDisplay">
             <toolbar id="displayToolbar" width="100%" view_range="6" flat_list="true" list_header="short"
@@ -20,12 +19,72 @@
                            disabled="!@smime=smime_encrypt" align="right" width="24"/>
                 </hbox>
             </hbox>
+            <vbox width="100%" class="mailPreviewHeaders onlyPrint">
 
-            <hbox width="100%" class="mailPreviewHeaders">
+                <date-time align="right" id="mail_displaydate" readonly="true"
+                           style="max-width: fit-content;"/>
+                <vbox>
+                    <hbox>
+                        <lavatar src="@avatar" lname="@from[0]" shape="rounded"/>
+                        <grid id="from">
+                            <columns>
+                                <column/>
+                            </columns>
+                            <rows>
+                                <row>
+                                    <et2-select-email id="${row}" readonly="true"></et2-select-email>
+                                </row>
+                            </rows>
+                        </grid>
+                    </hbox>
+                    <hbox disabled="!@sender">
+                        <description value="Sender" class="firstColumnTitle"/>
+                        <grid id="sender">
+                            <columns>
+                                <column/>
+                            </columns>
+                            <rows>
+                                <row>
+                                    <et2-select-email id="${row}" readonly="true"></et2-select-email>
+                                </row>
+                            </rows>
+                        </grid>
+                    </hbox>
+                    <hbox disabled="!@to">
+                        <description value="To" class="firstColumnTitle"/>
+                        <et2-select-email id="to" readonly="true" multiple="true" fullEmail="true"/>
+                    </hbox>
+                    <hbox disabled="!@cc">
+                        <description value="Cc" class="firstColumnTitle"/>
+                        <et2-select-email id="cc" readonly="true" multiple="true" fullEmail="true"/>
+                    </hbox>
+                    <hbox disabled="!@bcc">
+                        <description value="Bcc" class="firstColumnTitle"/>
+                        <et2-select-email id="bcc" readonly="true" multiple="true" fullEmail="true"/>
+                    </hbox>
+                </vbox>
+                <grid id="mail_displayattachments" class="attachments ">
+                    <columns>
+                        <column/>
+                        <column width="70%"/>
+                        <column width="11%"/>
+                    </columns>
+                    <rows>
+                        <row class="row attachmentRow">
+                            <description id="${row}[type]"/>
+                            <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]"/>
+                        </row>
+                    </rows>
+                </grid>
+            </vbox>
+            <hbox width="100%" class="mailPreviewHeaders noPrint">
                 <lavatar src="@avatar" lname="@from[0]" shape="rounded"/>
                 <vbox class="previewWrapper">
                     <hbox>
-                        <et2-details class="details noPrint" title="details" toggleOnHover="true" hoist="true"
+                        <et2-details class="details" title="details" toggleOnHover="true" hoist="true"
                                      toggleAlign="left">
                             <et2-select-email slot="summary" value="@from" readonly="true" multiple="true"/>
                             <hbox disabled="!@from">
@@ -49,67 +108,10 @@
                                 <et2-select-email id="bcc" readonly="true" multiple="true"></et2-select-email>
                             </hbox>
                         </et2-details>
-                        <date-time-today align="right" id="mail_displaydate" class="noPrint" readonly="true"/>
-                        <date-time align="right" id="mail_displaydate" class="onlyPrint" readonly="true"
-                                   style="max-width: fit-content;"/>
-                        <vbox class="onlyPrint">
-                            <hbox>
-                                <grid id="from">
-                                    <columns>
-                                        <column/>
-                                    </columns>
-                                    <rows>
-                                        <row>
-                                            <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                        </row>
-                                    </rows>
-                                </grid>
-                            </hbox>
-                            <hbox disabled="!@sender">
-                                <description value="Sender" class="firstColumnTitle"/>
-                                <grid id="sender">
-                                    <columns>
-                                        <column/>
-                                    </columns>
-                                    <rows>
-                                        <row>
-                                            <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                        </row>
-                                    </rows>
-                                </grid>
-                            </hbox>
-                            <hbox disabled="!@to">
-                                <description value="To" class="firstColumnTitle"/>
-                                <et2-select-email id="to" readonly="true" multiple="true" fullEmail="true"/>
-                            </hbox>
-                            <hbox disabled="!@cc">
-                                <description value="Cc" class="firstColumnTitle"/>
-                                <et2-select-email id="cc" readonly="true" multiple="true" fullEmail="true"/>
-                            </hbox>
-                            <hbox disabled="!@bcc">
-                                <description value="Bcc" class="firstColumnTitle"/>
-                                <et2-select-email id="bcc" readonly="true" multiple="true" fullEmail="true"/>
-                            </hbox>
-                        </vbox>
+                        <date-time-today align="right" id="mail_displaydate" readonly="true"/>
                     </hbox>
-                    <grid id="mail_displayattachments" class="attachments onlyPrint">
-                        <columns>
-                            <column/>
-                            <column width="70%"/>
-                            <column width="11%"/>
-                        </columns>
-                        <rows>
-                            <row class="row attachmentRow">
-                                <description id="${row}[type]"/>
-                                <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]"/>
-                            </row>
-                        </rows>
-                    </grid>
                     <et2-details toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true"
-                                 class="attachments noPrint" hoist="true" disabled="!@mail_displayattachments">
+                                 class="attachments" hoist="true" disabled="!@mail_displayattachments">
                         <hbox slot="summary">
                             <grid class="previewAttachmentArea egwGridView_grid">
                                 <columns>
