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

diff --git a/headers.c b/headers.c
index d1f2e35..e4709ac 100644
--- a/headers.c
+++ b/headers.c
@@ -16,7 +16,7 @@
 #include <lib-lib/file.h>
 
 #include "mutt.h"
-#include "mutt_crypt.h"
+#include <lib-crypt/crypt.h>
 #include "mutt_idna.h"
 
 #include "lib/debug.h"
@@ -103,7 +103,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 +164,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;