diff --git a/app/views/photos/show.html.haml b/app/views/photos/show.html.haml
index d71b1f6bf..296f6fbb5 100644
--- a/app/views/photos/show.html.haml
+++ b/app/views/photos/show.html.haml
@@ -48,18 +48,19 @@
 
     .span-7.prepend-1
       .show_photo_attachments
-        - for photo in additional_photos
-          = link_to (image_tag photo.url(:thumb_small), :class => 'thumb_small'), photo_path(photo)
+        - for _photo in additional_photos
+          = link_to (image_tag _photo.url(:thumb_small), :class => 'thumb_small'), photo_path(_photo)
 
 
-    #photo_edit_options
-      %h4= t('.edit_delete_photo')
+  #photo_edit_options
+    %h4= t('.edit_delete_photo')
+    - if photo.status_message
       %p
         = form_for photo, :remote => true do |p|
           = p.text_field :text, :value => photo.text
           = p.submit t('.update_photo')
-      %p
-        = button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete
+    %p
+      = button_to t('.delete_photo'), photo, :confirm => t('are_you_sure'), :method => :delete
 
 .span-16.prepend-4.append-4.last
   #photo_stream.stream.show