Introduce $honor_followup_to. The user will now be asked whether he

wants to honor mail-followup-to or not.

diff --git a/init.h b/init.h
index b27093c529c659ec9d35a5225afdaf0216b4774a..aaf70fcbe040f0191c191e9c0473214801858296 100644 (file)
--- a/init.h
+++ b/init.h
@@ -121,6 +121,7 @@ struct option_t MuttVars[] = {
   { "help",            DT_BOOL, R_BOTH, OPTHELP, 1 },
   { "hidden_host",     DT_BOOL, R_NONE, OPTHIDDENHOST, 0 },
   { "history",         DT_NUM,  R_NONE, UL &HistSize, 10 },
+  { "honor_followup_to", DT_QUAD, R_NONE, OPT_MFUPTO, M_YES },
   { "hostname",                DT_STR,  R_NONE, UL &Fqdn, 0 },
 #ifdef USE_IMAP
   { "imap_checkinterval",      DT_NUM,  R_NONE, UL &ImapCheckTime, 0 },

diff --git a/mutt.h b/mutt.h
index 3726c0fd268de1a461c7c9b107a878244f487b39..0ca5ff5d269f448ad821d7bb936ce3cc3e188c0c 100644 (file)
--- a/mutt.h
+++ b/mutt.h
@@ -252,6 +252,7 @@ enum
   OPT_PRINT,
   OPT_INCLUDE,
   OPT_DELETE,
+  OPT_MFUPTO,
   OPT_MIMEFWD,
   OPT_MOVE,
   OPT_COPY,

diff --git a/send.c b/send.c
index 67386ad88b31f1ac9543b3201e8de8c9cfcd001e..011d1f9be7f88f929bf9657a801941d35c81b55b 100644 (file)
--- a/send.c
+++ b/send.c
@@ -398,8 +398,15 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int group)
 
   if (group && env->mail_followup_to)
   {
-    rfc822_append (to, env->mail_followup_to);
-    return 0;
+    snprintf (prompt, sizeof (prompt), _("Follow-up to %s%s?"),
+             env->mail_followup_to->mailbox,
+             env->mail_followup_to->next ? "..." : "");
+
+    if (query_quadoption (OPT_MFUPTO, prompt) == M_YES)
+    {
+      rfc822_append (to, env->mail_followup_to);
+      return 0;
+    }
   }
 
   if (!option(OPTREPLYSELF) && mutt_addr_is_user (env->from))
@@ -725,7 +732,8 @@ void mutt_set_followup_to (ENVELOPE *e)
   ADDRESS *t = NULL;
 
   /* only generate the Mail-Followup-To if the user has requested it, and
-     it hasn't already been set */
+   * it hasn't already been set
+   */
   if (option (OPTFOLLOWUPTO) && !e->mail_followup_to)
   {
     if (mutt_is_list_recipient (0, e->to, e->cc))