--- /dev/null
+Return-Path: <david@tethera.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 C368D431FC2\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Feb 2015 23:42:36 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 2.438\r
+X-Spam-Level: **\r
+X-Spam-Status: No, score=2.438 tagged_above=-999 required=5\r
+ tests=[DNS_FROM_AHBL_RHSBL=2.438] 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 Rfx7OFqJ5lpa for <notmuch@notmuchmail.org>;\r
+ Mon, 23 Feb 2015 23:42:33 -0800 (PST)\r
+Received: from mx.xen14.node3324.gplhost.com (gitolite.debian.net\r
+ [87.98.215.224])\r
+ (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 86E26431FC0\r
+ for <notmuch@notmuchmail.org>; Mon, 23 Feb 2015 23:42:33 -0800 (PST)\r
+Received: from remotemail by mx.xen14.node3324.gplhost.com with local (Exim\r
+ 4.80) (envelope-from <david@tethera.net>)\r
+ id 1YQ9zG-0003ck-Af; Tue, 24 Feb 2015 07:32:58 +0000\r
+Received: (nullmailer pid 2194 invoked by uid 1000); Tue, 24 Feb 2015\r
+ 07:32:45 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Jani Nikula <jani@nikula.org>, notmuch@notmuchmail.org\r
+Subject: Re:\r
+In-Reply-To: <1424721937-5797-1-git-send-email-david@tethera.net>\r
+References: <87a9163fpf.fsf@maritornes.cs.unb.ca>\r
+ <1424721937-5797-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.19+48~gb74ed1c (http://notmuchmail.org) Emacs/24.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Tue, 24 Feb 2015 08:32:45 +0100\r
+Message-ID: <87sidvhihu.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 24 Feb 2015 07:42:36 -0000\r
+\r
+David Bremner <david@tethera.net> writes:\r
+\r
+> This has Jani's suggestions fixed, along with a couple of other trivial patches.\r
+>\r
+> I'll mark them ready at this point.\r
+\r
+I pushed these, with Trevor's suggested changes.\r
+\r
+d\r