diff --git a/dev/Styles/MessageView.less b/dev/Styles/MessageView.less
index 3aeaf6519..14b29d865 100644
--- a/dev/Styles/MessageView.less
+++ b/dev/Styles/MessageView.less
@@ -416,7 +416,7 @@ html.rl-no-preview-pane {
 							border-radius: 0;
 							font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
 							display: block;
-							word-break: break-word;
+							word-break: normal;
 							word-wrap: break-word;
 							background-color: #f9f9f9;
 						}
@@ -450,7 +450,7 @@ html.rl-no-preview-pane {
 							border: none;
 							font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
 							display: block;
-							word-break: break-word;
+							word-break: normal;
 						}
 
 						pre.b-plain-openpgp {
diff --git a/dev/Styles/_BootstrapFix.less b/dev/Styles/_BootstrapFix.less
index 76b246edd..3e876fcb7 100644
--- a/dev/Styles/_BootstrapFix.less
+++ b/dev/Styles/_BootstrapFix.less
@@ -233,7 +233,7 @@ select {
         border: none;
         background: rgba(0, 0, 0, 0);
         padding: 0;
-        word-break: break-word;
+        word-break: normal;
     }
 }
 
diff --git a/dev/Styles/_CkeFix.less b/dev/Styles/_CkeFix.less
index 5aa7f1c52..a986ecbdd 100644
--- a/dev/Styles/_CkeFix.less
+++ b/dev/Styles/_CkeFix.less
@@ -107,7 +107,7 @@
 		border-radius: 0;
 		font-family: Monaco, Menlo, Consolas, 'Courier New', monospace;
 		display: block;
-		word-break: break-word;
+		word-break: normal;
 		word-wrap: break-word;
 		background-color: #f9f9f9;
 	}