diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 2790fc8c8d..05b795288b 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -482,7 +482,7 @@ div.mail-compose_fileselector {
 #mail-compose_composeToolbar > button {
 	padding: .2em .4em;
 }
-#mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn {
+#mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn, #mail-compose_bcc .ms-sel-ctn {
 	max-height: 75px;
 }
 #mail-display_toolbar > button > span {
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 230f6a526f..29afdf60b4 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -480,7 +480,8 @@ div.mail-compose_fileselector {
   padding: .2em .4em;
 }
 #mail-compose_to div.ms-sel-ctn,
-#mail-compose_cc .ms-sel-ctn {
+#mail-compose_cc .ms-sel-ctn,
+#mail-compose_bcc .ms-sel-ctn {
   max-height: 75px;
 }
 #mail-display_toolbar > button > span {
@@ -1173,6 +1174,10 @@ body {
   width: 100%;
   height: 30px;
 }
+#mail-compose .mailComposeHeaders #mail-compose_to input,
+#mail-compose .mailComposeHeadersSection #mail-compose_to input {
+  width: auto;
+}
 #mail-compose .mailComposeHeaders span#mail-compose_cc_expander,
 #mail-compose .mailComposeHeadersSection span#mail-compose_cc_expander,
 #mail-compose .mailComposeHeaders span#mail-compose_bcc_expander,
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 58c20655e4..ff2a0513b7 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -414,7 +414,7 @@ body {
         /*Von*/
         select#mail-compose_mailaccount {width: 100%; height: 30px;}
         /*An*/
-
+		#mail-compose_to input {width:auto;}
         /*Kopie*/
         span#mail-compose_cc_expander,
         /*Blindkopie*/