--- a/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp	Thu Jul 15 18:19:25 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgmsgmapper.cpp	Thu Aug 19 09:38:05 2010 +0300
@@ -359,6 +359,11 @@
     // EFSMsgFlag_Answered: supported only with IMAP4 (see below)
 
     // EFSMsgFlag_Forwarded: no counterpart in Symbian message in S60 3.1
+    if ( LogicalXor( aEmlEntry.Forwarded(), msgFlags & EFSMsgFlag_Forwarded ) )
+        {
+        aEmlEntry.SetForwarded( !aEmlEntry.Forwarded() );
+        modified = ETrue;
+        }
 
     // EFSMsgFlag_OnlyToMe: no counterpart in Symbian message
 
@@ -749,7 +754,14 @@
     aMsg.ResetFlag( EFSMsgFlag_Answered );
 
     // EFSMsgFlag_Forwarded: not supported in S60 3.1
-    aMsg.ResetFlag( EFSMsgFlag_Forwarded );
+    if ( aEntry.Forwarded() )
+        {
+        aMsg.SetFlag( EFSMsgFlag_Forwarded );
+        }
+    else
+        {
+        aMsg.ResetFlag( EFSMsgFlag_Forwarded );
+        }
 
     // EFSMsgFlag_OnlyToMe: like EFSMsgFlag_Multiple