diff --git a/modules/comment/comment.controller.php b/modules/comment/comment.controller.php
index 39ad11b4a..27a583f34 100644
--- a/modules/comment/comment.controller.php
+++ b/modules/comment/comment.controller.php
@@ -322,7 +322,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() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{
@@ -741,7 +741,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() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{
diff --git a/modules/document/document.controller.php b/modules/document/document.controller.php
index bfcfa4d06..8e18dc61a 100644
--- a/modules/document/document.controller.php
+++ b/modules/document/document.controller.php
@@ -281,7 +281,7 @@ class documentController extends document
 		if($obj->title == '') $obj->title = 'Untitled';
 		// 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() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{
@@ -491,7 +491,7 @@ class documentController extends document
 		if($obj->title == '') $obj->title = 'Untitled';
 		// 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() && $obj->use_editor != 'Y')
 		{
 			if($obj->use_html != 'Y')
 			{