Finish protected header write support.

Write out the protected headers when writing the mime header part.

Hide protected subjects with $crypt_protected_headers_subject, for
outgoing, postponed, and fcc'ed messages.

Don't hide in postponed and fcc'ed if $crypt_protected_headers_read
isn't set.

Add a few missing cases where mime_headers needed to be cleaned up on
error.

Remove the protected headers for $fcc_clear.

1 files changed, 3 insertions, 1 deletions

diff --git a/main.c b/main.c
index 6f7b4a11..347521ea 100644
--- a/main.c
+++ b/main.c
@@ -1228,7 +1228,9 @@ int main (int argc, char **argv, char **environ)
         }
 
         mutt_write_rfc822_header (fout, msg->env, msg->content,
-                                  MUTT_WRITE_HEADER_POSTPONE, 0);
+                                  MUTT_WRITE_HEADER_POSTPONE, 0,
+                                  option (OPTCRYPTPROTHDRSREAD) &&
+                                  mutt_should_hide_protected_subject (msg));
         if (option (OPTRESUMEEDITEDDRAFTFILES))
           fprintf (fout, "X-Mutt-Resume-Draft: 1\n");
         fputc ('\n', fout);