--- a/messagingfw/msgcommonutils/src/javaprotectionresolver.cpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgcommonutils/src/javaprotectionresolver.cpp	Fri Mar 12 15:44:33 2010 +0200
@@ -39,14 +39,6 @@
 
 // LOCAL CONSTANTS AND MACROS
 
-#if defined (__WINS__)
-//_LIT( KFileProtTempDir, "c:\\system\\temp\\fileprot_temp\\");
-_LIT( KFileProtTempDir, "\x43:\\system\\temp\\fileprot_temp\\");
-#else
-//_LIT( KFileProtTempDir, "d:\\system\\temp\\fileprot_temp\\");
-_LIT( KFileProtTempDir, "\x44:\\system\\temp\\fileprot_temp\\");
-#endif
-
 // MODULE DATA STRUCTURES
 
 // LOCAL FUNCTION PROTOTYPES

--- a/messagingfw/msgcommonutils/src/msgtextutils.cpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgcommonutils/src/msgtextutils.cpp	Fri Mar 12 15:44:33 2010 +0200
@@ -870,7 +870,6 @@
     
     //buffer to hold target data and return to caller
     HBufC* resultBuffer = HBufC::NewL( maxLength );
-    _LIT8( KReplaceChar8, "_" );
     
     if ( iCharConv->PrepareToConvertToOrFromL( aCharacterSetIdentifier, iFs ) !=
         CCnvCharacterSetConverter::EAvailable )

--- a/messagingfw/msgsrvnstore/group/messaging_framework.history.xml	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgsrvnstore/group/messaging_framework.history.xml	Fri Mar 12 15:44:33 2010 +0200
@@ -4,6 +4,10 @@
     Framework for storage, retrieval, editing, sending and receiving of messages such as email or SMS.
   </purpose>
 
+ <defect number="PDEF142159/EHGO-7V4CS2 " title="A note is displayed after formatting Memory card when "Memory in use" " revision= "131">
+   	Updated the Notification wrt DiskRemove and Disk Insert.
+  </defect>
+
   <defect number="EMPA-7ZNF42" title="Message store setting to E, is crashing the application after restart" revision= "130">
    	messaging DB name was passed [1000484b]messaging.db instead of [1000484B]messaging.db to SQL Server
   </defect>

--- a/messagingfw/msgsrvnstore/server/inc/MSVSERV.H	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgsrvnstore/server/inc/MSVSERV.H	Fri Mar 12 15:44:33 2010 +0200
@@ -426,6 +426,7 @@
 	//variables for bulk creation of entries
 	CMsvEntrySelection* iBulkCreationSelection;
 	CMsvEntrySelection* iBulkChangeSelection;
+	TBool iReleasedForRestore;
 	TBuf<2> iSystemDrive;
 
 	// Reference to freepool object.

--- a/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgsrvnstore/server/src/MSVSERV.CPP	Fri Mar 12 15:44:33 2010 +0200
@@ -251,7 +251,7 @@
 
 
 CMsvServer::CMsvServer(TInt aPriority, TBool aDebug)
-:   CPolicyServer(aPriority, msgServerPolicy), iSessionNumber(1), iMtmOperationQueueArray(KMsvMtmOpsQueueArrayGranularity), iDebug(aDebug)
+:   CPolicyServer(aPriority, msgServerPolicy), iSessionNumber(1), iMtmOperationQueueArray(KMsvMtmOpsQueueArrayGranularity), iDebug(aDebug), iReleasedForRestore(EFalse)
 //
 //
 //
@@ -2015,15 +2015,6 @@
 			iStartupState = EMsvMediaUnavailable;
 			drive = iSystemDrive;
 			}
-		else if (iNewContext->Config().iUniqueID != 0 && iNewContext->Config().iUniqueID != volume.iUniqueID)
-			{
-#ifndef _NO_SERVER_LOGGING_
-			Log(_L("The media is incorrect %d != %d - using default"), iNewContext->Config().iUniqueID, volume.iUniqueID);
-#endif
-			// The media is incorrect - use default
-			iStartupState = EMsvMediaIncorrect;
-			drive = iSystemDrive;
-			}
 		iNewContext->CreateIndexL(drive, aSync);
 		return;
 		}
@@ -2277,8 +2268,14 @@
 #ifndef _NO_SERVER_LOGGING_
 	Log(_L("Disk %d removed"), TInt(aDrive));
 #endif
-
-	NotifyChanged(EMsvMediaUnavailable, KMsvNullIndexEntryId, TInt(aDrive));
+	if(iContext->IndexAdapter()->ErrorState() != KMsvIndexRestore)
+		{
+		NotifyChanged(EMsvMediaUnavailable, KMsvNullIndexEntryId, TInt(aDrive));
+		}
+	else
+		{
+		iReleasedForRestore = ETrue;
+		}
 	iContext->IndexAdapter()->SetErrorState(KMsvMediaUnavailable);
 	iContext->IndexAdapter()->DeleteDbAdapter();
 
