diff --git a/src/css/default/email_templates.css b/src/css/default/email_templates.css
index 8ad40264..8e0efe44 100644
--- a/src/css/default/email_templates.css
+++ b/src/css/default/email_templates.css
@@ -19,8 +19,8 @@ div.LStabs_content form div.form-footer {
   margin-top: 1em;
 }
 
-th.mail_subject {
-  width: 10em;
+th.mail_subject, td.mail_subject {
+  width: 20vw;
   white-space: nowrap;
   overflow: hidden;
 }
@@ -32,8 +32,9 @@ th.mail_content, td.mail_content {
 }
 
 @media (max-width: 1024px) {
-  th.mail_subject {
-    widht: auto;
+  th.mail_subject, td.mail_subject {
+    width: auto;
+    max-width: 30vw;
   }
   th.mail_content, td.mail_content {
     max-width: 12em;
@@ -41,6 +42,9 @@ th.mail_content, td.mail_content {
 }
 
 @media (max-width: 500px) {
+  th.mail_subject, td.mail_subject {
+    max-width: 50vw;
+  }
   th.mail_content, td.mail_content {
     display: none;
   }
diff --git a/src/templates/default/email_templates.tpl b/src/templates/default/email_templates.tpl
index 86a40ef1..32de2abe 100644
--- a/src/templates/default/email_templates.tpl
+++ b/src/templates/default/email_templates.tpl
@@ -14,7 +14,7 @@
     {foreach $templates as $name => $tpl}
     <tr class="{cycle values=",bis"}">
       <td><a href="addon/mail/templates?name={$name|escape:"url"}">{$name}</td>
-      <td>{$tpl.subject|escape:"htmlall"}</td>
+      <td class="mail_subject">{$tpl.subject|escape:"htmlall"}</td>
       <td class="mail_content">{$tpl.html|escape:"htmlall"}</td>
       <td class="mail_content">{$tpl.txt|escape:"htmlall"}</td>
     </tr>