diff --git a/modules/comment/comment.item.php b/modules/comment/comment.item.php
index 878f03141..8bc0a8dcd 100644
--- a/modules/comment/comment.item.php
+++ b/modules/comment/comment.item.php
@@ -363,7 +363,7 @@ class commentItem extends BaseObject
 		{
 			$content = cut_str($content, $strlen, '...');
 		}
-		return escape($content);
+		return escape($content, false);
 	}
 
 	/**
@@ -388,13 +388,13 @@ class commentItem extends BaseObject
 		{
 			$content = $this->get('content');
 		}
-		
-		$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
+
 		if($strlen)
 		{
+			$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
 			$content = cut_str($content, $strlen, '...');
 		}
-		return escape($content);
+		return escape($content, false);
 	}
 
 	/**
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 9aa1bb238..30a30c3fb 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -552,7 +552,7 @@ class documentItem extends BaseObject
 			$content = cut_str($content, $strlen, '...');
 		}
 		
-		return escape($content);
+		return escape($content, false);
 	}
 
 	function getContentText($strlen = 0)
@@ -570,13 +570,14 @@ class documentItem extends BaseObject
 		$content = $this->get('content');
 		$content = preg_replace_callback('/<(object|param|embed)[^>]*/is', array($this, '_checkAllowScriptAccess'), $content);
 		$content = preg_replace_callback('/<object[^>]*>/is', array($this, '_addAllowScriptAccess'), $content);
-		$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
+		
 		if($strlen)
 		{
+			$content = trim(utf8_normalize_spaces(html_entity_decode(strip_tags($content))));
 			$content = cut_str($content, $strlen, '...');
 		}
 		
-		return escape($content);
+		return escape($content, false);
 	}
 
 	function _addAllowScriptAccess($m)