diff --git a/src/chat/chat_tests.rs b/src/chat/chat_tests.rs
index 152b5e95a..cebb530de 100644
--- a/src/chat/chat_tests.rs
+++ b/src/chat/chat_tests.rs
@@ -2552,7 +2552,7 @@ async fn test_broadcast() -> Result<()> {
         let msg = bob.recv_msg(&sent_msg).await;
         assert_eq!(msg.get_text(), "ola!");
         assert_eq!(msg.subject, "Broadcast list");
-        assert!(!msg.get_showpadlock()); // avoid leaking recipients in encryption data
+        assert!(msg.get_showpadlock());
         let chat = Chat::load_from_db(&bob, msg.chat_id).await?;
         assert_eq!(chat.typ, Chattype::Mailinglist);
         assert_ne!(chat.id, chat_bob.id);
diff --git a/src/mimefactory.rs b/src/mimefactory.rs
index 262634d5a..8632401a8 100644
--- a/src/mimefactory.rs
+++ b/src/mimefactory.rs
@@ -415,12 +415,10 @@ impl MimeFactory {
 
     fn should_force_plaintext(&self) -> bool {
         match &self.loaded {
-            Loaded::Message { chat, msg } => {
-                msg.param
-                    .get_bool(Param::ForcePlaintext)
-                    .unwrap_or_default()
-                    || chat.typ == Chattype::Broadcast
-            }
+            Loaded::Message { msg, .. } => msg
+                .param
+                .get_bool(Param::ForcePlaintext)
+                .unwrap_or_default(),
             Loaded::Mdn { .. } => false,
         }
     }