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-Tag: 2019-10-25~23^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ffca22115e0e6896ad233b3881dca94ab1047f1;p=neomutt

Properly revert on an autocrypt postpone failure

Co-authored-by: Austin Ray <austin@austinray.io>
---

diff --git a/send.c b/send.c
index 95b35a4ae..0c2f5e9b2 100644
--- a/send.c
+++ b/send.c
@@ -1767,7 +1767,11 @@ static int postpone_message(struct Email *e_post, struct Email *e_cur, char *fcc
     if (e_post->security & SEC_AUTOCRYPT)
     {
       if (mutt_autocrypt_set_sign_as_default_key(e_post))
+      {
+        e_post->content = mutt_remove_multipart(e_post->content);
+        decode_descriptions(e_post->content);
         return -1;
+      }
       encrypt_as = AutocryptDefaultKey;
     }
 #endif