From 52c3fd1fb8d978149d90bd43ad0db67d9ca61eac Mon Sep 17 00:00:00 2001
From: Thomas Roessler <roessler@does-not-exist.org>
Date: Wed, 24 Mar 1999 16:32:30 +0000
Subject: [PATCH] patch-0.96.1.vikas.forward_attachment.2

---
 recvattach.c | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/recvattach.c b/recvattach.c
index 217a59c34..b143a878a 100644
--- a/recvattach.c
+++ b/recvattach.c
@@ -820,9 +820,22 @@ static void reply_attachment_list (int op, int tag, HEADER *hdr, BODY *body)
   if (op == SENDFORWARD && option (OPTFORWATTACH))
   {
     HEADER *newhdr = mutt_new_header();
-    mutt_prepare_edit_message (ctx, newhdr, hn);
+    char buffer [LONG_STRING];
+
+    if (mutt_prepare_edit_message (ctx, newhdr, hn) < 0)
+    {
+      mutt_free_header (&newhdr);
+      return;
+    }
+
     mutt_free_envelope (&newhdr->env);
     newhdr->env = mutt_new_envelope();
+
+    /* set the default subject for the message. */
+    buffer[0] = 0;
+    mutt_make_string (buffer, sizeof (buffer), NONULL(ForwFmt), ctx, hn);
+    newhdr->env->subject = safe_strdup (buffer);
+
     ci_send_message (0, newhdr, NULL, ctx, NULL);
   }
   else
-- 
2.40.0