Remove the $in_reply_to configuration variable and always use the

message-ID for that header.

diff --git a/Muttrc.in b/Muttrc.in
index 4a6c0ebedcd3924b47fca40e4935d7e6538c1544..6b304759860af8aa1f1b951c1ea2955ade1f76d2 100644 (file)
--- a/Muttrc.in
+++ b/Muttrc.in
@@ -87,7 +87,6 @@ macro pager   <f1> "!less @docdir@/manual.txt\n" "Show Mutt documentation"
 # set hostname=""
 # unset ignore_list_rely_to
 # set implicit_autoview=no
-# set in_reply_to="%i; from %n on %{!%a, %b %d, %Y at %I:%M:%S%p %Z}"
 # set include=ask-yes
 # set indent_string="> "
 # set index_format="%4C %Z %{%b %d} %-15.15L (%4l) %s"

diff --git a/doc/manual.sgml.in b/doc/manual.sgml.in
index d9aac525f37f7761c5ba4f6e8af8c2d3643f48bd..b8dea7924419b3eff6fb979fb4b2086f77e9e155 100644 (file)
--- a/doc/manual.sgml.in
+++ b/doc/manual.sgml.in
@@ -3061,16 +3061,6 @@ at the environment variable <em/MM&lowbar;NOASK/.  Setting this to
 comma-separated list of type names (without white space) for which
 the corresponding mailcap entries will be used to display MIME parts.
 
-<sect2>in&lowbar;reply&lowbar;to
-<p>
-Type: format string<newline>
-Default: &dquot;&percnt;i; from &bsol;&dquot;&percnt;n&bsol;&dquot; on &percnt;{!&percnt;a, &percnt;b &percnt;d, &percnt;Y at &percnt;I:&percnt;M:&percnt;S&percnt;p}&dquot;
-
-This specifies the format of the <tt/In-Reply-To:/ header
-field added when replying to a message. For a full listing of
-defined escape sequences see the section on <ref id="index_format"
-name="&dollar;index&lowbar;format">.
-
 <sect2>include<label id="include">
 <p>
 Type: quadoption<newline>

diff --git a/globals.h b/globals.h
index 612d3395d179f880e7e90077a06b58cb9ff6d605..a48b84eef0e9c83b519ee76cd36f648839cd62c8 100644 (file)
--- a/globals.h
+++ b/globals.h
@@ -50,7 +50,6 @@ WHERE char *ImapPass INITVAL (NULL);
 WHERE short ImapCheckTime;
 WHERE char *ImapHomeNamespace INITVAL (NULL);
 #endif
-WHERE char *InReplyTo;
 WHERE char *Inbox;
 WHERE char *Ispell;
 WHERE char *Locale;

diff --git a/init.h b/init.h
index 23fc6748860dd2123c9f07d49591d717281088e0..870dd09f4ed94da3afe28534d7f9dafc624d06d2 100644 (file)
--- a/init.h
+++ b/init.h
@@ -138,7 +138,6 @@ struct option_t MuttVars[] = {
   { "imap_home_namespace",     DT_STR, R_NONE, UL &ImapHomeNamespace, UL 0},
 #endif
   { "implicit_autoview", DT_BOOL,R_NONE, OPTIMPLICITAUTOVIEW, 0},
-  { "in_reply_to",     DT_STR,  R_NONE, UL &InReplyTo, UL "%i; from %n on %{!%a, %b %d, %Y at %I:%M:%S%p %Z}" },
   { "include",         DT_QUAD, R_NONE, OPT_INCLUDE, M_ASKYES },
   { "indent_string",   DT_STR,  R_NONE, UL &Prefix, UL "> " },
   { "indent_str",      DT_SYN,  R_NONE, UL "indent_string", 0 },

diff --git a/send.c b/send.c
index c3ef674996956c0d4745ccb778a5c746524f3d10..c7dda7b29c990aa71be6d7af6f6a0523206f8d69 100644 (file)
--- a/send.c
+++ b/send.c
@@ -590,22 +590,20 @@ envelope_defaults (ENVELOPE *env, CONTEXT *ctx, HEADER *cur, int flags)
       env->subject = safe_strdup ("Re: your mail");
 
     /* add the In-Reply-To field */
-    if (InReplyTo)
+    snprintf (buffer, sizeof (buffer), "In-Reply-To: %s", 
+             cur->env->message_id);
+
+    tmp = env->userhdrs;
+    while (tmp && tmp->next)
+      tmp = tmp->next;
+    if (tmp)
     {
-      strfcpy (buffer, "In-Reply-To: ", sizeof (buffer));
-      mutt_make_string (buffer + 13, sizeof (buffer) - 13, InReplyTo, ctx, cur);
-      tmp = env->userhdrs;
-      while (tmp && tmp->next)
-       tmp = tmp->next;
-      if (tmp)
-      {
-       tmp->next = mutt_new_list ();
-       tmp = tmp->next;
-      }
-      else
-       tmp = env->userhdrs = mutt_new_list ();
-      tmp->data = safe_strdup (buffer);
+      tmp->next = mutt_new_list ();
+      tmp = tmp->next;
     }
+    else
+      tmp = env->userhdrs = mutt_new_list ();
+    tmp->data = safe_strdup (buffer);
 
     if(tag)
     {