X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=39377e1842fb101b8935790bd1ef6f35806dd44f;hp=6c15536cff153d3d00ebe4d8a300c6361a9ea536;hb=3780572bb31c394a14e15bbfc3e113978eec7188;hpb=4e5d2f22db290a830c0267f34b519c6138af00ed

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 6c15536c..39377e18 100644
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -282,6 +282,68 @@ add_recipients_from_message (GMimeMessage *reply,
     return from_addr;
 }
 
+static const char *
+guess_from_received_header (notmuch_config_t *config, notmuch_message_t *message)
+{
+    const char *received,*primary;
+    char **other;
+    char *by,*mta,*ptr,*token;
+    char *domain=NULL;
+    char *tld=NULL;
+    const char *delim=". \t";
+    size_t i,other_len;
+
+    received = notmuch_message_get_header (message, "received");
+    by = strstr (received, " by ");
+    if (by && *(by+4)) {
+	/* sadly, the format of Received: headers is a bit inconsistent,
+	 * depending on the MTA used. So we try to extract just the MTA
+	 * here by removing leading whitespace and assuming that the MTA
+	 * name ends at the next whitespace
+	 * we test for *(by+4) to be non-'\0' to make sure there's something
+	 * there at all - and then assume that the first whitespace delimited
+	 * token that follows is the last receiving server
+	 */
+	mta = strdup (by+4);
+	if (mta == NULL)
+	    return NULL;
+	token = strtok(mta," \t");
+	if (token == NULL)
+	    return NULL;
+	/* Now extract the last two components of the MTA host name
+	 * as domain and tld
+	 */
+	while ((ptr = strsep (&token, delim)) != NULL) {
+	    if (*ptr == '\0')
+		continue;
+	    domain = tld;
+	    tld = ptr;
+	}
+
+	if (domain) {
+	    /* recombine domain and tld and look for it among the configured
+	     * email addresses
+	     */
+	    *(tld-1) = '.';
+	    primary = notmuch_config_get_user_primary_email (config);
+	    if (strcasestr (primary, domain)) {
+		free (mta);
+		return primary;
+	    }
+	    other = notmuch_config_get_user_other_email (config, &other_len);
+	    for (i = 0; i < other_len; i++)
+		if (strcasestr (other[i], domain)) {
+		    free (mta);
+		    return other[i];
+		}
+	}
+
+	free (mta);
+    }
+
+    return NULL;
+}
+
 static int
 notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_t *query)
 {
@@ -313,6 +375,9 @@ notmuch_reply_format_default(void *ctx, notmuch_config_t *config, notmuch_query_
 
 	from_addr = add_recipients_from_message (reply, config, message);
 
+	if (from_addr == NULL)
+	    from_addr = guess_from_received_header (config, message);
+
 	if (from_addr == NULL)
 	    from_addr = notmuch_config_get_user_primary_email (config);