diff --git a/lms/static/coffee/src/discussion/content.coffee b/lms/static/coffee/src/discussion/content.coffee
index d94f79ac25..95eef8cda8 100644
--- a/lms/static/coffee/src/discussion/content.coffee
+++ b/lms/static/coffee/src/discussion/content.coffee
@@ -284,11 +284,11 @@ if Backbone?
         view = {}
         view.id = @model.id
         if @model.get('type') == 'thread'
-          view.title = @$(".thread-raw-title").html()
-          view.body = @$(".thread-raw-body").html()
-          view.tags = @$(".thread-raw-tags").html()
+          view.title = @model.get('title')
+          view.body = @model.get('body')
+          view.tags = @model.get('tags')
         else
-          view.body = @$(".comment-raw-body").html()
+          view.body = @model.get('body')
         @$discussionContent().append Mustache.render DiscussionUtil.getTemplate("_edit_#{@model.get('type')}"), view
         DiscussionUtil.makeWmdEditor @$el, $.proxy(@$, @), "#{@model.get('type')}-body-edit"
         @$(".thread-tags-edit").tagsInput DiscussionUtil.tagsInputOptions()
diff --git a/lms/templates/discussion/mustache/_content.mustache b/lms/templates/discussion/mustache/_content.mustache
index 91330dd0d8..a5089793e7 100644
--- a/lms/templates/discussion/mustache/_content.mustache
+++ b/lms/templates/discussion/mustache/_content.mustache
@@ -16,19 +16,16 @@
       </ul>
       {{#thread}}
         <a class="thread-title" name="{{content.id}}" href="javascript:void(0)">{{content.displayed_title}}</a>
-        <div class="thread-raw-title" style="display: none">{{{content.title}}}</div>
       {{/thread}}
       <div class="discussion-content-view">
         <a name="{{content.id}}" style="width: 0; height: 0; padding: 0; border: none;"></a>
         <div class="content-body {{content.type}}-body" id="content-body-{{content.id}}">{{content.displayed_body}}</div>
-        <div class="content-raw-body {{content.type}}-raw-body" style="display: none">{{{content.body}}}</div>
         {{#thread}}
           <div class="thread-tags">
             {{#content.tags}}
               <a class="thread-tag" href="{{##url_for_tags}}{{.}}{{/url_for_tags}}">{{.}}</a>
             {{/content.tags}}
           </div>
-          <div class="thread-raw-tags" style="display: none">{{content.raw_tags}}</div>
         {{/thread}}
         <div class="info">
           <div class="comment-time">