diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 562972b4bd..5a0d494ec2 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -567,7 +567,9 @@ div.mailDisplayHeaders div.mail_extraEmails.visible
 div.mailComposeBody {
 	white-space: normal !important;
 }
-
+#mail-compose_mail_plaintext {
+	white-space: pre !important;
+}
 div.mailPreviewHeaders div.mail_extraEmails {
 	display: inline-block;
 	max-height: 1.3em;
@@ -636,4 +638,4 @@ div.mailPreviewHeaders #mail-index_previewAttachmentArea.visible {
 #mail-subscribe table.et2_grid tr td div.et2_box {
   height: 500px;
   overflow: auto;
-}
\ No newline at end of file
+}
diff --git a/mail/templates/default/compose.xet b/mail/templates/default/compose.xet
index b6834ee53e..0c9a63e616 100644
--- a/mail/templates/default/compose.xet
+++ b/mail/templates/default/compose.xet
@@ -100,7 +100,7 @@
 					<htmlarea span="all" name="mail_htmltext" id="mail_htmltext" expand_toolbar="true" height="320px" width="100%" />
 				</hbox>
 				<hbox disabled="@is_html" class="mailComposeBody">
-					<textbox multiline="true" rows="15" cols="120" width="99%" span="all" name="mail_plaintext" id="mail_plaintext"/>
+					<textbox multiline="true" rows="15" cols="120" width="99%" span="all" no_lang="1" name="mail_plaintext" id="mail_plaintext"/>
 				</hbox>
 				<groupbox class="mailSignature">
 					<menulist>