more useless and cluttered things.

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index aa23162..ecc938f 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1224,10 +1224,8 @@ int ci_send_message (int flags, /* send mode */
 
   if (flags & SENDBATCH) {
     mutt_copy_stream (stdin, tempfp);
 
   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))) {
     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;
 
         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);
 
     /* 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;
     }
 
       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)))
 
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))