#include <lib-mime/mime.h>
#include <lib-mime/rfc3676.h>
#include <lib-sys/unix.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
#include <lib-ui/enter.h>
#include <lib-mx/mx.h>
#include "attach.h"
#ifdef USE_NNTP
-#include <nntp/nntp.h>
+#include "nntp.h"
#endif
-#include "remailer.h"
-
int url_parse_mailto(ENVELOPE *e, char **body, const char *src)
{
char *t;
if (!tempfp)
return -1;
- mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0,
- msg->chain ? 1 : 0);
+ mutt_write_rfc822_header (tempfp, msg->env, msg->content, 0);
fputc ('\n', tempfp); /* tie off the header. */
if ((mutt_write_mime_body (msg->content, tempfp) == -1)) {
return (-1);
}
- if (msg->chain)
- return mix_send_message (msg->chain, tempfile);
-
i = mutt_invoke_mta (msg->env->from, msg->env->to, msg->env->cc,
msg->env->bcc, tempfile,
(msg->content->encoding == ENC8BIT));
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)))