diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 90771b4531..16a9569191 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -520,6 +520,9 @@ div.mail-compose_fileselector {
 	display: none !important;
 }
 
+#mail-display, #mail-compose {
+	min-height: 500px;
+}
 .mailDisplayContainer, .mailDisplayAttachments {
 	display: block;
 	display: -moz-inline-stack;
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 7d2dae2079..883f7fbe7b 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -519,6 +519,9 @@ div.mail-compose_fileselector {
   border: 0px !important;
   display: none !important;
 }
+#mail-display {
+  min-height: 500px;
+}
 .mailDisplayContainer,
 .mailDisplayAttachments {
   display: block;
@@ -972,6 +975,7 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 }
 #mail-compose {
   width: 870px;
+  min-height: 500px;
   padding: 5px;
   /*// ###############################################################################*/
   /*// Mail Header*/
@@ -1468,6 +1472,7 @@ div#popupMainDiv {
 }
 #mail-display {
   width: 870px;
+  min-height: 500px;
   padding: 5px;
   /*.mailDisplayHeaderSection{*/
   /*top: 0;*/
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 84b0ecb571..051c4f6439 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -332,6 +332,7 @@ div#mail-index{
 #mail-compose{
     //	gesamtbreite
     width: 870px;
+	min-height: 500px;
     padding: 5px;
 
 
@@ -671,6 +672,7 @@ div#popupMainDiv{
 #mail-display{
     //	gesamtbreite
     width: 870px;
+	min-height: 500px;
     padding: 5px;
 
     /*.mailDisplayHeaderSection{*/