   :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
+  (evil-define-key 'normal 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 "j") 'notmuch-tree-next-message)
  (evil-define-key 'normal notmuch-tree-mode-map (kbd "k") 'notmuch-tree-prev-message)
  (evil-define-key 'normal notmuch-tree-mode-map (kbd ")") 'notmuch-tree-next-thread)
  (evil-define-key 'normal notmuch-tree-mode-map (kbd "(") 'notmuch-tree-prev-thread)

  (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)

    "H" 'evil-next-buffer
    "L" 'evil-prev-buffer
    "e" 'notmuch-jump-search
    "q" 'notmuch-bury-or-kill-this-buffer
    "r" 'notmuch-poll-and-refresh-this-buffer
    "/" 'notmuch-search)

  ; Use consistent keybindings across multiple notmuch modes.
