diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 4ae78de18a..caa1fc99c1 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -483,20 +483,21 @@ div.mail-compose_fileselector {
 	margin-bottom: 1em;
 	font-size: 1.2em;
 }
-.previewWrapper .et2_details.attachments {
-	margin-top: 0.4em;
+et2-details.details::part(summary) {
+	padding-left: 1em;
 }
-.previewWrapper .et2_details {
-	flex-direction: row;
-	text-align: start !important;
+
+et2-details.attachments::part(header) {
+	padding-left: 0px;
 }
-.previewWrapper .et2_details .et2_details_title {
-	margin: 0;
-	margin-left: 0.5em;
+.mailDisplay et2-details::part(base),
+.previewWrapper et2-details::part(base){
+	border: none;
 }
-.previewWrapper .et2_details .et2_details_toggle {
-	margin: 0;
+et2-details.attachments::part(content) {
+	padding-left: 0px;
 }
+
 #mail-index_mailPreview .et2_email > span {
     display: inline;
 }
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index ed7786bebb..4240cc6ff0 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -22,75 +22,29 @@
 			<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">
+					<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"/>
-                            <grid id="from">
-                                <columns>
-                                    <column/>
-                                </columns>
-                                <rows>
-                                    <row>
-                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                    </row>
-                                </rows>
-                            </grid>
+                            <et2-select-email id="from" readonly="true"></et2-select-email>
                         </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>
+                            <et2-select-email id="sender" readonly="true"></et2-select-email>
                         </hbox>
                         <hbox disabled="!@to">
                             <description value="To" class="firstColumnTitle"/>
-                            <grid id="to">
-                                <columns>
-                                    <column/>
-                                </columns>
-                                <rows>
-                                    <row>
-                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                    </row>
-                                </rows>
-                            </grid>
+                            <et2-select-email id="to" readonly="true"></et2-select-email>
                         </hbox>
                         <hbox disabled="!@cc">
                             <description value="Cc" class="firstColumnTitle"/>
-                            <grid id="cc">
-                                <columns>
-                                    <column/>
-                                </columns>
-                                <rows>
-                                    <row>
-                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                    </row>
-                                </rows>
-                            </grid>
+                            <et2-select-email id="cc" readonly="true"></et2-select-email>
                         </hbox>
                         <hbox disabled="!@bcc">
                             <description value="Bcc" class="firstColumnTitle"/>
-                            <grid id="bcc">
-                                <columns>
-                                    <column/>
-                                </columns>
-                                <rows>
-                                    <row>
-                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                    </row>
-                                </rows>
-                            </grid>
+                            <et2-select-email id="bcc" readonly="true"></et2-select-email>
                         </hbox>
 					</et2-details>
-
 				</vbox>
 				<date-time-today align="right" id="mail_displaydate" readonly="true"/>
 			</hbox>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 40bc2a56e5..bfd7e775f8 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -38,46 +38,19 @@
                         <hbox width="100%" class="mailPreviewHeaders">
                                 <lavatar src="@avatar" lname="@address" shape="rounded" size="2.45em"/>
                                 <vbox>
-                                    <et2-details class="details" toggleOnHover="true" hoist="true">
+                                    <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"/>
-                                            <grid id="additionalfromaddress">
-                                                <columns>
-                                                    <column/>
-                                                </columns>
-                                                <rows>
-                                                    <row>
-                                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                                    </row>
-                                                </rows>
-                                            </grid>
+                                            <et2-select-email id="additionalfromaddress" readonly="true"></et2-select-email>
                                         </hbox>
                                         <hbox disabled="!@toaddress" width="100%">
                                             <description value="To" class="firstColumnTitle"/>
-                                            <grid id="additionaltoaddress">
-                                                <columns>
-                                                    <column/>
-                                                </columns>
-                                                <rows>
-                                                    <row>
-                                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                                    </row>
-                                                </rows>
-                                            </grid>
+                                            <et2-select-email id="additionaltoaddress" readonly="true"></et2-select-email>
                                         </hbox>
                                         <hbox disabled="!@ccaddress"  width="100%">
                                             <description value="Cc" class="firstColumnTitle"/>
-                                            <grid id="ccaddress">
-                                                <columns>
-                                                    <column/>
-                                                </columns>
-                                                <rows>
-                                                    <row>
-                                                        <et2-select-email id="${row}" readonly="true"></et2-select-email>
-                                                    </row>
-                                                </rows>
-                                            </grid>
+                                            <et2-select-email id="ccaddress" readonly="true"></et2-select-email>
                                         </hbox>
                                     </et2-details>
                                 </vbox>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 321df5a989..2518f17f37 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -484,19 +484,18 @@ div.mail-compose_fileselector {
   margin-bottom: 1em;
   font-size: 1.2em;
 }
-.previewWrapper .et2_details.attachments {
-  margin-top: 0.4em;
+et2-details.details::part(summary) {
+  padding-left: 1em;
 }
-.previewWrapper .et2_details {
-  flex-direction: row;
-  text-align: start !important;
+et2-details.attachments::part(header) {
+  padding-left: 0px;
 }
-.previewWrapper .et2_details .et2_details_title {
-  margin: 0;
-  margin-left: 0.5em;
+.mailDisplay et2-details::part(base),
+.previewWrapper et2-details::part(base) {
+  border: none;
 }
-.previewWrapper .et2_details .et2_details_toggle {
-  margin: 0;
+et2-details.attachments::part(content) {
+  padding-left: 0px;
 }
 #mail-index_mailPreview .et2_email > span {
   display: inline;