diff --git a/app/views/messages/_short_message.html.haml b/app/views/messages/_short_message.html.haml
--- a/app/views/messages/_short_message.html.haml
+++ b/app/views/messages/_short_message.html.haml
@@ -1,7 +1,11 @@
 %tr
-  %td=h short_message.sender.full_name
+  - if short_message.sender
+    %td=h short_message.sender.full_name
+  - else
+    %td (user deleted)
   %td= "#{short_message.created_at}"
   %td=h truncate(short_message.body)
   %td
-    = link_to "[reply]", :action => 'show', :id => short_message.id
+    - if short_message.sender
+      = link_to "[reply]", :action => 'show', :id => short_message.id
     = link_to "[hide]", :action => 'hide', :id => short_message.id