diff --git a/andrea/macro-comments.ftl b/andrea/macro-comments.ftl
index 568b721..d21d323 100644
--- a/andrea/macro-comments.ftl
+++ b/andrea/macro-comments.ftl
@@ -157,7 +157,7 @@
         }
         
         commentHTML += '&nbsp;' + result.commentDate + '<div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + Util.replaceEmString($("#comment" + state).val())
             + '</div><div><a rel="nofollow" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div></div><div class="clear"></div></div>';
diff --git a/bruce/macro-comments.ftl b/bruce/macro-comments.ftl
index 45cb6ef..54dff9a 100644
--- a/bruce/macro-comments.ftl
+++ b/bruce/macro-comments.ftl
@@ -155,8 +155,7 @@
                             commentHTML += '<span class="gray">•' + result.commentDate.substring(2, 16)
                                     + '• <a rel="nofollow" href="javascript:replyTo('
                                     + result.oId + ');">Reply</a></span></div><div class="row">' +
-                            Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").
-                                    replace(/>/g, "&gt;").replace(/\n/g, "<br/>")) + '</div>';
+                            Util.replaceEmString($("#comment" + state).val()) + '</div>';
 
                             return commentHTML;
                         };
diff --git a/classic/macro-comments.ftl b/classic/macro-comments.ftl
index 45484c1..001df17 100644
--- a/classic/macro-comments.ftl
+++ b/classic/macro-comments.ftl
@@ -162,7 +162,7 @@
             + '<div class="left comment-picture"><img alt="' + result.userName
             + '" src="' + result.commentThumbnailURL + '"/>'
             + '</div><div class="comment-content">' + 
-            Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            Util.replaceEmString($("#comment" + state).val())
             + '</div><div class="clear"></div>'
             + '</div></div></div>';
         return commentHTML;
diff --git a/community/macro-comments.ftl b/community/macro-comments.ftl
index a5e4c90..5a49a6e 100644
--- a/community/macro-comments.ftl
+++ b/community/macro-comments.ftl
@@ -166,7 +166,7 @@
         }
 
         commentHTML += '&nbsp;' + result.commentDate
-            + '</div><div class="comment-content">' + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + '</div><div class="comment-content">' + Util.replaceEmString($("#comment" + state).val())
             + '</div><div class="clear"></div><div class="reply"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>'
             + '</div></div><div class="clear"></div></div>';
 
diff --git a/ease/macro-comments.ftl b/ease/macro-comments.ftl
index 78facac..43a4f1a 100644
--- a/ease/macro-comments.ftl
+++ b/ease/macro-comments.ftl
@@ -141,7 +141,7 @@
                            commentHTML += '</div><div class="right ft-gray">' + result.commentDate.substring(2, 16)
                                    + '&nbsp;<a rel="nofollow" href="javascript:replyTo(\'' + result.oId
                                    + '\');">${replyLabel}</a></div><span class="clear"></span><div class="article-body">' +
-                                   Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                   Util.replaceEmString($("#comment" + state).val())
                                    + '</div></div><span class="clear"></span></div>';
 
                            return commentHTML;
diff --git a/favourite/macro-comments.ftl b/favourite/macro-comments.ftl
index 97b4933..5812f9d 100644
--- a/favourite/macro-comments.ftl
+++ b/favourite/macro-comments.ftl
@@ -150,7 +150,7 @@
         commentHTML += '</div><div class="right"> <a rel="nofollow" class="no-underline" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div><div class="clear"></div><div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + Util.replaceEmString($("#comment" + state).val())
             + '</div></div><div class="clear"></div></div></div>';
 
         $("#comments").addClass("comments");
diff --git a/finding/macro-comments.ftl b/finding/macro-comments.ftl
index f73775e..9e57ff8 100644
--- a/finding/macro-comments.ftl
+++ b/finding/macro-comments.ftl
@@ -135,7 +135,7 @@
                                 commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>';
                             }
                             commentHTML += '</div><div class="comment-content">' +
-                                    Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                    Util.replaceEmString($("#comment" + state).val())
                                     + '</div></div></li>';
                             return commentHTML;
                         };