@@ -2296,8 +2293,14 @@
 #ifndef _NO_SERVER_LOGGING_
 	Log(_L("Disk %d inserted"), TInt(aDrive));
 #endif
-
-	NotifyChanged(EMsvMediaAvailable, KMsvNullIndexEntryId, TInt(aDrive));
+	if(!iReleasedForRestore)
+		{
+		NotifyChanged(EMsvMediaAvailable, KMsvNullIndexEntryId, TInt(aDrive));
+		}
+	else
+		{
+		iReleasedForRestore = EFalse;
+		}
 
 	iContext->IndexAdapter()->SetErrorState(KErrNone);
 

--- a/messagingfw/msgsrvnstore/server/src/diskchange.cpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgsrvnstore/server/src/diskchange.cpp	Fri Mar 12 15:44:33 2010 +0200
@@ -80,7 +80,7 @@
 		}
 	else if (iDiskRemoved)
 		{
-		if (iUniqueId != volume.iUniqueID || iWrongId)
+		if (iWrongId)
 			{
 			// The incorrect disk is being used
 			keepGoing = iObserver.DiskChanged(iDrive, volume.iUniqueID);

--- a/messagingfw/msgtest/targetautomation/TechviewStart/start.rpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgtest/targetautomation/TechviewStart/start.rpp	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 # 1 "start.rss"
-// Copyright (c) 1997-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //

--- a/messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgtestfw/TestActions/Capabilities/inc/CMtfTestActionSendEMsvNotifySessionEvent.h	Fri Mar 12 15:44:33 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //

--- a/messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgtestfw/TestActions/Capabilities/src/CMtfTestActionSendEMsvNotifySessionEvent.cpp	Fri Mar 12 15:44:33 2010 +0200
@@ -1,7 +1,7 @@
 // Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //

--- a/messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/msgtestproduct/framework/group/T_MsgFramework.mph	Fri Mar 12 15:44:33 2010 +0200
@@ -1,7 +1,7 @@
-// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2004-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Eclipse Public License v1.0"
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
 // at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //

--- a/messagingfw/senduiservices/src/SendUiImpl.cpp	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/senduiservices/src/SendUiImpl.cpp	Fri Mar 12 15:44:33 2010 +0200
@@ -1285,7 +1285,6 @@
 TBool CSendUiImpl::IsMailboxAvailableL(void)
 {
     TBool mailbox = EFalse;
-    TBool retval = EFalse;
     
     CMsvSession& msv = iSingleton->MsvSessionL();
     CMsvEntry* entry = msv.GetEntryL( KMsvRootIndexEntryId );
@@ -1313,12 +1312,6 @@
      
          CleanupStack::PopAndDestroy( entry );
 
-         // if accounts defined, 
-         if ( mailbox )
-             {
-             retval =  mailbox;
-             }   
-         
      return mailbox; 
 }
 

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/siattributetable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/siattributevaluetable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/sitagstable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/slattributetable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/slattributevaluetable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/SISLContentHandlers/strings/sltagstable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeTable.mak	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00AttributeValueTable.mak	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/ROAppHandler/group/DRMStringDict00TagTable.mak	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00AttributeValueTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/DRM/DRMStringDict00TagTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00AttributeValueTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/plugins/StringDictionaries/ServiceLoading/Sl1_0StringDict00TagTable.st	Fri Mar 12 15:44:33 2010 +0200
@@ -1,8 +1,8 @@
 #
-# Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
+# Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
 # All rights reserved.
 # This component and the accompanying materials are made available
-# under the terms of the License "Eclipse Public License v1.0"
+# under the terms of "Eclipse Public License v1.0"
 # which accompanies this distribution, and is available
 # at the URL "http://www.eclipse.org/legal/epl-v10.html".
 #

--- a/messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml	Fri Feb 19 23:18:09 2010 +0200
+++ b/messagingfw/wappushfw/tpushscriptbased/testdata/ineturilist.xml	Fri Mar 12 15:44:33 2010 +0200
@@ -3,7 +3,7 @@
  Copyright (c) 2007-2009 Nokia Corporation and/or its subsidiary(-ies).
  All rights reserved.
  This component and the accompanying materials are made available
- under the terms of the License "Eclipse Public License v1.0"
+ under the terms of "Eclipse Public License v1.0"
  which accompanies this distribution, and is available
  at the URL "http://www.eclipse.org/legal/epl-v10.html".