       :key "f")
      (:name "Drafts"
       :query "tag:draft"
-      :key "d"))))
-
-(add-to-list 'notmuch-tagging-keys
-  `(,(kbd "b") ("+blacklisted" "+spam") "Blacklisted"))
-
-(add-to-list 'notmuch-tagging-keys
-  `(,(kbd "u") ("+unread") "Mark unread"))
+      :key "d")))
+ '(notmuch-tagging-keys
+  '(("a" notmuch-archive-tags "Archive")
+    ("b" ("+blacklisted" "+spam") "Blacklisted")
+    ("d" ("+deleted" "+move") "Delete")
+    ("f" ("+flagged") "Flag")
+    ("r" notmuch-show-mark-read-tags "Mark read")
+    ("s" ("+spam" "+move") "Mark as spam")
+    ("u" ("+unread") "Mark unread"))))
 
 (defmacro pjones:evil-override-notmuch (mode &rest bindings)
   "Override MODE bindings in evil-normal mode with BINDINGS."
   (declare (indent defun))
   `(pjones:evil-override-mode ,mode
      ,@bindings
+     "d" #'pjones:notmuch-delete-thread
      "c" #'notmuch-mua-new-mail
      "gR" #'notmuch-poll-and-refresh-this-buffer
      "gr" #'notmuch-refresh-this-buffer
      "H" #'notmuch-help
+     "M" #'pjones:notmuch-move-message
      "q" #'notmuch-bury-or-kill-this-buffer
      "s" #'notmuch-search
      "'" #'notmuch-jump-search))

 '(notmuch-hello-thousands-separator ",")
 '(notmuch-mua-cite-function #'message-cite-original-without-signature)
 '(notmuch-draft-folder ".Drafts")
 '(notmuch-archive-tags '("+archived"))
 '(notmuch-fcc-dirs ".Sent +sent +from-me")
 '(notmuch-message-replied-tags '("+replied" "+from-me"))
 '(notmuch-message-forwarded-tags '("+forwarded" "+from-me"))
 '(notmuch-mua-user-agent-function 'notmuch-mua-user-agent-full)
 '(notmuch-saved-searches
   '((:name "Inbox"
      :query "folder:INBOX"
      :count-query "folder:INBOX and tag:unread"
      :key "i")
     (:name "Unread"
      :query "tag:unread"

;;; Commentary:
;;
;;; Code:
(require 'dash)
(require 'evil)
(require 'evil-leader)
(require 'message)
(require 'notmuch)
(require 's)

(eval-when-compile
  (require 'notmuch-tree)
