[PATCH v2] emacs: Improve notmuch-message-mode initialization