From 18981ab511c9a0c0fe9abebb76c2d26f2b6ed93f Mon Sep 17 00:00:00 2001
From: Ingo Klcker <kloecker@kde.org>
Date: Wed, 21 Jan 2004 22:52:12 +0000
Subject: [PATCH] Fix bug 73085: KMail discloses hidden recipients (BCC) in
 forwarded email Also remove all private header fields from forwarded
 messages.

svn path=/trunk/kdepim/; revision=281689
---
 kmcommands.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kmcommands.cpp b/kmcommands.cpp
index db2e455dc..0811654f3 100644
--- a/kmcommands.cpp
+++ b/kmcommands.cpp
@@ -906,6 +906,9 @@ void KMForwardCommand::execute()
         if (!msg->subject().contains("(fwd)"))
           msgPartText += " (fwd)";
         msgPartText += "\n\n";
+        // remove headers that shouldn't be forwarded
+        msg->removePrivateHeaderFields();
+        msg->removeHeaderField("BCC");
         // set the part
         msgPartText += msg->headerAsString();
         msgPartText += "\n";
@@ -1015,6 +1018,9 @@ void KMForwardAttachedCommand::execute()
 
   // iterate through all the messages to be forwarded
   for (KMMessage *msg = msgList.first(); msg; msg = msgList.next()) {
+    // remove headers that shouldn't be forwarded
+    msg->removePrivateHeaderFields();
+    msg->removeHeaderField("BCC");
     // set the part
     KMMessagePart *msgPart = new KMMessagePart;
     msgPart->setTypeStr("message");