diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index a985ccdbdc926b64a50a9917f5028cc5ca11e39c..cd1aa377cc904661820e9e23ea51ed12fea80610 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -2,7 +2,6 @@
 -#   licensed under the Affero General Public License version 3 or later.  See
 -#   the COPYRIGHT file.
 
-= markdownify(post.message, :youtube_maps => post[:youtube_titles])
 
 - if photos.size > 0
   .photo_attachments
@@ -14,3 +13,7 @@
       - else
         - for photo in photos[1..photos.size]
           = link_to (image_tag photo.url(:thumb_small)), photo_path(photo)
+  = markdownify(post.message, :youtube_maps => post[:youtube_titles])
+
+- else
+  = markdownify(post.message, :youtube_maps => post[:youtube_titles])