[PATCH v2 1/2] cli: also use Delivered-To header to figure out the reply from address

diff --git a/7b/c81a21157a93cd7ece73f7d2b06abce25f5d6b b/7b/c81a21157a93cd7ece73f7d2b06abce25f5d6b
new file mode 100644 (file)
index 0000000..053a472
--- /dev/null
+++ b/7b/c81a21157a93cd7ece73f7d2b06abce25f5d6b
@@ -0,0 +1,112 @@
+Return-Path: <jani@nikula.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 60864431FC4\r
+       for <notmuch@notmuchmail.org>; Wed, 23 May 2012 22:15:58 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 LtC102gNK2BL for <notmuch@notmuchmail.org>;\r
+       Wed, 23 May 2012 22:15:57 -0700 (PDT)\r
+Received: from mail-lpp01m010-f53.google.com (mail-lpp01m010-f53.google.com\r
+       [209.85.215.53]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 505C1431FCB\r
+       for <notmuch@notmuchmail.org>; Wed, 23 May 2012 22:15:57 -0700 (PDT)\r
+Received: by mail-lpp01m010-f53.google.com with SMTP id u2so6544458lag.26\r
+       for <notmuch@notmuchmail.org>; Wed, 23 May 2012 22:15:57 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:date:message-id:x-mailer:in-reply-to:references\r
+       :in-reply-to:references:x-gm-message-state;\r
+       bh=nylrmk7S/AtggMxVo1srfVLB3InySZ4Jb2tIuxC/CXQ=;\r
+       b=ftJkeyuLixJYaXa8ii5ZSWZjn2N8P4yoBVyGq/2dB+2lKKA/58j3iHXyV/PWj4hWdd\r
+       JCw/8FR48pjP9WjKzS8Mw/Mjgv3OhvYc6DjmVjdaiX10uBpCc9qYav/zpw0e4ZbpkcX/\r
+       SqKoSJBJ3wLUrGR+2WcF0A1DmVWYeQ4WkwCBDPJLPiuS3yi2nU7425C7RXDi+NBUzfKl\r
+       EgF7jsG/0yTnCNNvKzGv5z67LigKAX39reX6oODciz3dKqWqK2w8ApLy7NCpmReDbPsC\r
+       5rdSfqwoelHSqBVpwpIbaDgh76L0V7+jsesxVGwg9cV81Fj5y+9+g46rKD03+Nd0cocR\r
+       wBXQ==\r
+Received: by 10.152.123.244 with SMTP id md20mr29734624lab.0.1337836556872;\r
+       Wed, 23 May 2012 22:15:56 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw4-fe50dc00-68.dhcp.inet.fi.\r
+       [80.220.80.68])\r
+       by mx.google.com with ESMTPS id tt8sm578444lbb.16.2012.05.23.22.15.55\r
+       (version=SSLv3 cipher=OTHER); Wed, 23 May 2012 22:15:56 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 1/2] cli: also use Delivered-To header to figure out the\r
+       reply from address\r
+Date: Thu, 24 May 2012 08:15:49 +0300\r
+Message-Id:\r
+ <486cc9d33e43f3afba4bcdab71a489a36e453893.1337836150.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.9.5\r
+In-Reply-To: <cover.1337836150.git.jani@nikula.org>\r
+References: <cover.1337836150.git.jani@nikula.org>\r
+In-Reply-To: <cover.1337836150.git.jani@nikula.org>\r
+References: <cover.1337836150.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQnzOUBW1EQd4DVxo/jfsE+a1Obl5cH6R4r6PkN0JBkWZ52NTgEaxfcWKu/ASSXaKaaST9J/\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: Thu, 24 May 2012 05:15:58 -0000\r
+\r
+Add another fallback header Delivered-To for guessing the user's from\r
+address for notmuch reply before using the Received\r
+headers. Apparently some MTAs use Delivered-To instead of\r
+X-Original-To (which already exists as a fallback).\r
+\r
+Reported-by: Michael Hudson-Doyle <michael.hudson@canonical.com>\r
+Signed-off-by: Jani Nikula <jani@nikula.org>\r
+---\r
+ notmuch-reply.c |   11 ++++++++---\r
+ 1 file changed, 8 insertions(+), 3 deletions(-)\r
+\r
+diff --git a/notmuch-reply.c b/notmuch-reply.c\r
+index 51cb6de..0f92a2e 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -384,7 +384,11 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+     const char *delim=". \t";\r
+     size_t i;\r
+ \r
+-    const char *to_headers[] = {"Envelope-to", "X-Original-To"};\r
++    const char *to_headers[] = {\r
++      "Envelope-to",\r
++      "X-Original-To",\r
++      "Delivered-To",\r
++    };\r
+ \r
+     /* sadly, there is no standard way to find out to which email\r
+      * address a mail was delivered - what is in the headers depends\r
+@@ -395,8 +399,9 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+      * the To: or Cc: header. From here we try the following in order:\r
+      * 1) check for an Envelope-to: header\r
+      * 2) check for an X-Original-To: header\r
+-     * 3) check for a (for <email@add.res>) clause in Received: headers\r
+-     * 4) check for the domain part of known email addresses in the\r
++     * 3) check for a Delivered-To: header\r
++     * 4) check for a (for <email@add.res>) clause in Received: headers\r
++     * 5) check for the domain part of known email addresses in the\r
+      *    'by' part of Received headers\r
+      * If none of these work, we give up and return NULL\r
+      */\r
+-- \r
+1.7.9.5\r
+\r