#include "attach.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
#include "remailer.h"
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))) {
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);
#ifdef USE_NNTP
if ((flags & SENDNEWS) && ctx && ctx->magic == M_NNTP
&& !msg->env->newsgroups)
- msg->env->newsgroups = m_strdup(((NNTP_DATA *) ctx->data)->group);
+ msg->env->newsgroups = m_strdup(((nntp_data_t *)ctx->data)->group);
#endif
if (!(option (OPTAUTOEDIT) && option (OPTEDITHDRS)) &&
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)))