diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index 7886fd040..376fca4d7 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -23,7 +23,7 @@
 
         .right
           = render 'shared/reshare', :current_user => current_user, :post => post if post.is_a? StatusMessage
-          = link_to t('delete'), object_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
+          = link_to t('delete'), status_message_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete"
 
     = render 'status_messages/status_message', :post => post
 
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index 0a28aac9d..847f6ae4e 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -8,5 +8,5 @@
 - if post.photos.count > 0
   .photo_attachments
     - for photo in post.photos
-      = link_to (image_tag photo.url(:thumb_medium)), object_path(photo)
+      = link_to (image_tag photo.url(:thumb_medium)), photo_path(photo)