cli/insert: delay database open until after writing mail file

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index fadf20fec7a7d6312ec8ad86d744b8743e9a129d..55bc267205756392fdbd6f243a420e0762b6c0a5 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -253,8 +253,11 @@ mutiple parts get a header."
                       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
                       ;; Don't indent multipart sub-parts.
                       (notmuch-show-indent-multipart nil))
-                   (notmuch-show-insert-body original (plist-get original :body) 0)
-                   (buffer-substring-no-properties (point-min) (point-max)))))
+                   ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
+                   (letf (((symbol-function 'notmuch-crypto-insert-sigstatus-button) #'ignore)
+                          ((symbol-function 'notmuch-crypto-insert-encstatus-button) #'ignore))
+                         (notmuch-show-insert-body original (plist-get original :body) 0)
+                         (buffer-substring-no-properties (point-min) (point-max))))))
 
        (set-mark (point))
        (goto-char start)