notmuch reply: Prefer "Reply-To" header over "From" for choosing recipient.

[notmuch] / notmuch-reply.c

diff --git a/notmuch-reply.c b/notmuch-reply.c
index f26bd5521d278be7bb812684da16bc7d5a413f57..42060665743e24534f0bb8db52e8b8110697f81b 100644 (file)
--- a/notmuch-reply.c
+++ b/notmuch-reply.c
@@ -182,12 +182,13 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
     char *reply_headers;
     struct {
        const char *header;
     char *reply_headers;
     struct {
        const char *header;

+       const char *fallback;

        GMimeRecipientType recipient_type;
     } reply_to_map[] = {
        GMimeRecipientType recipient_type;
     } reply_to_map[] = {

-       { "from", GMIME_RECIPIENT_TYPE_TO  },
-       { "to",   GMIME_RECIPIENT_TYPE_TO  },
-       { "cc",   GMIME_RECIPIENT_TYPE_CC  },
-       { "bcc",  GMIME_RECIPIENT_TYPE_BCC }
+       { "reply-to", "from", GMIME_RECIPIENT_TYPE_TO  },
+       { "to",         NULL, GMIME_RECIPIENT_TYPE_TO  },
+       { "cc",         NULL, GMIME_RECIPIENT_TYPE_CC  },
+       { "bcc",        NULL, GMIME_RECIPIENT_TYPE_BCC }

     };
     unsigned int i;
 
     };
     unsigned int i;
 


@@ -211,7 +212,7 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
        return 1;
     }
 
        return 1;
     }
 

-    for (messages = notmuch_query_search_messages (query);
+    for (messages = notmuch_query_search_messages (query, 0, -1);

         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {
         notmuch_messages_has_more (messages);
         notmuch_messages_advance (messages))
     {


@@ -235,6 +236,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 
            recipients = notmuch_message_get_header (message,
                                                     reply_to_map[i].header);
 
            recipients = notmuch_message_get_header (message,
                                                     reply_to_map[i].header);

+           if (recipients == NULL && reply_to_map[i].fallback)
+               recipients = notmuch_message_get_header (message,
+                                                        reply_to_map[i].fallback);
+

            addr = add_recipients_for_string (reply, config,
                                              reply_to_map[i].recipient_type,
                                              recipients);
            addr = add_recipients_for_string (reply, config,
                                              reply_to_map[i].recipient_type,
                                              recipients);