Remove the $in_reply_to configuration variable and always use the

message-ID for that header.

1 files changed, 12 insertions, 14 deletions

diff --git a/send.c b/send.c
index c3ef6749..c7dda7b2 100644
--- 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)
     {