style.

[apps/madmutt.git] / postpone.c

diff --git a/postpone.c b/postpone.c
index 165438d..1145bf6 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -23,7 +23,7 @@
 #include "handler.h"
 #include "sort.h"
 #include "thread.h"
-#include <lib-crypt/crypt.h>
+#include "crypt.h"
 
 #include <imap/imap.h>
 
@@ -508,17 +508,14 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   {
     int ccap = (APPLICATION_PGP | APPLICATION_SMIME) & hdr->security;
     newhdr->security |= ENCRYPT | ccap;
-    if (!crypt_valid_passphrase (ccap))
-      goto err;
-
     mutt_message _("Decrypting message...");
 
     if (((ccap & APPLICATION_PGP)
          && crypt_pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
         || ((ccap & APPLICATION_SMIME)
             && crypt_smime_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
-        || b == NULL) {
-    err:
+        || b == NULL)
+    {
       mx_close_message (&msg);
       envelope_delete(&newhdr->env);
       body_list_wipe(&newhdr->content);