Properly revert on an autocrypt postpone failure.

diff --git a/send.c b/send.c
index 767c5e916d737767921566238c27cdee424b9667..baab77588f803251a06a8b4d841e9ede445366eb 100644 (file)
--- 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