--- /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 67C26431FBD\r
+ for <notmuch@notmuchmail.org>; Sun, 13 Jul 2014 07:54:59 -0700 (PDT)\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 9Nn0VvCmw2oP for <notmuch@notmuchmail.org>;\r
+ Sun, 13 Jul 2014 07:54:52 -0700 (PDT)\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 48679431FBC\r
+ for <notmuch@notmuchmail.org>; Sun, 13 Jul 2014 07:54:52 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+ (envelope-from <david@tethera.net>)\r
+ id 1X6LAx-0007Qj-IU; Sun, 13 Jul 2014 11:54:51 -0300\r
+Received: (nullmailer pid 3045 invoked by uid 1000); Sun, 13 Jul 2014\r
+ 14:54:48 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: Michal Sojka <sojkam1@fel.cvut.cz>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 2/2] Make parsing of References and In-Reply-To header\r
+ less error prone\r
+In-Reply-To: <1401113157-32454-3-git-send-email-sojkam1@fel.cvut.cz>\r
+References: <1401113157-32454-1-git-send-email-sojkam1@fel.cvut.cz>\r
+ <1401113157-32454-3-git-send-email-sojkam1@fel.cvut.cz>\r
+User-Agent: Notmuch/0.18.1+29~gb5327d4 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sun, 13 Jul 2014 11:54:48 -0300\r
+Message-ID: <8761j1fgw7.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: Sun, 13 Jul 2014 14:54:59 -0000\r
+\r
+Michal Sojka <sojkam1@fel.cvut.cz> writes:\r
+\r
+> According to RFC2822 References and In-Reply-To headers are supposed\r
+> to contain one or more Message-IDs, however older RFC822 allowed\r
+> almost any content. When both References and In-Reply-To headers ends\r
+> with something else that a Message-ID (see e.g. [1]), the thread\r
+> structure presented by notmuch is incorrect. The reason is that\r
+> notmuch treats this case as if the email contained no "replyto"\r
+> information (see _notmuch_database_link_message_to_parents).\r
+>\r
+> This patch changes the parse_references() function to return the last\r
+> valid Message-ID encountered rather than NULL resulting from the last\r
+> hunk of text not being the Message-ID.\r
+\r
+This series looks OK to me. It does touch something pretty fundamental,\r
+so I'd appreciate a second set of eyes on it.\r
+\r
+d\r