X-Git-Url: http://git.madism.org/?a=blobdiff_plain;f=send.c;h=f64c776884dc2d8fa3e5800d31719a0515a2d109;hb=379745fa8336fe94c44cdbd20876a3dc94798b72;hp=aa2316299efd44544049786edcacf57fe9f1f4a4;hpb=8db3fe9c19320b6f6e508d6b1aae03980239a930;p=apps%2Fmadmutt.git

diff --git a/send.c b/send.c
index aa23162..f64c776 100644
--- a/send.c
+++ b/send.c
@@ -24,7 +24,7 @@
 #include "attach.h"
 
 #ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
 #endif
 
 #include "remailer.h"
@@ -1224,10 +1224,8 @@ int ci_send_message (int flags, /* send mode */
 
   if (flags & SENDBATCH) {
     mutt_copy_stream (stdin, tempfp);
-    if (option (OPTHDRS)) {
-      process_user_recips (msg->env);
-      process_user_header (msg->env);
-    }
+    process_user_recips (msg->env);
+    process_user_header (msg->env);
     mutt_expand_aliases_env (msg->env);
   }
   else if (!(flags & (SENDPOSTPONED | SENDRESEND))) {
@@ -1235,8 +1233,7 @@ int ci_send_message (int flags, /* send mode */
         envelope_defaults (msg->env, ctx, cur, flags) == -1)
       goto cleanup;
 
-    if (option (OPTHDRS))
-      process_user_recips (msg->env);
+    process_user_recips (msg->env);
 
     /* Expand aliases and remove duplicates/crossrefs */
     mutt_fix_reply_recipients (msg->env);
@@ -1292,8 +1289,7 @@ int ci_send_message (int flags, /* send mode */
       killfrom = 0;
     }
 
-    if (option (OPTHDRS))
-      process_user_header (msg->env);
+    process_user_header (msg->env);
 
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))