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

diff --git a/postpone.c b/postpone.c
index 485b44f..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;
 
@@ -514,8 +511,8 @@ int mutt_prepare_template (FILE * fp, CONTEXT * ctx, HEADER * newhdr,
          && 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);
@@ -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;