diff --git a/modules/board/board.controller.php b/modules/board/board.controller.php
index 08717dc39..13ba61a2c 100644
--- a/modules/board/board.controller.php
+++ b/modules/board/board.controller.php
@@ -40,7 +40,7 @@ class boardController extends board
 		$obj->commentStatus = $obj->comment_status;
 
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
 		//setup dpcument title tp 'Untitled'
 		if($obj->title == '') $obj->title = 'Untitled';
 
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index 8f0af56e0..8f4569f55 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -268,7 +268,7 @@ class documentController extends document
 		}
 		// If the tile is empty, extract string from the contents.
 		settype($obj->title, "string");
-		if($obj->title == '') $obj->title = cut_str(strip_tags($obj->content),20,'...');
+		if($obj->title == '') $obj->title = cut_str(trim(strip_tags(nl2br($obj->content))),20,'...');
 		// If no tile extracted from the contents, leave it untitled.
 		if($obj->title == '') $obj->title = 'Untitled';
 		// Remove XE's own tags from the contents.