From dc1fd61b5ef25701de71d88b371f866c4501e768 Mon Sep 17 00:00:00 2001
From: Till Adam <adam@kde.org>
Date: Fri, 8 Oct 2004 08:00:09 +0000
Subject: [PATCH] Set the right identity ni the composer window on reply mails.

svn path=/trunk/kdepim/; revision=352844
---
 callback.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/callback.cpp b/callback.cpp
index d6cfbfa0c..801242243 100644
--- a/callback.cpp
+++ b/callback.cpp
@@ -69,10 +69,6 @@ bool Callback::mailICal( const QString& to, const QString iCal,
    * has been sent successfully. Set a link header which accomplishes that. */
   msg->link( mMsg, KMMsgStatusDeleted );
 
-  KMComposeWin *cWin = new KMComposeWin(msg);
-  // cWin->setCharset( "", true );
-  cWin->slotWordWrapToggled( false );
-
   // Outlook will only understand the reply if the From: header is the
   // same as the To: header of the invitation message.
   KConfigGroup options( KMKernel::config(), "Groupware" );
@@ -83,8 +79,13 @@ bool Callback::mailICal( const QString& to, const QString iCal,
     if( identity != KPIM::Identity::null )
       // Identity found. Use this
       msg->setFrom( identity.fullEmailAddr() );
+      msg->setHeaderField("X-KMail-Identity", QString::number( identity.uoid() ));
   }
 
+  KMComposeWin *cWin = new KMComposeWin(msg);
+  // cWin->setCharset( "", true );
+  cWin->slotWordWrapToggled( false );
+
   // TODO: These are no longer available. It was an internal
   // implementation detail of kmcomposewin, anyway. Please find
   // another way...