diff --git a/apps/common/mobile/lib/view/collaboration/Comments.jsx b/apps/common/mobile/lib/view/collaboration/Comments.jsx
index e4daa793eb..1441624149 100644
--- a/apps/common/mobile/lib/view/collaboration/Comments.jsx
+++ b/apps/common/mobile/lib/view/collaboration/Comments.jsx
@@ -578,7 +578,7 @@ const pickLink = (message) => {
         if (result)
             subStr = subStr.substring(0, result.index);
         offset = arguments[arguments.length-2];
-        arrayComment.push({start: offset, end: subStr.length+offset, str: '<a onclick="window.open(href).focus()" href="' + subStr + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
+        arrayComment.push({start: offset, end: subStr.length+offset, str: <a onClick={() => window.open(subStr)}  href={subStr} target="_blank" data-can-copy="true">{subStr}</a>});
         return '';
     });
 
@@ -595,7 +595,7 @@ const pickLink = (message) => {
                         (offset<=item.start) && (offset+len>item.start));
                 });
                 if (!elem)
-                arrayComment.push({start: offset, end: len+offset, str: '<a onclick="window.open(href).focus()" href="' + ref + '" target="_blank" data-can-copy="true">' + subStr + '</a>'});
+                arrayComment.push({start: offset, end: len+offset, str: <a onClick={() => window.open(ref)} href={ref} target="_blank" data-can-copy="true">{subStr}</a>});
                 return '';
             });
 
@@ -608,20 +608,20 @@ const pickLink = (message) => {
                              (offset<=item.start) && (offset+len>item.start));
                 });
                 if (!elem)
-                arrayComment.push({start: offset, end: len+offset, str: '<a onclick="window.open(href).focus()" href="' + ref + '">' + subStr + '</a>'});
+                arrayComment.push({start: offset, end: len+offset, str: <a onClick={() => window.open(ref)} href={ref}>{subStr}</a>});
                 return '';
             });
 
             arrayComment = arrayComment.sort(function(item){ return item.start; });
-            let str_res = (arrayComment.length>0) ? ( Common.Utils.String.htmlEncode(message.substring(0, arrayComment[0].start)) + arrayComment[0].str) : Common.Utils.String.htmlEncode(message);
+            let str_res = (arrayComment.length>0) ? <label>{Common.Utils.String.htmlEncode(message.substring(0, arrayComment[0].start))} {arrayComment[0].str}</label> : <label>{Common.Utils.String.htmlEncode(message)}</label>;
             for (var i=1; i<arrayComment.length; i++) {
-                str_res += (Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, arrayComment[i].start)) + arrayComment[i].str);
+                str_res = <label>{str_res} {Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, arrayComment[i].start))} {arrayComment[i].str}</label>;
             }
             if (arrayComment.length>0) {
-                str_res += Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, message.length));
+                str_res = <label>{str_res} {Common.Utils.String.htmlEncode(message.substring(arrayComment[i-1].end, message.length))}</label>;
             }
-
             return str_res;
+            
 }
 
 // View comments
@@ -668,7 +668,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
                                 </div>
                                 <div slot='footer'>
                                     {comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
-                                    <div className='comment-text' dangerouslySetInnerHTML={{__html: pickLink(comment.comment)}}></div>
+                                    <div className='comment-text'>{pickLink(comment.comment)}</div>
                                     {comment.replies.length > 0 &&
                                     <ul className='reply-list'>
                                         {comment.replies.map((reply, indexReply) => {
@@ -698,7 +698,7 @@ const ViewComments = ({storeComments, storeAppOptions, onCommentMenuClick, onRes
                                                                     }
                                                                 </div>
                                                                 <div slot='footer'>
-                                                                    <div className='reply-text' dangerouslySetInnerHTML={{__html: pickLink(reply.reply)}}></div>
+                                                                    <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
                                                                 </div>
                                                             </div>
                                                         </div>
@@ -790,7 +790,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
                 </div>
                 <div slot='footer'>
                     {comment.quote && <div className='comment-quote'>{sliceQuote(comment.quote)}</div>}
-                    <div className='comment-text' dangerouslySetInnerHTML={{__html: pickLink(comment.comment)}}></div>
+                    <div className='comment-text'>{pickLink(comment.comment)}</div>
                     {comment.replies.length > 0 &&
                     <ul className='reply-list'>
                         {comment.replies.map((reply, indexReply) => {
@@ -820,7 +820,7 @@ const CommentList = inject("storeComments", "storeAppOptions")(observer(({storeC
                                                     }
                                                 </div>
                                                 <div slot='footer'>
-                                                    <div className='reply-text' dangerouslySetInnerHTML={{__html: pickLink(reply.reply)}}></div>
+                                                    <div className='reply-text'><pre>{pickLink(reply.reply)}</pre></div>
                                                 </div>
                                             </div>
                                         </div>