--- /dev/null
+Return-Path: <jrollins@finestructure.net>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by olra.theworths.org (Postfix) with ESMTP id 13648431FC3\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:56 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -2.3\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-2.3 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_MED=-2.3] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+ by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id yMudU-WPcgSA for <notmuch@notmuchmail.org>;\r
+ Mon, 14 Apr 2014 12:40:52 -0700 (PDT)\r
+Received: from outgoing-mail.its.caltech.edu (outgoing-mail.its.caltech.edu\r
+ [131.215.239.19])\r
+ by olra.theworths.org (Postfix) with ESMTP id 40010431FC0\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:52 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+ by fire-doxen-postvirus (Postfix) with ESMTP id DE03A32824B\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:51 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from finestructure.net (cpe-107-185-189-81.socal.res.rr.com\r
+ [107.185.189.81]) (Authenticated sender: jrollins)\r
+ by fire-doxen-submit (Postfix) with ESMTP id 98FE0328274\r
+ for <notmuch@notmuchmail.org>; Mon, 14 Apr 2014 12:40:50 -0700 (PDT)\r
+Received: by finestructure.net (Postfix, from userid 1000)\r
+ id 56CBC60123; Mon, 14 Apr 2014 12:40:50 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: [PATCH] emacs: remove auto-signing of replies to signed messages\r
+Date: Mon, 14 Apr 2014 12:40:50 -0700\r
+Message-Id: <1397504450-15498-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.9.1\r
+In-Reply-To: <87mwfnd9eh.fsf@tethera.net>\r
+References: <87mwfnd9eh.fsf@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Mon, 14 Apr 2014 19:40:56 -0000\r
+\r
+It was decided that auto-signing is potentially too troublesome for the\r
+apparently common case of users who enable crypto processing for the\r
+purpose of checking signature validity but who are not in a position to\r
+sign out-going messages. Users can still manually invoke signing as needed.\r
+\r
+Encrypting replies to encrypted messages is more of a security issue\r
+so we leave it in place.\r
+---\r
+ emacs/notmuch-mua.el | 7 +++----\r
+ 1 file changed, 3 insertions(+), 4 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+index bf6253f..95e4a4d 100644\r
+--- a/emacs/notmuch-mua.el\r
++++ b/emacs/notmuch-mua.el\r
+@@ -116,10 +116,9 @@ list."\r
+ notmuch-mua-hidden-headers))\r
+ \r
+ (defun notmuch-mua-reply-crypto (parts)\r
++ "Add mml sign-encrypt flag if any part of original message is encrypted."\r
+ (loop for part in parts\r
+- if (notmuch-match-content-type (plist-get part :content-type) "multipart/signed")\r
+- do (mml-secure-message-sign)\r
+- else if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")\r
++ if (notmuch-match-content-type (plist-get part :content-type) "multipart/encrypted")\r
+ do (mml-secure-message-sign-encrypt)\r
+ else if (notmuch-match-content-type (plist-get part :content-type) "multipart/*")\r
+ do (notmuch-mua-reply-crypto (plist-get part :content))))\r
+@@ -236,7 +235,7 @@ list."\r
+ ;; Quote the original message according to the user's configured style.\r
+ (message-cite-original)))\r
+ \r
+- ;; Sign and/or encrypt replies to signed and/or encrypted messages.\r
++ ;; Crypto processing based crypto content of the original message\r
+ (when process-crypto\r
+ (notmuch-mua-reply-crypto (plist-get original :body))))\r
+ \r
+-- \r
+1.9.1\r
+\r