diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 599d5a0a58..6413442f86 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -542,6 +542,10 @@ div.mailDisplayHeaders > span:first-child, div.mailComposeHeaders > span:first-c
 	margin-left: 3px;
 }
 
+div.mailComposeBody {
+	white-space: normal !important;
+}
+
 div.mailPreviewHeaders div.mail_extraEmails {
 	display: inline-block;
 	max-height: 1.3em;
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index b66163b3b7..b6834ee53e 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -5,41 +5,41 @@
 			<html id="msg" class="message"/>
 			<vbox class="mailCompose mailComposeHeaderSection" width="99%">
 				<hbox class="et2_toolbar ui-widget-header ui-corner-all mail-compose_toolbar">
-					
+
 					<button class="et2_button ui-button mail-compose_button" label="Send" id="button[send]"/>
-					
+
                     <description class="email-button-group save">
 		                <buttononly class="et2_button ui-button" label="Save as Draft" value="saveAsDraft" id="button[saveAsDraft]" image="fileexport" onclick="app.mail.saveAsDraft"/>
 		                <buttononly class="et2_button ui-button" label="Save as Draft and Print" value="saveAsDraftAndPrint" id="button[saveAsDraftAndPrint]" image="print" onclick="app.mail.saveAsDraftAndPrint"/>
-                    </description>  
+                    </description>
 					<description class="email-button-group file">
 						<vfs-select class="$cont[vfsNotAvailable]" id="selectFromVFSForCompose" onchange="app.mail.vfsUploadForCompose"/>
 						<file class="mail-compose_fileselector" statustext="Select file to attach to message" multiple='true' progress='mailUploadProgress' onFinish="app.mail.uploadForCompose" id="uploadForCompose" drop_target ="mailUploadSection"/>
 					</description>
-                    <description class="email-button-group egw"> 	
+                    <description class="email-button-group egw">
 		                <description class="$cont[noSaveAsAvailable]" value="Save:"/>
-					 
+
 		                <hbox class="$cont[noInfologAvailable]">
 							<image class="et2_button ui-button et2_button_icon" label="Save as infolog on send" src="infolog/navbar" no_lang="1"/>
 							<checkbox statustext="check to save as infolog on send" id="to_infolog" options="on,off"/>
 						</hbox>
-		                          
+
 						<hbox class="$cont[noTrackerAvailable]">
 							<image class="et2_button ui-button et2_button_icon" label="Save as tracker on send" src="tracker/navbar" no_lang="1"/>
 							<checkbox statustext="check to save as trackerentry on send" id="to_tracker" options="on,off"/>
 						</hbox>
 					</description>
-					<description class="email-button-group notification">         
+					<description class="email-button-group notification">
 						<description value="Recieve notification"/>
 						<checkbox statustext="check to recieve a notification when the message is read (note: not all clients support this and/or the reciever may not authorize the notification)" id="disposition" options="$cont[disposition]"/>
 					</description>
-                                
-					<description class="email-button-group priority">	
+
+					<description class="email-button-group priority">
 						<description value="Priority"/>
 						<menulist>
 							<menupopup id="priority"/>
 						</menulist>
-                    </description>        
+                    </description>
 				</hbox>
 				<grid  width="100%">
 					<columns>
diff --git a/mail/templates/pixelegg/app.css b/mail/templates/pixelegg/app.css
index 811e93ad9f..967f186217 100755
--- a/mail/templates/pixelegg/app.css
+++ b/mail/templates/pixelegg/app.css
@@ -540,6 +540,9 @@ div.mailComposeBody,
 div.mailPreviewHeaders > * {
   margin-left: 3px;
 }
+div.mailComposeBody {
+  white-space: normal !important;
+}
 div.mailPreviewHeaders div.mail_extraEmails {
   display: inline-block;
   max-height: 1.3em;
diff --git a/mail/templates/pixelegg/app.less b/mail/templates/pixelegg/app.less
index 8ca5064950..cfa0ae7899 100755
--- a/mail/templates/pixelegg/app.less
+++ b/mail/templates/pixelegg/app.less
@@ -340,21 +340,21 @@ div#mail-index{
                   }
         }
         span.notification {float: left;
-                    span.et2_label {line-height: 25px;}       
+                    span.et2_label {line-height: 25px;}
         }
         span.priority {float: left;
-                    span.et2_label {line-height: 25px;}    
+                    span.et2_label {line-height: 25px;}
         }
 
         img{.dimension_height_m;}
-        img[src$="svg"]{ 
-            .gradient_vertical (@gray_30, @gray_40); 
-            background-color: @gray_60; 
+        img[src$="svg"]{
+            .gradient_vertical (@gray_30, @gray_40);
+            background-color: @gray_60;
             .dimension_height_m;
             &:hover {
-                .box_shadow_standard_light_hover; 
+                .box_shadow_standard_light_hover;
                 background-color:@color_positive_action;
-                .gradient_vertical (@color_positive_action, @color_positive_action); 
+                .gradient_vertical (@color_positive_action, @color_positive_action);
             }
         }
 
@@ -364,12 +364,12 @@ div#mail-index{
         /*// Button senden -> dev_buttons.less*/
         button.et2_button {
             /*.dimension_height_m;*/
-            
+
 /*             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
              &:focus {.box_shadow_standard_light_inset; .background_color_15_gray;}*/
         }
-        
-        
+
+
         .mail-compose_button{
             height: 27px;
             margin-right: 3px !important;
@@ -399,7 +399,7 @@ div#mail-index{
             margin: 3px;
             .Complete_Button_Icon_normal;
             .dimension_height_s;
-            
+
             &:hover {.box_shadow_standard_light_hover; background-color:@color_positive_action;}
 
         }
@@ -448,7 +448,7 @@ div#mail-index{
         /*save / Speichern als */
         //als Infolog
         #mail-compose_to_infolog{
-            
+
             margin-right: 5px !important;
             &:hover{
             .scale;
@@ -490,14 +490,14 @@ div#mail-index{
         margin: 2px 0;
         width: 98%;
 
-        span { 
-               font-size: 0.8em; 
-               text-align: right; 
+        span {
+               font-size: 0.8em;
+               text-align: right;
                padding-right: 5px;
         }
-        
+
         span.ms-close-btn {
-            width: auto; 
+            width: auto;
             background-repeat: no-repeat;
             padding-right: 8px;
         }
@@ -514,7 +514,7 @@ div#mail-index{
         /*Von*/
         select#mail-compose_mailaccount {width: 100%; height: 30px;}
         /*An*/
-        
+
         /*Kopie*/
         span#mail-compose_cc_expander{
             .Complete_Button_normal;
@@ -537,7 +537,7 @@ div#mail-index{
         }
         /*Betreff*/
         input#mail-compose_subject { max-width: 716px;}
-        
+
         /*HTML Box*/
         input#mail-compose_mimeType {margin-left: 12px;}
 
