--- /dev/null
+Return-Path: <jrollins@servo.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 A8351431FD0\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Jun 2011 10:37:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.921 tagged_above=-999 required=5\r
+ tests=[NO_DNS_FOR_FROM=0.379, RCVD_IN_DNSWL_MED=-2.3]\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 Nyd19n1t7zNL for <notmuch@notmuchmail.org>;\r
+ Tue, 21 Jun 2011 10:37:10 -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 5D89E431FB6\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Jun 2011 10:37:10 -0700 (PDT)\r
+Received: from fire-doxen.imss.caltech.edu (localhost [127.0.0.1])\r
+ by fire-doxen-postvirus (Postfix) with ESMTP id 8A1292E50D00\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Jun 2011 10:28:59 -0700 (PDT)\r
+X-Spam-Scanned: at Caltech-IMSS on fire-doxen by amavisd-new\r
+Received: from servo.finestructure.net (DHCP-123-207.caltech.edu\r
+ [131.215.123.207]) (Authenticated sender: jrollins)\r
+ by fire-doxen-submit (Postfix) with ESMTP id D5EBE2E50CE3\r
+ for <notmuch@notmuchmail.org>; Tue, 21 Jun 2011 10:28:57 -0700 (PDT)\r
+Received: by servo.finestructure.net (Postfix, from userid 1000)\r
+ id 439B36F6; Tue, 21 Jun 2011 10:37:08 -0700 (PDT)\r
+From: Jameson Graef Rollins <jrollins@finestructure.net>\r
+To: Notmuch Mail <notmuch@notmuchmail.org>\r
+Subject: \r
+Date: Tue, 21 Jun 2011 10:36:56 -0700\r
+Message-Id: <1308677818-9228-1-git-send-email-jrollins@finestructure.net>\r
+X-Mailer: git-send-email 1.7.5.3\r
+In-Reply-To: <1308677485-6846-2-git-send-email-jrollins@finestructure.net>\r
+References: <1308677485-6846-2-git-send-email-jrollins@finestructure.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: Tue, 21 Jun 2011 17:37:10 -0000\r
+\r
+hrm, sorry. Looks like those last two patches got a little messed up.\r
+These two patches replace the previous two.\r
+\r
+jamie.\r
+\r