X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=b083ded4b78071d81c4021a0d15b38640477787c;hp=cd3362b00909a58d8da3e98b071cc9b4b50f2a54;hb=e4704214cabdd0b6e10b27cff5e2194959559809;hpb=558b0bd9de90a9dc28f409d8f46679bf48c72ded

diff --git a/headers.c b/headers.c
index cd3362b..b083ded 100644
--- a/headers.c
+++ b/headers.c
@@ -8,11 +8,11 @@
  */
 
 #include <lib-lib/lib-lib.h>
-#include <lib-ui/curses.h>
+#include <lib-ui/lib-ui.h>
 
 #include "mutt.h"
 #include "alias.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 #include "mutt_idna.h"
 
 void mutt_edit_headers(const char *body,
@@ -28,14 +28,14 @@ void mutt_edit_headers(const char *body,
   struct stat st;
   string_list_t *cur, **last = NULL, *tmp;
 
-  ofp = m_tempfile(path, sizeof(path), NONULL(MCore.tmpdir), NULL);
+  ofp = m_tempfile(path, sizeof(path), NONULL(mod_core.tmpdir), NULL);
   if (!ofp) {
     mutt_perror (path);
     return;
   }
 
   mutt_env_to_local (msg->env);
-  mutt_write_rfc822_header (ofp, msg->env, NULL, 1, 0);
+  mutt_write_rfc822_header (ofp, msg->env, NULL, 1);
   fputc ('\n', ofp);            /* tie off the header. */
 
   /* now copy the body of the message. */
@@ -96,10 +96,7 @@ void mutt_edit_headers(const char *body,
   n = NULL;
 
   if (!msg->env->in_reply_to)
-#ifdef USE_NNTP
-    if (!option (OPTNEWSSEND))
-#endif
-      string_list_wipe(&msg->env->references);
+    string_list_wipe(&msg->env->references);
 
   mutt_expand_aliases_env (msg->env);