diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index bed4696d9..17b264d6b 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -318,7 +318,7 @@ class commentController extends comment
 		// remove XE's own tags from the contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && !$manual_inserted)
 		{
 			if($obj->use_html != 'Y')
 			{
@@ -721,7 +721,7 @@ class commentController extends comment
 		// remove XE's wn tags from contents
 		$obj->content = preg_replace('!<\!--(Before|After)(Document|Comment)\(([0-9]+),([0-9]+)\)-->!is', '', $obj->content);
 
-		if(Mobile::isFromMobilePhone())
+		if(Mobile::isFromMobilePhone() && !$manual_inserted)
 		{
 			if($obj->use_html != 'Y')
 			{