--- /dev/null
+Return-Path: <dme@dme.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 24693431FDD\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:30:02 -0700 (PDT)\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 3SnubFxaaNJL for <notmuch@notmuchmail.org>;\r
+ Mon, 12 May 2014 05:29:53 -0700 (PDT)\r
+Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com\r
+ [209.85.212.171]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id E3F06431FDE\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:36 -0700 (PDT)\r
+Received: by mail-wi0-f171.google.com with SMTP id hm4so4353473wib.10\r
+ for <notmuch@notmuchmail.org>; Mon, 12 May 2014 05:29:35 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=1e100.net; s=20130820;\r
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to\r
+ :references;\r
+ bh=Nj9CxPnLwyXs1lRCnTvOSixN/gJ/+TzFWSIXH9K0WGE=;\r
+ b=LzNA9f/gqAdnXz3PqKbPeuscvI6zmj7A077XwwXFTknmIG5yHOobh2XAzTXclm62yw\r
+ 8myGt7u8NIEOCFaTEVicZWGeuIkV4UMr4Y1V0rFcIpx01OdjPwtRymNfFd/tpFJhntH1\r
+ r5vokssIrwxY0pxh6oQ5aNWoxCt++C5U7mYc9Yc98ePj1Zk0yBhGiw1txBpB3cvO/vjm\r
+ fMWR3oZ6nSqqLyh0ilyulP2R1cgT4whA133g9aRi92ZDNIMcBigM5r2mBqS4Zp4anUpx\r
+ vMNAf+2O7Cni180D40d7fDSmeFEjAEU2lcRMIkAav0cP4CFcit/ucRec3scJT2scUVmJ\r
+ JczA==\r
+X-Gm-Message-State:\r
+ ALoCoQlMx52GyCPUwDiFZM0KFpzvIzCtMNi9P1Yp100ll6igW9uauO093jRhbG0RFDiVDLlMqvJj\r
+X-Received: by 10.194.100.67 with SMTP id ew3mr1763037wjb.57.1399897775684;\r
+ Mon, 12 May 2014 05:29:35 -0700 (PDT)\r
+Received: from hotblack-desiato.hh.sledj.net\r
+ ([2a01:348:1a2:1:a288:b4ff:fe8a:77d8])\r
+ by mx.google.com with ESMTPSA id\r
+ ed6sm15856256wib.20.2014.05.12.05.29.32 for <notmuch@notmuchmail.org>\r
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\r
+ Mon, 12 May 2014 05:29:34 -0700 (PDT)\r
+Received: by hotblack-desiato.hh.sledj.net (Postfix, from userid 30000)\r
+ id 4DD5B10B332; Mon, 12 May 2014 13:29:29 +0100 (BST)\r
+From: David Edmondson <dme@dme.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 9/9] test: Update the test output to accord with more reply\r
+ changes\r
+Date: Mon, 12 May 2014 13:29:29 +0100\r
+Message-Id: <1399897769-26809-10-git-send-email-dme@dme.org>\r
+X-Mailer: git-send-email 2.0.0.rc0\r
+In-Reply-To: <1399897769-26809-1-git-send-email-dme@dme.org>\r
+References: <87sixdujkv.fsf@qmul.ac.uk>\r
+ <1399897769-26809-1-git-send-email-dme@dme.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: Mon, 12 May 2014 12:30:02 -0000\r
+\r
+When replying to complex messages, some part headers may be\r
+shown. Update the expected test output accordingly.\r
+---\r
+ test/T310-emacs.sh | 12 ++++++++++++\r
+ 1 file changed, 12 insertions(+)\r
+\r
+diff --git a/test/T310-emacs.sh b/test/T310-emacs.sh\r
+index 95bb67e..fa15e03 100755\r
+--- a/test/T310-emacs.sh\r
++++ b/test/T310-emacs.sh\r
+@@ -394,6 +394,10 @@ User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Adrian Perez de Castro <aperez@igalia.com> writes:\r
+ \r
++> [ multipart/mixed ]\r
++> [ multipart/signed ]\r
++> [ text/plain ]\r
++>\r
+ > Hello to all,\r
+ >\r
+ > I have just heard about Not Much today in some random Linux-related news\r
+@@ -433,6 +437,8 @@ Adrian Perez de Castro <aperez@igalia.com> writes:\r
+ > -- \r
+ > Adrian Perez de Castro <aperez@igalia.com>\r
+ > Igalia - Free Software Engineering\r
++> [ signature.asc: application/pgp-signature ]\r
++> [ text/plain ]\r
+ > _______________________________________________\r
+ > notmuch mailing list\r
+ > notmuch@notmuchmail.org\r
+@@ -457,6 +463,9 @@ User-Agent: Notmuch/XXX Emacs/XXX\r
+ --text follows this line--\r
+ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+ \r
++> [ multipart/mixed ]\r
++> [ multipart/alternative ]\r
++> [ text/plain ]\r
+ > I saw the announcement this morning, and was very excited, as I had been\r
+ > hoping sup would be turned into a library,\r
+ > since I like the concept more than the UI (I'd rather an emacs interface).\r
+@@ -473,6 +482,8 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+ > and http://mail-index.netbsd.org/pkgsrc-bugs/2006/06/07/msg016808.htmlspecifically\r
+ > uses 64 as the\r
+ > buffer size.\r
++> [ text/html (hidden) ]\r
++> [ 0001-Deal-with-situation-where-sysconf-_SC_GETPW_R_SIZE_M.patch: application/octet-stream (as text/x-diff) ]\r
+ > From e3bc4bbd7b9d0d086816ab5f8f2d6ffea1dd3ea4 Mon Sep 17 00:00:00 2001\r
+ > From: Alexander Botero-Lowry <alex.boterolowry@gmail.com>\r
+ > Date: Tue, 17 Nov 2009 11:30:39 -0800\r
+@@ -505,6 +516,7 @@ Alex Botero-Lowry <alex.boterolowry@gmail.com> writes:\r
+ > -- \r
+ > 1.6.5.2\r
+ >\r
++> [ text/plain ]\r
+ > _______________________________________________\r
+ > notmuch mailing list\r
+ > notmuch@notmuchmail.org\r
+-- \r
+2.0.0.rc0\r
+\r