X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=7f5aff132df967aa5bb73af4925635650ae78dc3;hp=a2e03b0c8cef0b9bf1d33d77ec7be782b4e1e84e;hb=7dea2ed3be5f5aaa2975647e69a414925ccb3cb8;hpb=3242c00b2d3f7f1c1554bcebfb8a390fddea095f

diff --git a/postpone.c b/postpone.c
index a2e03b0..7f5aff1 100644
--- a/postpone.c
+++ b/postpone.c
@@ -508,9 +508,6 @@ 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)
@@ -597,7 +594,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
       parameter_delval(&b->parameter, "x-mutt-noconv");
     }
 
-    s.fpout = m_tempfile(file, sizeof(file), NONULL(Tempdir), file);
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(MCore.tmpdir), file);
     if (!s.fpout)
       goto bail;