diff --git a/app/views/templates/comment.jst b/app/views/templates/comment.jst
index e42f601a7..7397726dd 100644
--- a/app/views/templates/comment.jst
+++ b/app/views/templates/comment.jst
@@ -18,7 +18,9 @@
     </a>
   </span>
 
-  <%= text %>
+  <div class="collapsible">
+    <%= text %>
+  </div>
 
   <div class="comment_info">
     <time class="timeago" datetime="<%= created_at %>"/>
diff --git a/app/views/templates/status_message.jst b/app/views/templates/status_message.jst
index 06d04dd4d..6e3368359 100644
--- a/app/views/templates/status_message.jst
+++ b/app/views/templates/status_message.jst
@@ -12,6 +12,7 @@
     <% } %>
 <% } %>
 
-<%= text %>
-
-<%= o_embed_html %>
+<div class="collapsible">
+  <%= text %>
+  <%= o_embed_html %>
+</div>
diff --git a/public/javascripts/app/views/stream_object_view.js b/public/javascripts/app/views/stream_object_view.js
index 5f14bd23e..57b44d5dc 100644
--- a/public/javascripts/app/views/stream_object_view.js
+++ b/public/javascripts/app/views/stream_object_view.js
@@ -8,6 +8,7 @@ app.views.StreamObject = app.views.Base.extend({
     this.$(".collapsible").expander({
       slicePoint: 400,
       widow: 12,
+      expandPrefix: "",
       expandText: Diaspora.I18n.t("show_more"),
       userCollapse: false
     });