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

diff --git a/38/eb715d4ce8d8e21bfcab34001d28affa7471d3 b/38/eb715d4ce8d8e21bfcab34001d28affa7471d3
new file mode 100644 (file)
index 0000000..45fec5d
--- /dev/null
+++ b/38/eb715d4ce8d8e21bfcab34001d28affa7471d3
@@ -0,0 +1,106 @@
+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 67B8D431FB6\r
+       for <notmuch@notmuchmail.org>; Fri, 11 May 2012 07:32:31 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\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 tT7uc0KwV-6O for <notmuch@notmuchmail.org>;\r
+       Fri, 11 May 2012 07:32:30 -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 8BCB6431FAE\r
+       for <notmuch@notmuchmail.org>; Fri, 11 May 2012 07:32:30 -0700 (PDT)\r
+Received: by lagu2 with SMTP id u2so2102841lag.26\r
+       for <notmuch@notmuchmail.org>; Fri, 11 May 2012 07:32:28 -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:cc:subject:date:message-id:x-mailer:x-gm-message-state;\r
+       bh=Do0Mw+ObTyoMuIeoIkEuq5zUtpglWaKhrux4LBGTeHA=;\r
+       b=IRIAph6OgaPYFhWfV5kxQdBXFm1tfMVDHxZDMfCKX1G3VFze4gYBOZ54MLXuvG1yRz\r
+       g/s9z+PMBpG4NNQ8TlKeR6WG4q6E4Dfbbwo0CI6q3zkPRRb2TolrFZvU6mVkbexNyS/8\r
+       rGZ30JB0dDsamXNL3BtYA1cKhYB4e3WziXkemYf9Uyn1HioQg3RS3iFCvgt+FnwkN6fC\r
+       0oflHkFhVE8jTqftbYHm3CVXklnw28jco05rhHrNLK+K4aEw79hCUuc+Qm7kQUgh46Bu\r
+       sRsaK5XiKTS3dxJF1ugqTTIoUi/bs78CF3QUyGZSvVTToX8KJfzKnmB9EuFF9uiIJEDj\r
+       85ow==\r
+Received: by 10.112.42.100 with SMTP id n4mr3753504lbl.90.1336746748724;\r
+       Fri, 11 May 2012 07:32:28 -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 j6sm11998180lbl.0.2012.05.11.07.32.25\r
+       (version=SSLv3 cipher=OTHER); Fri, 11 May 2012 07:32:27 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/2] cli: also use Delivered-To header to figure out the reply\r
+       from address\r
+Date: Fri, 11 May 2012 17:32:22 +0300\r
+Message-Id:\r
+ <21a946917c5c8dd63295b7c87b7c2d1ebcb6e71e.1336746160.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.9.5\r
+X-Gm-Message-State:\r
+ ALoCoQl5hE+ATABTRFhyIQmbkUblN8+qAW01Gr2GHXl8TcIVd0r7y2/MTFNt/1Fs0f+s8YB+k45H\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: Fri, 11 May 2012 14:32:31 -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 7184a5d..7efd5cd 100644\r
+--- a/notmuch-reply.c\r
++++ b/notmuch-reply.c\r
+@@ -334,7 +334,11 @@ guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message\r
+     const char *delim=". \t";\r
+     size_t i,j,other_len;\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
+     primary = notmuch_config_get_user_primary_email (config);\r
+     other = notmuch_config_get_user_other_email (config, &other_len);\r
+@@ -348,8 +352,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