Merge tag '0.18.2'

[notmuch] / emacs / notmuch-mua.el

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index bf6253fc4669638da27b934063deb0fe035c75f9..2c5888600b6c6d2af795b39302d061935cf7aa0b 100644 (file)
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -116,10 +116,9 @@ list."
        notmuch-mua-hidden-headers))
 
 (defun notmuch-mua-reply-crypto (parts)
+  "Add mml sign-encrypt flag if any part of original message is encrypted."
   (loop for part in parts
-       if (notmuch-match-content-type (plist-get part :content-type) "multipart/signed")
-         do (mml-secure-message-sign)
-       else if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")
+       if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")
          do (mml-secure-message-sign-encrypt)
        else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")
          do (notmuch-mua-reply-crypto (plist-get part :content))))
@@ -236,7 +235,7 @@ list."
        ;; Quote the original message according to the user's configured style.
        (message-cite-original)))
 
-    ;; Sign and/or encrypt replies to signed and/or encrypted messages.
+    ;; Crypto processing based crypto content of the original message
     (when process-crypto
       (notmuch-mua-reply-crypto (plist-get original :body))))
 
@@ -347,7 +346,8 @@ the From: address first."
     (message-forward-make-body cur)
     ;; `message-forward-make-body' shows the User-agent header.  Hide
     ;; it again.
-    (message-hide-headers)))
+    (message-hide-headers)
+    (set-buffer-modified-p nil)))
 
 (defun notmuch-mua-new-reply (query-string &optional prompt-for-sender reply-all)
   "Compose a reply to the message identified by QUERY-STRING.