--- /dev/null
+Return-Path: <jani@nikula.org>\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 BF9F7431FBC\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Feb 2012 10:03:23 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+ 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 nRjwZx43vaCt for <notmuch@notmuchmail.org>;\r
+ Sat, 4 Feb 2012 10:03:23 -0800 (PST)\r
+Received: from mail-lpp01m020-f181.google.com (mail-lpp01m020-f181.google.com\r
+ [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id B00CA431FAF\r
+ for <notmuch@notmuchmail.org>; Sat, 4 Feb 2012 10:03:22 -0800 (PST)\r
+Received: by lbbgn5 with SMTP id gn5so1113434lbb.26\r
+ for <notmuch@notmuchmail.org>; Sat, 04 Feb 2012 10:03:21 -0800 (PST)\r
+Received: by 10.112.82.197 with SMTP id k5mr3004630lby.83.1328378601057;\r
+ Sat, 04 Feb 2012 10:03:21 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe50f800-253.dhcp.inet.fi.\r
+ [84.248.80.253])\r
+ by mx.google.com with ESMTPS id os5sm8063565lab.13.2012.02.04.10.03.18\r
+ (version=SSLv3 cipher=OTHER); Sat, 04 Feb 2012 10:03:19 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] emacs: Improve prompting for user address when\r
+ replying.\r
+In-Reply-To: <1328375350-10352-3-git-send-email-markwalters1009@gmail.com>\r
+References: <1328375350-10352-1-git-send-email-markwalters1009@gmail.com>\r
+ <1328375350-10352-3-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.11+139~g4340989 (http://notmuchmail.org) Emacs/23.3.1\r
+ (i686-pc-linux-gnu)\r
+Date: Sat, 04 Feb 2012 20:03:13 +0200\r
+Message-ID: <87ipjmo4ri.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\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: Sat, 04 Feb 2012 18:03:23 -0000\r
+\r
+On Sat, 4 Feb 2012 17:09:10 +0000, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> This patch uses the new --from option to notmuch reply to allow it to\r
+> prompt the user for the From: address in cases when the cli does not\r
+> know the "correct" from address. If the cli does not it either uses\r
+> the users default address or, if notmuch-always-prompt-for-sender\r
+> is set, prompts the user.\r
+> ---\r
+> emacs/notmuch-mua.el | 47 ++++++++++++++++++++++++++++-------------------\r
+> 1 files changed, 28 insertions(+), 19 deletions(-)\r
+> \r
+> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el\r
+> index 41f82c2..36e62f9 100644\r
+> --- a/emacs/notmuch-mua.el\r
+> +++ b/emacs/notmuch-mua.el\r
+> @@ -51,6 +51,24 @@ list."\r
+> \r
+> ;;\r
+> \r
+> +(defcustom notmuch-identities nil\r
+> + "Identities that can be used as the From: address when composing a new message.\r
+> +\r
+> +If this variable is left unset, then a list will be constructed from the\r
+> +name and addresses configured in the notmuch configuration file."\r
+> + :type '(repeat string)\r
+> + :group 'notmuch-send)\r
+> +\r
+> +(defcustom notmuch-always-prompt-for-sender nil\r
+> + "Always prompt for the From: address when composing or forwarding a message.\r
+> +\r
+> +This is not taken into account when replying to a message, because in that case\r
+> +the From: header is already filled in by notmuch."\r
+> + :type 'boolean\r
+> + :group 'notmuch-send)\r
+> +\r
+> +(defvar notmuch-mua-sender-history nil)\r
+> +\r
+> (defun notmuch-mua-user-agent-full ()\r
+> "Generate a `User-Agent:' string suitable for notmuch."\r
+> (concat (notmuch-mua-user-agent-notmuch)\r
+> @@ -75,7 +93,7 @@ list."\r
+> (defun notmuch-mua-reply (query-string &optional sender reply-all)\r
+> (let (headers\r
+> body\r
+> - (args '("reply")))\r
+> + (args '("reply" "--from=fallback-received")))\r
+\r
+There are better reviewers for the rest of the emacs bits, but wouldn't\r
+it be better to just use the "notmuch reply" default when the user wants\r
+the current behaviour?\r
+\r
+BR,\r
+Jani.\r
+\r
+\r
+> (if notmuch-show-process-crypto\r
+> (setq args (append args '("--decrypt"))))\r
+> (if reply-all\r
+> @@ -99,6 +117,15 @@ list."\r
+> ;; If sender is non-nil, set the From: header to its value.\r
+> (when sender\r
+> (mail-header-set 'from sender headers))\r
+> + ;; If we do not have a From: header yet it means that\r
+> + ;; notmuch-reply.c was not able to make a useful guess so we fill\r
+> + ;; it in ourselves.\r
+> + (when (string= "" (mail-header 'from headers))\r
+> + (if notmuch-always-prompt-for-sender\r
+> + (setq sender (notmuch-mua-prompt-for-sender))\r
+> + (setq sender (concat\r
+> + (notmuch-user-name) " <" (notmuch-user-primary-email) ">")))\r
+> + (mail-header-set 'from sender headers))\r
+> (let\r
+> ;; Overlay the composition window on that being used to read\r
+> ;; the original message.\r
+> @@ -153,24 +180,6 @@ OTHER-ARGS are passed through to `message-mail'."\r
+> \r
+> (message-goto-to))\r
+> \r
+> -(defcustom notmuch-identities nil\r
+> - "Identities that can be used as the From: address when composing a new message.\r
+> -\r
+> -If this variable is left unset, then a list will be constructed from the\r
+> -name and addresses configured in the notmuch configuration file."\r
+> - :type '(repeat string)\r
+> - :group 'notmuch-send)\r
+> -\r
+> -(defcustom notmuch-always-prompt-for-sender nil\r
+> - "Always prompt for the From: address when composing or forwarding a message.\r
+> -\r
+> -This is not taken into account when replying to a message, because in that case\r
+> -the From: header is already filled in by notmuch."\r
+> - :type 'boolean\r
+> - :group 'notmuch-send)\r
+> -\r
+> -(defvar notmuch-mua-sender-history nil)\r
+> -\r
+> (defun notmuch-mua-prompt-for-sender ()\r
+> (interactive)\r
+> (let (name addresses one-name-only)\r
+> -- \r
+> 1.7.2.3\r
+> \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r