diff --git a/.emacs.d/lisp/init-mu4e.el b/.emacs.d/lisp/init-mu4e.el
index 736d4f3f..6499d5c6 100644
--- a/.emacs.d/lisp/init-mu4e.el
+++ b/.emacs.d/lisp/init-mu4e.el
@@ -356,8 +356,10 @@ If MSG is nil, use message at point."
    (lambda (b)
      (with-current-buffer b
        (or
+        (derived-mode-p 'mu4e-main-mode)
         (derived-mode-p 'mu4e-headers-mode)
         (derived-mode-p 'mu4e-view-mode)
+        (derived-mode-p 'mu4e-compose-mode)
         (when (require 'mu4e-conversation nil 'noerror)
           (mu4e-conversation--buffer-p b)))))
    ambrevar/mu4e-headers))