diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index f94018b0d6..da12e00d72 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -3680,7 +3680,11 @@ tr.dialogOperators td, .dialogFooterToolbar {
     padding: 5px 0px 5px 0px;
 }
 
-.popupMainDiv table.et2_grid > tbody > tr > td, table.et2_grid > tbody > tr > td {
+table.et2_grid > tbody > tr > td {
+    padding-right: 5px;
+}
+.popupMainDiv table.et2_grid > tbody > tr > td{
+    padding: 0;
     padding-right: 5px;
 }
 
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 0346577d83..aed1f3373c 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -994,9 +994,6 @@ et2-image.smime_cert_unknownemail {
     width: 100%;
 }
 
-#mail-compose_subject {
-	padding: 10px 0 10px 0;
-}
 div#mail-index_nm.splitter-pane {min-height: 100px;}
 #mail-index_mailSplitter .splitter-bar-horizontal {background: white;}