diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 6472c2161..1817e9331 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -297,6 +297,7 @@ class documentController extends document
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
+			$obj->content = nl2br($obj->content);
 		}
 		// Remove iframe and script if not a top adminisrator in the session.
 		if($logged_info->is_admin != 'Y') $obj->content = removeHackTag($obj->content);
@@ -505,6 +506,7 @@ class documentController extends document
 			{
 				$obj->content = htmlspecialchars($obj->content, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 			}
+			$obj->content = nl2br($obj->content);
 		}
 		// Change not extra vars but language code of the original document if document's lang_code is different from author's setting.
 		if($source_obj->get('lang_code') != Context::getLangType())