diff --git a/i-nove/macro-comments.ftl b/i-nove/macro-comments.ftl
index e2dce04..e07ed8d 100644
--- a/i-nove/macro-comments.ftl
+++ b/i-nove/macro-comments.ftl
@@ -146,7 +146,7 @@
         commentHTML += '</div><div class="right"> <a rel="nofollow" class="no-underline" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div><div class="clear"></div><div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + Util.replaceEmString($("#comment" + state).val())
             + '</div></div><div class="clear"></div></div></div>';
 
         $("#comments").addClass("comments");
diff --git a/metro-hot/macro-comments.ftl b/metro-hot/macro-comments.ftl
index 5e02af9..e958494 100644
--- a/metro-hot/macro-comments.ftl
+++ b/metro-hot/macro-comments.ftl
@@ -157,7 +157,7 @@
                                 + '\');" title="${replyLabel}"></a>'
                                 + '<div class="fn-right" data-ico="&#xe200;"> ' + result.commentDate.substring(2, 16)
                                 + '</div></div><div class="article-body">' +
-                                Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                Util.replaceEmString($("#comment" + state).val())
                                 + '</div></div></div>';
 
                         return commentHTML;
diff --git a/neoease/macro-comments.ftl b/neoease/macro-comments.ftl
index b894185..910fd25 100644
--- a/neoease/macro-comments.ftl
+++ b/neoease/macro-comments.ftl
@@ -145,7 +145,7 @@
         commentHTML += '</div><div class="right"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId 
             + '\');">${replyLabel}</a>' + ' &nbsp;|&nbsp;' +  result.commentDate
             + '</div><span class="clear"></span><div class="article-body">' + 
-            Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            Util.replaceEmString($("#comment" + state).val())
             + '</div></div><span class="clear"></span></div>';
 
         return commentHTML;
diff --git a/owmx-3.0/macro-comments.ftl b/owmx-3.0/macro-comments.ftl
index 82e44a6..df847a4 100644
--- a/owmx-3.0/macro-comments.ftl
+++ b/owmx-3.0/macro-comments.ftl
@@ -149,7 +149,7 @@
         commentHTML += '</div><div class="right"> <a rel="nofollow" class="no-underline" href="javascript:replyTo(\''
             + result.oId + '\');">${replyLabel}</a>'
             +'</div><div class="clear"></div><div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + Util.replaceEmString($("#comment" + state).val())
             + '</div></div><div class="clear"></div></div></div>';
         
         $("#comments").addClass("comments");
diff --git a/timeline/macro-comments.ftl b/timeline/macro-comments.ftl
index d2a2710..b46b445 100644
--- a/timeline/macro-comments.ftl
+++ b/timeline/macro-comments.ftl
@@ -131,7 +131,7 @@
                            commentHTML += '</span>&nbsp;<small><b>' + result.commentDate.substring(2, 16)
                                    + '</b></small><span class="ico-reply ico right"><a rel="nofollow" href="javascript:replyTo(\'' + result.oId
                                    + '\');">${replyLabel}</a></span><div class="article-body">'
-                                   + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                   + Util.replaceEmString($("#comment" + state).val())
                                    + '</div></div></li>';
 
                            return commentHTML;
diff --git a/tree-house/macro-comments.ftl b/tree-house/macro-comments.ftl
index cc459fd..2fd489b 100644
--- a/tree-house/macro-comments.ftl
+++ b/tree-house/macro-comments.ftl
@@ -162,7 +162,7 @@
             + '</div><div class="clear"></div></div><div><img alt="' + result.userName
             + '" src="' + result.commentThumbnailURL + '" class="comment-picture left"/>'
             + '<div class="comment-content">'
-            + Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g,"<br/>"))
+            + Util.replaceEmString($("#comment" + state).val())
             + '</div>'
             + ' <div class="clear"></div></div></div><div class="comment-bottom"></div></div></div>';
 
diff --git a/yilia/macro-comments.ftl b/yilia/macro-comments.ftl
index e227dad..e58bd12 100644
--- a/yilia/macro-comments.ftl
+++ b/yilia/macro-comments.ftl
@@ -131,7 +131,7 @@
                                 commentHTML += '<a class="fn-right" href="javascript:replyTo(\'' + result.oId + '\');">${replyLabel}</a>';
                             }
                             commentHTML += '</div><div class="comment-content">' +
-                                    Util.replaceEmString($("#comment" + state).val().replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/\n/g, "<br/>"))
+                                    Util.replaceEmString($("#comment" + state).val())
                                     + '</div></div></li>';
                             return commentHTML;
                         };