X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=31679a57225e1f2212797f05575c4aeef307a625;hp=cb42de45b300acc0615080796c30c6e06fd08359;hb=9953e9a5a85b3ffbf62b86a6aa9bd0322d425f81;hpb=9041c1389cfddb79bf4cc268f5cd94d4af41c27a diff --git a/notmuch-reply.c b/notmuch-reply.c index cb42de45..31679a57 100644 --- a/notmuch-reply.c +++ b/notmuch-reply.c @@ -208,18 +208,26 @@ mailing_list_munged_reply_to (notmuch_message_t *message) header = notmuch_message_get_header (message, "reply-to"); list = internet_address_list_parse_string (header); + if (internet_address_list_length (list) != 1) return 0; + address = internet_address_list_get_address (list, 0); if (INTERNET_ADDRESS_IS_GROUP (address)) return 0; + mailbox = INTERNET_ADDRESS_MAILBOX (address); addr = internet_address_mailbox_get_addr (mailbox); + /* Note that strcasestr() is a GNU extension, strstr() might be sufficient */ if (strcasestr (notmuch_message_get_header (message, "to"), addr) == 0 || strcasestr (notmuch_message_get_header (message, "cc"), addr) == 0) + { return 1; - return 0; } + } + + return 0; +} /* Augments the recipients of reply from the headers of message. * @@ -271,6 +279,7 @@ add_recipients_from_message (GMimeMessage *reply, if (from_addr == NULL) from_addr = addr; } + return from_addr; }