--- mutt-1.3.7/recvcmd.c-	Wed Aug 23 20:22:45 2000
+++ mutt-1.3.7/recvcmd.c	Fri Sep  1 13:31:30 2000
@@ -785,9 +785,9 @@
     unset_option (OPTNEWSSEND);
 #endif
 
+  nattach = count_tagged (idx, idxlen);
   if (check_all_msg (idx, idxlen, cur, 0) == -1)
   {
-    nattach = count_tagged (idx, idxlen);
     if ((parent = find_parent (idx, idxlen, cur, nattach)) == NULL)
       parent = hdr;
   }
@@ -807,7 +807,8 @@
   tmphdr->env = mutt_new_envelope ();
 
   if (attach_reply_envelope_defaults (tmphdr->env, idx, idxlen, 
-				      parent ? parent : cur->hdr, flags) == -1)
+				      nattach > 1 ? parent : cur->hdr, flags)
+      == -1)
   {
     mutt_free_header (&tmphdr);
     return;