Fixing #1300. Noted by David Shaw <dshaw@jabberwocky.com>.

diff --git a/postpone.c b/postpone.c
index 4f072978ad156832f7f49381de66bef7f9613eeb..c739f504e3a5f463e06c37a45aef8fc0a13f99f6 100644 (file)
--- a/postpone.c
+++ b/postpone.c
@@ -556,12 +556,13 @@ int mutt_prepare_template (FILE *fp, CONTEXT *ctx, HEADER *newhdr, HEADER *hdr,
       goto err;
 
     mutt_message _("Invoking PGP...");
-    if (pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1)
+    if (pgp_decrypt_mime (fp, &bfp, newhdr->content, &b) == -1 || b == NULL)
     {
  err:
       mx_close_message (&msg);
       mutt_free_envelope (&newhdr->env);
       mutt_free_body (&newhdr->content);
+      mutt_error _("Decryption failed.");
       return -1;
     }