X-Git-Url: https://git.notmuchmail.org/git?p=notmuch;a=blobdiff_plain;f=notmuch-reply.c;h=42060665743e24534f0bb8db52e8b8110697f81b;hp=86e9b3a29b1048b3371b734097cf49477656a2ac;hb=c979fc5b05a541d8488b77cbbc590ed3955690df;hpb=93dcc3b695e19dd36cc8f638c6e01ecbbd9a447d

diff --git a/notmuch-reply.c b/notmuch-reply.c
index 86e9b3a2..42060665 100644
--- 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;
+	const char *fallback;
 	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;
 
@@ -235,6 +236,10 @@ notmuch_reply_command (void *ctx, int argc, char *argv[])
 
 	    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);