diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 931224e8ac..540f7eece0 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -451,6 +451,9 @@ div.mail-compose_fileselector {
 #mail-compose_toolbar > button {
 	padding: .2em .4em;
 }
+#mail-compose_to div.ms-sel-ctn, #mail-compose_cc .ms-sel-ctn {
+	max-height: 75px;
+}
 #mail-display_toolbar > button > span {
 	padding: .2em .4em;
 }
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index ef97920d60..80f0354c38 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -447,6 +447,10 @@ div.mail-compose_fileselector {
 #mail-compose_toolbar > button {
   padding: .2em .4em;
 }
+#mail-compose_to div.ms-sel-ctn,
+#mail-compose_cc .ms-sel-ctn {
+  max-height: 75px;
+}
 #mail-display_toolbar > button > span {
   padding: .2em .4em;
 }