diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 325b935398..dbb5736fc8 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -174,7 +174,7 @@ A.sieveRowInActive
 table tr.attachmentRow > td{
 	vertical-align: middle;
 }
-table tr.attachmentRow > td et2-description{
+div#popupMainDiv #mail-compose table tr.attachmentRow > td et2-description{
 	width: 84vw;
 	overflow-wrap: anywhere;
 }
diff --git a/mail/templates/default/display.xet b/mail/templates/default/display.xet
index 77e1a9d915..61d670b0bd 100644
--- a/mail/templates/default/display.xet
+++ b/mail/templates/default/display.xet
@@ -107,8 +107,8 @@
                                                 <column disabled="!@showtempname"/>
                                                 <column disabled="!@showtempname"/>
                                                 <column disabled="!@showtempname"/>
-                                                <column width="70%"/>
-                                                <column width="30%"/>
+                                                <column />
+                                                <column />
                                             </columns>
                                             <rows>
                                                 <row class="row attachmentRow">
@@ -128,9 +128,9 @@
                                             <column disabled="!@showtempname"/>
                                             <column disabled="!@showtempname"/>
                                             <column disabled="!@showtempname"/>
-                                            <column width="70%" />
-                                            <column width="10%" />
-                                            <column width="20"/>
+                                            <column  />
+                                            <column  />
+                                            <column />
                                             <column />
                                         </columns>
                                         <rows>
diff --git a/mail/templates/default/index.xet b/mail/templates/default/index.xet
index ec38f88573..25200153f9 100644
--- a/mail/templates/default/index.xet
+++ b/mail/templates/default/index.xet
@@ -59,8 +59,8 @@
                                                         <column disabled="!@showtempname"/>
                                                         <column disabled="!@showtempname"/>
                                                         <column disabled="!@showtempname"/>
-                                                        <column width="70%" />
-                                                        <column width="20%" />
+                                                        <column />
+                                                        <column />
                                                     </columns>
                                                     <rows>
                                                         <row class="row attachmentRow">
@@ -80,9 +80,9 @@
                                                     <column disabled="!@showtempname"/>
                                                     <column disabled="!@showtempname"/>
                                                     <column disabled="!@showtempname"/>
-                                                    <column width="70%" />
-                                                    <column width="11%" />
-                                                    <column width="10%"/>
+                                                    <column  />
+                                                    <column  />
+                                                    <column />
                                                 </columns>
                                                 <rows>
                                                     <row class="row attachmentRow" id="${row}">