--- a/messagingfw/msgsrvnstore/server/inc/MSVSERV.H	Tue Jul 06 14:48:25 2010 +0300
+++ b/messagingfw/msgsrvnstore/server/inc/MSVSERV.H	Wed Aug 18 10:15:32 2010 +0300
@@ -108,7 +108,8 @@
 	EMsvProgressBufferExceeds256=12,
 	EMsvNoEntriesInMoveSelection=13,
 	EMsvNoEntriesInCopySelection=14,
-	EMsvNoEntriesInChangeAttributesSelection=15
+	EMsvNoEntriesInChangeAttributesSelection=15,
+	EMsvNoEntriesInChangeSelection=16
 	};
 
 const TInt KMsvMessageDriveStreamVersionNumber = 3;
@@ -558,8 +559,11 @@
 	void OperationMtmL(const RMessage2 &aMessage);
 	//
 	void ChangeEntryL(const RMessage2 &aMessage);
+	void ChangeEntriesL(const RMessage2 &aMessage);
 	void DoChangeLocalEntryL(const TMsvEntry& aEntry, TMsvOp aOpId, const RMessage2 &aMessage, TSecureId aOwnerId);
 	void DoChangeRemoteEntryL(const TMsvEntry& aEntry, TMsvOp aOpId, const RMessage2 &aMessage);
+	void DoChangeLocalEntriesL(CMsvEntrySelection*& aSelection, TMsvOp aOpId, const RMessage2 &aMessage, TSecureId aOwnerId, TInt aMark);
+	void DoChangeRemoteEntriesL(CMsvEntrySelection*& aSelection, TMsvOp aOpId, const RMessage2 &aMessage,TInt aMark);
 	//
 	void CreateEntryL(const RMessage2 &aMessage);
 	void DoCreateLocalEntryL(const TMsvEntry& aEntry, TMsvOp aOpId, const RMessage2 &aMessage, TSecureId aOwnerId);
@@ -585,7 +589,7 @@
 	void CopyCommandDataL(const RMessage2 &aMessage);
 	HBufC8* RecoverOperationData(TMsvOp aOpId);
 	//
-	void PackEntryAndWriteBufferL(const RMessage2 &aMessage, TInt aParam, const TMsvEntry& aEntry);
+	void PackEntryAndWriteBufferL(const RMessage2 &aMessage, TInt aParam, const TMsvEntry& aEntry, const TMsvId& aServiceId);
 	//
 	void WriteBufferL(const RMessage2 &aMessage, TInt aParam);
 	void WriteL(const RMessage2 &aMessage, TInt aParam, const TDesC8& aDes);