diff --git a/app/views/templates/comment.jst b/app/views/templates/comment.jst
index d6b355387..e42f601a7 100644
--- a/app/views/templates/comment.jst
+++ b/app/views/templates/comment.jst
@@ -18,9 +18,7 @@
     </a>
   </span>
 
-  <p class="collapsible">
-    <%= text %>
-  </p>
+  <%= text %>
 
   <div class="comment_info">
     <time class="timeago" datetime="<%= created_at %>"/>
diff --git a/config/assets.yml b/config/assets.yml
index c9a543c7d..41dcbcf6c 100644
--- a/config/assets.yml
+++ b/config/assets.yml
@@ -19,6 +19,7 @@ javascripts:
     - public/javascripts/app/models/*
     - public/javascripts/app/collections/*
     - public/javascripts/app/views/stream_object_view.js
+    - public/javascripts/app/views/content_view.js
     - public/javascripts/app/views/*
 
     - public/javascripts/rails.validations.js
diff --git a/public/javascripts/app/views/comment_view.js b/public/javascripts/app/views/comment_view.js
index 00c645ec6..167d4547b 100644
--- a/public/javascripts/app/views/comment_view.js
+++ b/public/javascripts/app/views/comment_view.js
@@ -1,4 +1,4 @@
-app.views.Comment = app.views.StreamObject.extend({
+app.views.Comment = app.views.Content.extend({
 
   template_name: "#comment-template",
 
diff --git a/public/javascripts/app/views/content_view.js b/public/javascripts/app/views/content_view.js
new file mode 100644
index 000000000..69f811461
--- /dev/null
+++ b/public/javascripts/app/views/content_view.js
@@ -0,0 +1,57 @@
+app.views.Content = app.views.StreamObject.extend({
+  presenter : function(){
+    var model = this.model
+    return _.extend(this.defaultPresenter(), {
+      text : metafyText(model.get("text"))
+    })
+
+    function metafyText(text) {
+      //we want it to return at least a <p> from markdown
+      text = text || ""
+      return mentionify(
+        hashtagify(
+          markdownify(text)
+        )
+      )
+    }
+
+    function markdownify(text){
+      //markdown returns falsy when it performs no substitutions, apparently...
+      return markdown.toHTML(text) || text
+    }
+
+    function hashtagify(text){
+      var utf8WordCharcters =/(\s|^|>)#([\u0080-\uFFFF|\w|-]+|&lt;3)/g
+      return text.replace(utf8WordCharcters, function(hashtag, preceeder, tagText) {
+        return preceeder + "<a href='/tags/" + tagText + "' class='tag'>#" + tagText + "</a>"
+      })
+    }
+
+    function mentionify(text) {
+      var mentionRegex = /@\{([^;]+); ([^\}]+)\}/g
+      return text.replace(mentionRegex, function(mentionText, fullName, diasporaId) {
+        var personId = _.find(model.get("mentioned_people"), function(person){
+          return person.diaspora_id == diasporaId
+        }).id
+
+
+        return "<a href='/people/" + personId + "' class='mention'>" + fullName + "</a>"
+      })
+      return text
+    }
+  }
+})
+
+
+app.views.StatusMessage = app.views.Content.extend({
+  template_name : "#status-message-template"
+});
+
+app.views.Reshare = app.views.Content.extend({
+  template_name : "#reshare-template"
+});
+
+app.views.ActivityStreams__Photo = app.views.Content.extend({
+  template_name : "#activity-streams-photo-template"
+});
+
diff --git a/public/javascripts/app/views/post_content_view.js b/public/javascripts/app/views/post_content_view.js
deleted file mode 100644
index 8c47cb2d0..000000000
--- a/public/javascripts/app/views/post_content_view.js
+++ /dev/null
@@ -1,61 +0,0 @@
-(function(){
-  var postContentView = app.views.StreamObject.extend({
-    presenter : function(){
-      var model = this.model
-      return _.extend(this.defaultPresenter(), {
-        text : metafyText(model.get("text"))
-      })
-
-      function metafyText(text) {
-        //we want it to return at least a <p> from markdown
-        text = text || ""
-        return mentionify(
-          hashtagify(
-            markdownify(text)
-          )
-        )
-      }
-
-      function markdownify(text){
-        //markdown returns falsy when it performs no substitutions, apparently...
-        return markdown.toHTML(text) || text
-      }
-
-      function hashtagify(text){
-        var utf8WordCharcters =/(\s|^|>)#([\u0080-\uFFFF|\w|-]+|&lt;3)/g
-        return text.replace(utf8WordCharcters, function(hashtag, preceeder, tagText) {
-          return preceeder + "<a href='/tags/" + tagText + "' class='tag'>#" + tagText + "</a>"
-        })
-      }
-
-      function mentionify(text) {
-        var mentionRegex = /@\{([^;]+); ([^\}]+)\}/g
-        return text.replace(mentionRegex, function(mentionText, fullName, diasporaId) {
-          var personId = _.find(model.get("mentioned_people"), function(person){
-            return person.diaspora_id == diasporaId
-          }).id
-
-
-          return "<a href='/people/" + personId + "' class='mention'>" + fullName + "</a>"
-        })
-        return text
-      }
-    }
-  })
-
-
-  app.views.StatusMessage = postContentView.extend({
-    template_name : "#status-message-template"
-  });
-
-  app.views.Reshare = postContentView.extend({
-    template_name : "#reshare-template"
-  });
-
-  app.views.ActivityStreams__Photo = postContentView.extend({
-    template_name : "#activity-streams-photo-template"
-  });
-})();
-
-
-