diff --git a/mail/js/app.js b/mail/js/app.js
index e40213092c..019dde402d 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -196,7 +196,11 @@ app.classes.mail = AppJS.extend(
 				jQuery('#mail-compose').on ('load',function() {
 					window.setTimeout(function(){that.compose_resizeHandler();}, 300);
 				});
-
+				//Resize compose after window resize to not getting scrollbar
+				jQuery(window).on ('resize',function() {
+					that.compose_resizeHandler();
+				});
+					
 				this.compose_fieldExpander();
 
 				//Call drag_n_drop initialization for emails on compose
diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index bffe45048b..3b06568578 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -520,7 +520,7 @@ div.mail-compose_fileselector {
 	display: none !important;
 }
 
-#mail-display, #mail-compose {
+#mail-display {
 	min-height: 768px;
 }
 .mailDisplayContainer, .mailDisplayAttachments {
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 06dce5310f..27bde8e0e0 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -519,8 +519,7 @@ div.mail-compose_fileselector {
   border: 0px !important;
   display: none !important;
 }
-#mail-display,
-#mail-compose {
+#mail-display {
   min-height: 768px;
 }
 .mailDisplayContainer,
@@ -990,7 +989,6 @@ div#mail-index div#mail-index_mailPreview div#mail-index_mailPreviewHeadersSubje
 }
 #mail-compose {
   width: 870px;
-  min-height: 768px;
   padding: 5px;
   /*// ###############################################################################*/
   /*// Mail Header*/
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 9dc81ac8fd..4487b5e088 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -332,7 +332,6 @@ div#mail-index{
 #mail-compose{
     //	gesamtbreite
     width: 870px;
-	min-height: 768px;
     padding: 5px;