diff --git a/emacs/notmuch.el b/emacs/notmuch.el
index 9c7f2020..68a4c0b1 100644
--- a/emacs/notmuch.el
+++ b/emacs/notmuch.el
@@ -1058,8 +1058,9 @@ current search results AND that are tagged with the given tag."
   (with-current-buffer b
     (memq major-mode '(notmuch-show-mode
 		       notmuch-search-mode
+		       notmuch-tree-mode
 		       notmuch-hello-mode
-		       message-mode))))
+		       notmuch-message-mode))))
 
 ;;;###autoload
 (defun notmuch-cycle-notmuch-buffers ()