X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=headers.c;h=ecb5756b7550576d0a457bc277a64c8d5563fdb7;hp=d1f2e35a91f1c7126397427b2e2b383d4b2def13;hb=723f7ae3f24f7881c9ce87abf933cd5bec4ac0bc;hpb=efe9a0bac26a7dabf3953ea0597ce06b3dcb21fe

diff --git a/headers.c b/headers.c
index d1f2e35..ecb5756 100644
--- a/headers.c
+++ b/headers.c
@@ -11,20 +11,19 @@
 # include "config.h"
 #endif
 
+#include <sys/stat.h>
+#include <string.h>
+#include <ctype.h>
+
 #include <lib-lib/macros.h>
 #include <lib-lib/ascii.h>
 #include <lib-lib/file.h>
+#include <lib-lib/debug.h>
 
 #include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
-#include "lib/debug.h"
-
-#include <sys/stat.h>
-#include <string.h>
-#include <ctype.h>
-
 void mutt_edit_headers (const char *editor,
                         const char *body,
                         HEADER * msg, char *fcc, size_t fcclen)
@@ -103,7 +102,7 @@ void mutt_edit_headers (const char *editor,
   n->references = msg->env->references;
   msg->env->references = NULL;
 
-  mutt_free_envelope (&msg->env);
+  envelope_delete(&msg->env);
   msg->env = n;
   n = NULL;
 
@@ -164,8 +163,7 @@ void mutt_edit_headers (const char *editor,
     }
 
 
-    else if ((WithCrypto & APPLICATION_PGP)
-             && ascii_strncasecmp ("pgp:", cur->data, 4) == 0) {
+    else if (ascii_strncasecmp("pgp:", cur->data, 4) == 0) {
       msg->security = mutt_parse_crypt_hdr (cur->data + 4, 0);
       if (msg->security)
         msg->security |= APPLICATION_PGP;