Don't generate a NULL micalg parameter when getting postponed

messages.

diff --git a/headers.c b/headers.c
index c9bc49b2c466f7d8aae4f36be608dfdc92eb81b4..69c65e907e7390792bb4f4ecd221663c274ea907 100644 (file)
--- a/headers.c
+++ b/headers.c
@@ -206,31 +206,6 @@ void mutt_edit_headers (const char *editor,
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 #ifdef _PGPPATH
     else if (strncasecmp ("pgp:", cur->data, 4) == 0)
     {
@@ -240,12 +215,6 @@ void mutt_edit_headers (const char *editor,
 #endif
 
 
-
-
-
-
-
-
     if (keep)
     {
       last = cur;

diff --git a/postpone.c b/postpone.c
index 193beaa161a9ff5395db592d84ce2c4eab67fe7e..5f35ff8525aed724b16abe8e2a50fee67ff840a0 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -357,7 +357,8 @@ int mutt_parse_pgp_hdr (char *p, int set_signas)
     PgpSignAs = safe_strdup(pgp_sign_as);
   }
 
-  if (set_signas || *pgp_sign_micalg)
+  /* the micalg field must not be empty */
+  if (set_signas && *pgp_sign_micalg)
   {
     safe_free((void **) &PgpSignMicalg);
     PgpSignMicalg = safe_strdup(pgp_sign_micalg);