X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=e2666a245ea34a8a5b8e659fe82da2789b34b709;hp=ed87f4bd88675096e79f2b1e9ccd3a14784fe312;hb=4e64abbe6c52d61bb01b85c266e33e30b257ba68;hpb=8336b26fc23c7943bf6681ba2c290bb5cd2c54b8

diff --git a/send.c b/send.c
index ed87f4b..e2666a2 100644
--- a/send.c
+++ b/send.c
@@ -27,10 +27,7 @@
 #include <nntp/nntp.h>
 #endif
 
-#ifdef MIXMASTER
 #include "remailer.h"
-#endif
-
 
 static void append_signature (FILE * f)
 {
@@ -976,14 +973,8 @@ static int send_message (HEADER * msg)
   if (!tempfp)
     return -1;
 
-#ifdef MIXMASTER
   mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
                             msg->chain ? 1 : 0);
-#endif
-#ifndef MIXMASTER
-  mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0, 0);
-#endif
-
   fputc ('\n', tempfp);         /* tie off the header. */
 
   if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
@@ -998,10 +989,8 @@ static int send_message (HEADER * msg)
     return (-1);
   }
 
-#ifdef MIXMASTER
   if (msg->chain)
     return mix_send_message (msg->chain, tempfile);
-#endif
 
   i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
                        msg->env->bcc, tempfile,
@@ -1054,7 +1043,7 @@ int mutt_resend_message (FILE * fp, CONTEXT * ctx, HEADER * cur)
 {
   HEADER *msg = header_new();
 
-  if (mutt_prepare_template (fp, ctx, msg, cur, 1) < 0)
+  if (mutt_prepare_template (fp, ctx, msg, cur, option(OPTWEED)) < 0)
     return -1;
 
   return ci_send_message (SENDRESEND, msg, NULL, ctx, cur);