X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=postpone.c;h=74490e472a0897090471dcaa910fc100207473f1;hp=1145bf63f977c44f60e8c6f593c4075a02def629;hb=5a44e401b4e50f378f9caa045fe6ad6ca652b758;hpb=c8e9242de36d7aa6e3bb2e446f57ef2a14e4c889

diff --git a/postpone.c b/postpone.c
index 1145bf6..74490e4 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;
 
@@ -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;