      notmuch-tree-mode-map
      notmuch-search-mode-map)
    '(
-      (:key "g" :func notmuch-refresh-this-buffer)
+      (:key "r" :func notmuch-refresh-this-buffer)
     ))
 
   (evil-define-key 'normal notmuch-tree-mode-map "A" (lambda () (interactive) (l/toggle-tag-list '("-inbox" "+archived") t)))

  :defer t
  :config

  ; It's easier to make notmuch-hello-mode's Emacs state behave more sanely than
  ; to make it use Normal state.
  (evil-set-initial-state 'notmuch-hello-mode 'emacs)

  ; Bindings.
  (evil-define-key 'emacs notmuch-hello-mode-map
    "h" 'widget-backward
    "j" 'widget-forward
    "k" 'widget-backward

  (evil-define-key 'normal notmuch-show-mode-map "r" 'notmuch-show-reply)
  (evil-define-key 'normal notmuch-show-mode-map "R" 'notmuch-show-reply-sender)

  (evil-define-key 'normal notmuch-tree-mode-map (kbd "<down>") 'notmuch-tree-next-message)
  (evil-define-key 'normal notmuch-tree-mode-map (kbd "<up>") 'notmuch-tree-prev-message)
  (evil-define-key 'normal notmuch-tree-mode-map (kbd "S-<down>") (lambda () (interactive) (notmuch-tree-next-thread) (notmuch-tree-show-message-in)))
  (evil-define-key 'normal notmuch-tree-mode-map (kbd "S-<up>") (lambda () (interactive) (notmuch-tree-prev-thread) (notmuch-tree-show-message-in)))

  (evil-define-key 'normal notmuch-search-mode-map (kbd "RET") 'notmuch-search-show-thread)
  (evil-define-key 'normal notmuch-tree-mode-map   (kbd "RET") 'notmuch-tree-show-message)
