diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
deleted file mode 100644
index 9cfd533f0e5ccef8700bdb8f7b4d9e9249664ea8..0000000000000000000000000000000000000000
--- a/app/views/status_messages/_status_message.haml
+++ /dev/null
@@ -1,19 +0,0 @@
--#   Copyright (c) 2010-2011, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-
-- if photos.size > 0
-  .photo_attachments
-    .big_stream_photo
-      = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link"
-    - if photos.size > 1
-      - if photos.size >= 8
-        - for photo in photos[1..8]
-          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
-      - else
-        - for photo in photos[1..photos.size]
-          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
-
-%div{:class => direction_for(post.text)}
-  != markdownify(post)
diff --git a/app/views/status_messages/_status_message.html.haml b/app/views/status_messages/_status_message.html.haml
index 7a0842cbefb792e182e0cfc2704eeb2e7bcea99c..ced71df868ec918ddb3735466c18598eebbd734f 100644
--- a/app/views/status_messages/_status_message.html.haml
+++ b/app/views/status_messages/_status_message.html.haml
@@ -2,17 +2,21 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-- if photos.size > 0
-  .photo_attachments
-    .big_stream_photo
-      = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link"
-    - if photos.size > 1
-      - if photos.size >= 8
-        - for photo in photos[1..8]
-          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
-      - else
-        - for photo in photos[1..photos.size]
-          = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
+- begin
+  - if photos.size > 0
+    .photo_attachments
+      .big_stream_photo
+        = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link"
+      - if photos.size > 1
+        - if photos.size >= 8
+          - for photo in photos[1..8]
+            = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
+        - else
+          - for photo in photos[1..photos.size]
+            = link_to (image_tag photo.url(:thumb_small), :class => 'stream-photo thumb_small', 'data-small-photo' => photo.url(:thumb_medium), 'data-full-photo' => photo.url), photo_path(photo), :class => 'stream-photo-link'
+- rescue
+  - nil
+
 
 %div{:class => [direction_for(post.text), 'collapsible']}
   != markdownify(post)