diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index ae5edf0a5f..8a434d9e5e 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -502,6 +502,7 @@ et2-details.details::part(summary),
 et2-details.attachments::part(summary){
 	padding-left: 1em;
 }
+et2-details.details {width: 100%}
 
 .mailDisplay et2-details::part(base),
 .previewWrapper et2-details::part(base){
diff --git a/mail/templates/default/index.rows.horizental.xet b/mail/templates/default/index.rows.horizental.xet
index e60d1d5130..b2a3465f21 100644
--- a/mail/templates/default/index.rows.horizental.xet
+++ b/mail/templates/default/index.rows.horizental.xet
@@ -39,7 +39,7 @@
                         <et2-description  id="${row}[bodypreview]" class="et2_label bodypreview" noLang="1"></et2-description>
                     </et2-vbox>
                     <et2-hbox>
-                        <et2-date-time-today  align="center" id="${row}[date]" readonly="true"></et2-date-time-today>
+                        <et2-date-time  align="center" id="${row}[date]" readonly="true"></et2-date-time>
                     </et2-hbox>
                     <et2-date-time-today  align="center" id="${row}[modified]" readonly="true"></et2-date-time-today>
                     <et2-url-email  id="${row}[address]" readonly="true"></et2-url-email>
diff --git a/mail/templates/default/index.rows.vertical.xet b/mail/templates/default/index.rows.vertical.xet
index 4b6667ea84..fcabcbfd1a 100644
--- a/mail/templates/default/index.rows.vertical.xet
+++ b/mail/templates/default/index.rows.vertical.xet
@@ -32,7 +32,7 @@
                     </et2-hbox>
                     <et2-vbox>
                         <et2-hbox>
-                            <et2-date-time-today  align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"></et2-date-time-today>
+                            <et2-date-time align="center" class="$row_cont[class]" id="${row}[date]" readonly="true"></et2-date-time>
                         </et2-hbox>
                         <et2-hbox>
                             <et2-image  src="$row_cont[smime]" height="16px"></et2-image>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index 3b9e9dc1e7..1804fba700 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -49,7 +49,7 @@
                                             <et2-select-email  id="ccaddress" readonly="true" multiple="true"></et2-select-email>
                                         </et2-hbox>
                                     </et2-details>
-                                    <et2-date-time-today  align="right" id="date" readonly="true"></et2-date-time-today>
+                                    <et2-date-time align="right" id="date" readonly="true"></et2-date-time>
                                 </et2-hbox>
                                 <et2-details  toggleAlign="left" title="@attachmentsBlockTitle" toggleOnHover="true" hoist="true" class="attachments" disabled="!@attachmentsBlock">
                                     <et2-hbox  slot="summary">