diff -r e7aa27f58ae1 -r e1b6206813b4 ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h
--- a/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h	Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.h	Fri Feb 19 22:37:30 2010 +0200
@@ -20,8 +20,8 @@
 #define IPSPLGSOSBASEPLUGIN_H
 
 //<cmail>
-#include "CFSMailPlugin.h"
-#include "MFSMailRequestObserver.h"
+#include "cfsmailplugin.h"
+#include "mfsmailrequestobserver.h"
 //</cmail>
 #include <rconnmon.h>
 
@@ -586,6 +586,17 @@
     void DeleteAndRemoveOperation(
             const TInt aOpArrayIndex, TInt aCompleteCode );
 
+    /**
+     * Fixes the forward (or reply) message header parts (that are copied
+     * to msg content) in case that caller has provided an own header 
+     * descriptor for these parts.
+     */
+    void FixReplyForwardHeaderL(
+            CFSMailMessage* aMessage,
+            const TFSMailMsgId& aMailBoxId,
+            const TFSMailMsgId& aOriginalMessageId,
+            const TDesC& aHeaderDescriptor );
+    
 private:
 
     /**