       "cr" 'notmuch-search-reply-to-thread-sender
       "cR" 'notmuch-search-reply-to-thread
       "t" 'notmuch-search-filter-by-tag
-      "z" 'notmuch-search-stash-map
+      "y" 'notmuch-search-stash-map
       [mouse-1] 'notmuch-search-show-thread
       "-" 'notmuch-search-remove-tag
       "+" 'notmuch-search-add-tag

  (evil-collection-define-key 'normal 'notmuch-tree-mode-map
    "g?" (notmuch-tree-close-message-pane-and 'notmuch-help)
    "q" 'notmuch-tree-quit
    "s" 'notmuch-tree-to-search
    "C" (notmuch-tree-close-message-pane-and 'notmuch-mua-new-mail) ; like mu4e
    "cc" (notmuch-tree-close-message-pane-and 'notmuch-mua-new-mail) ; like mu4e
    "J" (notmuch-tree-close-message-pane-and 'notmuch-jump-search)
    "S" 'notmuch-search-from-tree-current-query
    "cr" (notmuch-tree-close-message-pane-and 'notmuch-show-reply-sender) ; like mu4e
    "cR" (notmuch-tree-close-message-pane-and 'notmuch-show-reply)
    "d" 'evil-collection-notmuch-tree-toggle-delete


  (evil-collection-define-key 'normal 'notmuch-show-mode-map
    "gd" 'goto-address-at-point
    "p" 'notmuch-show-save-attachments  ; like mu4e
    "A" 'notmuch-show-archive-thread-then-next
    "S" 'notmuch-show-filter-thread
    "K" 'notmuch-tag-jump
