diff --git a/mail/templates/default/app.css b/mail/templates/default/app.css
index 832aca40db..a6fa3a13b6 100644
--- a/mail/templates/default/app.css
+++ b/mail/templates/default/app.css
@@ -676,8 +676,9 @@ div.mailDisplayHeaders div.mail_extraEmails.visible {
 	position: absolute;
 	height: -webkit-fill-available !important;
 }
-#mail-compose_mail_plaintext {
-    white-space: pre-wrap !important;
+
+#mail-compose_mail_plaintext::part(textarea) {
+	white-space: pre-wrap !important;
 }
 
 .mailPreviewHeaders {