diff --git a/app/views/templates/comment.handlebars b/app/views/templates/comment.handlebars
index 3ccaeb5dd..2960e55da 100644
--- a/app/views/templates/comment.handlebars
+++ b/app/views/templates/comment.handlebars
@@ -19,7 +19,7 @@
   </span>
 
   <div class="collapsible">
-    {{text}}
+    {{{text}}}
   </div>
 
   <div class="comment_info">
diff --git a/public/javascripts/app/views/comment_view.js b/public/javascripts/app/views/comment_view.js
index 3c97f5190..70a8a9753 100644
--- a/public/javascripts/app/views/comment_view.js
+++ b/public/javascripts/app/views/comment_view.js
@@ -10,14 +10,11 @@ app.views.Comment = app.views.Content.extend({
     "click .comment_delete": "destroyModel"
   },
 
-  initialize : function() {
-    $(this.el).attr("id", this.model.get("guid"));
-
-    return this;
-  },
-
   presenter : function() {
-    return _.extend(this.defaultPresenter(), {ownComment: this.ownComment()})
+    return _.extend(this.defaultPresenter(), {
+      ownComment: this.ownComment(),
+      text : app.helpers.textFormatter(this.model)
+    })
   },
 
   ownComment: function() {