--- /dev/null
+Return-Path: <amdragon@mit.edu>\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 3C066431FAF\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Feb 2012 21:59:24 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+ tests=[RCVD_IN_DNSWL_LOW=-0.7] 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 8CgtjXtMHxST for <notmuch@notmuchmail.org>;\r
+ Mon, 20 Feb 2012 21:59:23 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-5.mit.edu (DMZ-MAILSEC-SCANNER-5.MIT.EDU\r
+ [18.7.68.34])\r
+ by olra.theworths.org (Postfix) with ESMTP id 929DC431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 20 Feb 2012 21:59:23 -0800 (PST)\r
+X-AuditID: 12074422-b7fd66d0000008f9-de-4f4332badb61\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+ by dmz-mailsec-scanner-5.mit.edu (Symantec Messaging Gateway) with SMTP\r
+ id 2F.17.02297.AB2334F4; Tue, 21 Feb 2012 00:59:23 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+ by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q1L5xMQx027803; \r
+ Tue, 21 Feb 2012 00:59:22 -0500\r
+Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91])\r
+ (authenticated bits=0)\r
+ (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+ by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q1L5xKev014435\r
+ (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+ Tue, 21 Feb 2012 00:59:21 -0500 (EST)\r
+Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.77)\r
+ (envelope-from <amdragon@mit.edu>)\r
+ id 1Rziky-0001bB-LG; Tue, 21 Feb 2012 00:59:20 -0500\r
+Date: Tue, 21 Feb 2012 00:59:20 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+Subject: Re: [PATCH v5.2 7/7] emacs: Use the new JSON reply format and\r
+ message-cite-original\r
+Message-ID: <20120221055920.GA30513@mit.edu>\r
+References: <1329361957-28493-1-git-send-email-awg+notmuch@xvx.ca>\r
+ <1329361957-28493-8-git-send-email-awg+notmuch@xvx.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+Content-Disposition: inline\r
+In-Reply-To: <1329361957-28493-8-git-send-email-awg+notmuch@xvx.ca>\r
+User-Agent: Mutt/1.5.21 (2010-09-15)\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFmpmleLIzCtJLcpLzFFi42IR4hRV1t1t5OxvMOUMk8WRPbPYLa7fnMns\r
+ wOTxbNUtZo+mH4tZA5iiuGxSUnMyy1KL9O0SuDI+zVjDUrBOoGLnwscsDYwzeLsYOTkkBEwk\r
+ 2pdOZIWwxSQu3FvP1sXIxSEksI9R4uiPblYIZwOjxJsJX5lBqoQETjJJvL/gB5FYwijxpO0I\r
+ WDuLgKpE64597CA2m4CGxLb9yxlBbBEBLYkf67+C1TALSEt8+93MBGILC8RJfPt+BayeV0BH\r
+ YtGemawQC6olJvefYYaIC0qcnPmEBaJXS+LGv5dAvRxgc5b/4wAJcwo4SzS9+A22SlRARWLK\r
+ yW1sExiFZiHpnoWkexZC9wJG5lWMsim5Vbq5iZk5xanJusXJiXl5qUW6pnq5mSV6qSmlmxhB\r
+ Yc3uorSD8edBpUOMAhyMSjy8nKVO/kKsiWXFlbmHGCU5mJREeVcYOPsL8SXlp1RmJBZnxBeV\r
+ 5qQWH2KU4GBWEuHdpAmU401JrKxKLcqHSUlzsCiJ86prvfMTEkhPLEnNTk0tSC2CycpwcChJ\r
+ 8JoC41dIsCg1PbUiLTOnBCHNxMEJMpwHaLg6SA1vcUFibnFmOkT+FKOilDhEQgAkkVGaB9cL\r
+ SzuvGMWBXhHmNQSp4gGmLLjuV0CDmYAGt/x3BBlckoiQkmpgLLrA2cNf1Pb/qWfop2oPqZza\r
+ 8M8dras2rgu0kO5fLX7qJftPZ5WjGiUikrZsXVOMt6dpFWWUf76y/afZjVvXWPo7zb/ybtq4\r
+ 50v2hfLCevv5s/u6szl23Rdg+yb02jpuq1Ou/tv0NRY3bpVUL6+zdJEs+SoqvifmJvOE0z6V\r
+ uZOZ2mdH7VilxFKckWioxVxUnAgAdhFT5hYDAAA=\r
+Cc: notmuch@notmuchmail.org\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: Tue, 21 Feb 2012 05:59:24 -0000\r
+\r
+Quoth Adam Wolfe Gordon on Feb 15 at 8:12 pm:\r
+> Use the new JSON reply format to create replies in emacs. Quote HTML\r
+> parts nicely by using mm-display-part to turn them into displayable\r
+> text, then quoting them with message-cite-original. This is very\r
+> useful for users who regularly receive HTML-only email.\r
+> \r
+> Use message-mode's message-cite-original function to create the\r
+> quoted body for reply messages. In order to make this act like the\r
+> existing notmuch defaults, you will need to set the following in\r
+> your emacs configuration:\r
+> \r
+> message-citation-line-format "On %a, %d %b %Y, %f wrote:"\r
+> message-citation-line-function 'message-insert-formatted-citation-line\r
+\r
+I've been thinking about this more. message-mode's default citation\r
+line is really unfortunate and quite possibly insane ("writes" isn't\r
+even the right tense and what's up with that extra line break?). The\r
+option to change this is also well hidden (as an experiment, I tried\r
+navigating to it through customize and couldn't figure out where it\r
+was, even though I knew what I was looking for). In general, I'm a\r
+fan of inheriting as many options from Emacs as possible, but people\r
+*are* going to ask how to change this and the default setting *is*\r
+going to turn people off of notmuch ("What mail client do you use that\r
+generates those quirky citation lines?" "I use notmuch!" "Is that,\r
+like, from the 80's?").\r
+\r
+So, what about adding a notmuch customize option for selecting the\r
+citation line format? It could offer a few const choices, including a\r
+default, sane format, plus the option to enter your own or to fall\r
+back to whatever message-mode is configured to do. If we do this,\r
+it's probably best done in a follow-up series, but this seemed like an\r
+appropriate place to bring it up.\r
+\r
+> The tests have been updated to reflect the (ugly) emacs default.\r
+> ---\r
+> emacs/notmuch-lib.el | 6 ++\r
+> emacs/notmuch-mua.el | 127 +++++++++++++++++++++++++++++++++++---------------\r
+> test/emacs | 8 ++--\r
+> 3 files changed, 100 insertions(+), 41 deletions(-)\r