diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index 2ffbf5fd87..327ee1970b 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -974,6 +974,7 @@ body > div#egw_message {
 	border: 2px gray solid;
 	min-width: 100px;
 	z-index: 10;
+	white-space: pre-wrap;
 }
 
 /**
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index cde3df2ba2..1421dda292 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -3815,6 +3815,7 @@ body > div#egw_message {
   z-index: 100000;
   margin: 0px auto;
   max-width: 90%;
+  white-space: pre-wrap;
 }
 /**
  * Less-file for egroupware
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index e4ed5bbca8..dd32e2281c 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -3804,6 +3804,7 @@ body > div#egw_message {
   z-index: 100000;
   margin: 0px auto;
   max-width: 90%;
+  white-space: pre-wrap;
 }
 /**
  * Less-file for egroupware
diff --git a/pixelegg/less/layout_dialog.less b/pixelegg/less/layout_dialog.less
index 017dda1a0a..35de1905fa 100755
--- a/pixelegg/less/layout_dialog.less
+++ b/pixelegg/less/layout_dialog.less
@@ -506,4 +506,5 @@ body > div#egw_message {
 	z-index: 100000;
 	margin:  0px auto;
 	max-width: 90%;
+	white-space: pre-wrap;
 }