Index: lib/sup/modes/inbox-mode.rb
===================================================================
--- lib/sup/modes/inbox-mode.rb	(revision 668)
+++ lib/sup/modes/inbox-mode.rb	(working copy)
@@ -14,7 +14,9 @@
     @@instance = self
   end
 
-  def is_relevant? m; m.has_label? :inbox; end
+  def is_relevant? m
+    m.has_label? :inbox and ([:spam, :deleted, :killed] & m.labels).length == 0
+  end
 
   ## label-list-mode wants to be able to raise us if the user selects
   ## the "inbox" label, so we need to keep our singletonness around
Index: lib/sup/poll.rb
===================================================================
--- lib/sup/poll.rb	(revision 668)
+++ lib/sup/poll.rb	(working copy)
@@ -153,8 +153,8 @@
           end
 
           docid, entry = Index.load_entry_for_id m.id
+          HookManager.run "before-add-message", :message => m
           m = yield(m, offset, entry) or next
-          HookManager.run "before-add-message", :message => m
           Index.sync_message m, docid, entry
           UpdateManager.relay self, :add, m unless entry
         rescue MessageFormatError => e