diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index a1d54e8bf..1910738be 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -340,9 +340,9 @@ class commentController extends comment
 				
 				if(strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== FALSE)
 				{
+					$obj->content = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, $obj->content);
 					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-					$obj->content = nl2br($obj->content);
-					$obj->content = preg_replace('/\r|\n/', '', $obj->content);
+					$obj->content = str_replace(array("\r\n", "\r", "\n"), '<br />', $obj->content);
 				}
 			}
 		}
@@ -765,9 +765,9 @@ class commentController extends comment
 				
 				if(strpos($editor_config->sel_comment_editor_colorset, 'nohtml') !== FALSE)
 				{
+					$obj->content = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, $obj->content);
 					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-					$obj->content = nl2br($obj->content);
-					$obj->content = preg_replace('/\r|\n/', '', $obj->content);
+					$obj->content = str_replace(array("\r\n", "\r", "\n"), '<br />', $obj->content);
 				}
 			}
 		}
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 3c3c32136..e302b9969 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -299,9 +299,9 @@ class documentController extends document
 				
 				if(strpos($editor_config->sel_editor_colorset, 'nohtml') !== FALSE)
 				{
+					$obj->content = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, $obj->content);
 					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-					$obj->content = nl2br($obj->content);
-					$obj->content = preg_replace('/\r|\n/', '', $obj->content);
+					$obj->content = str_replace(array("\r\n", "\r", "\n"), '<br />', $obj->content);
 				}
 			}
 		}
@@ -515,9 +515,9 @@ class documentController extends document
 				
 				if(strpos($editor_config->sel_editor_colorset, 'nohtml') !== FALSE)
 				{
+					$obj->content = preg_replace('/\<br(\s*)?\/?\>/i', PHP_EOL, $obj->content);
 					$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
-					$obj->content = nl2br($obj->content);
-					$obj->content = preg_replace('/\r|\n/', '', $obj->content);
+					$obj->content = str_replace(array("\r\n", "\r", "\n"), '<br />', $obj->content);
 				}
 			}
 		}