X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=68857c2875943aa2ab5d1897cb7200d9c53e6c9e;hp=1145bf63f977c44f60e8c6f593c4075a02def629;hb=378ab81aa9abf4db714638c3e2e786e6cc58d2b1;hpb=c8e9242de36d7aa6e3bb2e446f57ef2a14e4c889

diff --git a/postpone.c b/postpone.c
index 1145bf6..68857c2 100644
--- a/postpone.c
+++ b/postpone.c
@@ -312,10 +312,7 @@ int mutt_get_postponed (CONTEXT * ctx, HEADER * hdr, HEADER ** cur, char *fcc,
       string_list_wipe(&tmp);
       tmp = next;
     }
-    else if ((m_strncmp("Pgp:", tmp->data, 4) == 0       /* this is generated
-                                                          * by old mutt versions
-                                                          */
-                 || m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0)) {
+    else if (m_strncmp("X-Mutt-PGP:", tmp->data, 11) == 0) {
       hdr->security = mutt_parse_crypt_hdr (strchr (tmp->data, ':') + 1, 1);
       hdr->security |= APPLICATION_PGP;
 
@@ -594,7 +591,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(MCore.tmpdir), file);
+    s.fpout = m_tempfile(file, sizeof(file), NONULL(mod_core.tmpdir), file);
     if (!s.fpout)
       goto bail;
 
@@ -633,7 +630,7 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
   /* Theoretically, both could be set. Take the one the user wants to set by default. */
   if ((newhdr->security & APPLICATION_PGP)
       && (newhdr->security & APPLICATION_SMIME)) {
-    if (option (OPTSMIMEISDEFAULT))
+    if (mod_crypt.smime_is_default)
       newhdr->security &= ~APPLICATION_PGP;
     else
       newhdr->security &= ~APPLICATION_SMIME;