diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 55ab09a4e..5a6f0b981 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -16,8 +16,7 @@
     .from
       = person_link(post.author, :class => 'author')
       %time.timeago{:datetime => post.created_at}
-    %p
-      = render 'status_messages/status_message', :post => post, :photos => post.photos
+    = render 'status_messages/status_message', :post => post, :photos => post.photos
 
     .info
       - if post.public?
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index 02307026f..054136ff5 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -13,7 +13,6 @@
       - else
         - for photo in photos[1..photos.size]
           = link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo_path(photo)
-  = markdownify(post.text, :youtube_maps => post[:youtube_titles])
 
-- else
+%p
   = markdownify(post.text, :youtube_maps => post[:youtube_titles])