   (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
+    "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
+    "zv" 'notmuch-search-from-tree-current-query                          ; like mu4e-conversation
     "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

    "cc" 'notmuch-mua-new-mail          ; like mu4e
    "cR" 'notmuch-show-reply
    "X" 'notmuch-show-archive-thread-then-exit
    "Z" 'notmuch-tree-from-show-current-query
    "a" 'notmuch-show-archive-message-then-next-or-next-thread
    "d" 'evil-collection-notmuch-show-toggle-delete
    "=" 'evil-collection-notmuch-show-toggle-flagged

    "g?" 'notmuch-help
    "q" 'notmuch-bury-or-kill-this-buffer
    "s" 'notmuch-search
    "S" 'notmuch-tree
    "C" 'notmuch-mua-new-mail           ; like mu4e
    "cc" 'notmuch-mua-new-mail          ; like mu4e
    "gr" 'notmuch-refresh-this-buffer
    "gA" 'notmuch-refresh-all-buffers
    "gR" 'notmuch-poll-and-refresh-this-buffer
    "J" 'notmuch-jump-search)

  (evil-collection-define-key 'normal 'notmuch-hello-mode-map
