From: Kevin McCarthy <kevin@8t8.us>
Date: Sat, 31 Aug 2019 20:36:28 +0000 (-0700)
Subject: Properly revert on an autocrypt postpone failure.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=af47e6944749eaa4bdb15267b856b53702a7f6d3;p=mutt

Properly revert on an autocrypt postpone failure.
---

diff --git a/send.c b/send.c
index 767c5e91..baab7758 100644
--- a/send.c
+++ b/send.c
@@ -1487,7 +1487,11 @@ static int postpone_message (HEADER *msg, HEADER *cur, char *fcc, int flags)
     if (msg->security & AUTOCRYPT)
     {
       if (mutt_autocrypt_set_sign_as_default_key (msg))
+      {
+        msg->content = mutt_remove_multipart (msg->content);
+        decode_descriptions (msg->content);
         return -1;
+      }
       encrypt_as = AutocryptDefaultKey;
     }
 #endif