--- /dev/null
+Return-Path: <bremner@tesseract.cs.unb.ca>\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 82BB6431FD0\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 17:16:41 -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 pN50TTJZuGtB for <notmuch@notmuchmail.org>;\r
+ Sat, 14 Dec 2013 17:16:35 -0800 (PST)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\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 A33F3431FAE\r
+ for <notmuch@notmuchmail.org>; Sat, 14 Dec 2013 17:16:31 -0800 (PST)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1Vs0Jr-0000Ss-Bp; Sat, 14 Dec 2013 21:16:31 -0400\r
+Received: (nullmailer pid 13835 invoked by uid 1000); Sun, 15 Dec 2013\r
+ 01:16:15 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] test: remove call to notmuch-hello from\r
+ emacs_deliver_message\r
+Date: Sun, 15 Dec 2013 09:15:58 +0800\r
+Message-Id: <1387070158-30547-3-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.8.4.3\r
+In-Reply-To: <1387070158-30547-1-git-send-email-david@tethera.net>\r
+References: <1387070158-30547-1-git-send-email-david@tethera.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: Sun, 15 Dec 2013 01:16:41 -0000\r
+\r
+There is an obscure bug in notmuch-hello that very occasionally causes\r
+emacs_deliver_message to fail. Since it it doesn't serve any actual\r
+purpose in the function we delete it, and leave tracking down the the\r
+bug for another day.\r
+---\r
+ test/test-lib.sh | 1 -\r
+ 1 file changed, 1 deletion(-)\r
+\r
+diff --git a/test/test-lib.sh b/test/test-lib.sh\r
+index 66c0720..1bb5610 100644\r
+--- a/test/test-lib.sh\r
++++ b/test/test-lib.sh\r
+@@ -452,7 +452,6 @@ emacs_deliver_message ()\r
+ (mail-host-address \"example.com\")\r
+ (smtpmail-smtp-server \"localhost\")\r
+ (smtpmail-smtp-service \"25025\"))\r
+- (notmuch-hello)\r
+ (notmuch-mua-mail)\r
+ (message-goto-to)\r
+ (insert \"test_suite@notmuchmail.org\nDate: 01 Jan 2000 12:00:00 -0000\")\r
+-- \r
+1.8.4.3\r
+\r