From 1c2b4fa7fcf30a530fd6b8e5144ba0a1c6a4b88f Mon Sep 17 00:00:00 2001 From: Hocuri Date: Sun, 9 Aug 2020 16:32:26 +0200 Subject: [PATCH] Fix #1790 Unprotected subjects in encrypted messages are shown as encrypted (using a rather minimal approach) --- src/mimeparser.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mimeparser.rs b/src/mimeparser.rs index c51be5bb7..d510c2297 100644 --- a/src/mimeparser.rs +++ b/src/mimeparser.rs @@ -160,6 +160,10 @@ impl MimeMessage { // do not allow overriding it. let mut throwaway_from = from.clone(); + // We do not want to allow unencrypted subject in encrypted emails because the user might falsely think that the subject is safe. + // See https://github.com/deltachat/deltachat-core-rust/issues/1790. + headers.remove("subject"); + MimeMessage::merge_headers( context, &mut headers,