diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 0d9b3eaf12..2b61a2963e 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -22,29 +22,32 @@
 			<hbox width="100%" class="mailPreviewHeaders">
 				<lavatar src="@avatar" lname="@address" shape="rounded"/>
 				<vbox class="previewWrapper">
-					<et2-details class="details" title="details" toggleOnHover="true" hoist="true" toggleAlign="left">
-                        <et2-select-email slot="summary" value="@from" readonly="true"/>
-                        <hbox  disabled="!@from">
-                            <description value="From" class="firstColumnTitle"/>
-                            <et2-select-email id="from" readonly="true"></et2-select-email>
-                        </hbox>
-                        <hbox disabled="!@sender">
-                            <description value="Sender" class="firstColumnTitle"/>
-                            <et2-select-email id="sender" readonly="true"></et2-select-email>
-                        </hbox>
-                        <hbox disabled="!@to">
-                            <description value="To" class="firstColumnTitle"/>
-                            <et2-select-email id="to" readonly="true"></et2-select-email>
-                        </hbox>
-                        <hbox disabled="!@cc">
-                            <description value="Cc" class="firstColumnTitle"/>
-                            <et2-select-email id="cc" readonly="true"></et2-select-email>
-                        </hbox>
-                        <hbox disabled="!@bcc">
-                            <description value="Bcc" class="firstColumnTitle"/>
-                            <et2-select-email id="bcc" readonly="true"></et2-select-email>
-                        </hbox>
-					</et2-details>
+					<hbox>
+                        <et2-details class="details" title="details" toggleOnHover="true" hoist="true" toggleAlign="left">
+                            <et2-select-email slot="summary" value="@from" readonly="true"/>
+                            <hbox  disabled="!@from">
+                                <description value="From" class="firstColumnTitle"/>
+                                <et2-select-email id="from" readonly="true"></et2-select-email>
+                            </hbox>
+                            <hbox disabled="!@sender">
+                                <description value="Sender" class="firstColumnTitle"/>
+                                <et2-select-email id="sender" readonly="true"></et2-select-email>
+                            </hbox>
+                            <hbox disabled="!@to">
+                                <description value="To" class="firstColumnTitle"/>
+                                <et2-select-email id="to" readonly="true"></et2-select-email>
+                            </hbox>
+                            <hbox disabled="!@cc">
+                                <description value="Cc" class="firstColumnTitle"/>
+                                <et2-select-email id="cc" readonly="true"></et2-select-email>
+                            </hbox>
+                            <hbox disabled="!@bcc">
+                                <description value="Bcc" class="firstColumnTitle"/>
+                                <et2-select-email id="bcc" readonly="true"></et2-select-email>
+                            </hbox>
+                        </et2-details>
+                        <date-time-today align="right" id="mail_displaydate" readonly="true"/>
+                    </hbox>
                     <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" class="attachments" hoist="true" disabled="!@mail_displayattachments">
                         <hbox slot="summary">
                             <grid class="previewAttachmentArea egwGridView_grid" >
@@ -94,7 +97,6 @@
                         </grid>
                     </et2-details>
 				</vbox>
-				<date-time-today align="right" id="mail_displaydate" readonly="true"/>
 			</hbox>
 
 			<box class="mailDisplayContainer">
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 8da89afe6d..02faf0856f 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -38,21 +38,24 @@
                         <hbox width="100%" class="mailPreviewHeaders">
                             <lavatar src="@avatar" lname="@address" shape="rounded" size="2.75em"/>
                             <vbox>
-                                <et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
-                                    <et2-select-email slot="summary" id="fromaddress" readonly="true"/>
-                                    <hbox>
-                                        <description value="From" class="firstColumnTitle"/>
-                                        <et2-select-email id="additionalfromaddress" readonly="true"></et2-select-email>
-                                    </hbox>
-                                    <hbox disabled="!@toaddress" width="100%">
-                                        <description value="To" class="firstColumnTitle"/>
-                                        <et2-select-email id="additionaltoaddress" readonly="true"></et2-select-email>
-                                    </hbox>
-                                    <hbox disabled="!@ccaddress"  width="100%">
-                                        <description value="Cc" class="firstColumnTitle"/>
-                                        <et2-select-email id="ccaddress" readonly="true"></et2-select-email>
-                                    </hbox>
-                                </et2-details>
+                                <hbox>
+                                    <et2-details class="details" toggleOnHover="true" hoist="true" toggleAlign="left">
+                                        <et2-select-email slot="summary" id="fromaddress" readonly="true"/>
+                                        <hbox>
+                                            <description value="From" class="firstColumnTitle"/>
+                                            <et2-select-email id="additionalfromaddress" readonly="true"></et2-select-email>
+                                        </hbox>
+                                        <hbox disabled="!@toaddress" width="100%">
+                                            <description value="To" class="firstColumnTitle"/>
+                                            <et2-select-email id="additionaltoaddress" readonly="true"></et2-select-email>
+                                        </hbox>
+                                        <hbox disabled="!@ccaddress"  width="100%">
+                                            <description value="Cc" class="firstColumnTitle"/>
+                                            <et2-select-email id="ccaddress" readonly="true"></et2-select-email>
+                                        </hbox>
+                                    </et2-details>
+                                    <date-time-today align="right" id="date" readonly="true"/>
+                                </hbox>
                                 <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
                                     <hbox slot="summary">
                                         <grid class="previewAttachmentArea egwGridView_grid" >
@@ -102,7 +105,7 @@
                                     </grid>
                                 </et2-details>
                             </vbox>
-                            <date-time-today align="right" id="date" readonly="true"/>
+
                         </hbox>
 
                         <box id="mailPreviewContainer">