Don't generate a NULL micalg parameter when getting postponed

messages.

2 files changed, 2 insertions, 32 deletions

diff --git a/headers.c b/headers.c
index c9bc49b2..69c65e90 100644
--- 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 193beaa1..5f35ff85 100644
--- 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);