diff -r 9f5ae1728557 -r db3f5fa34ec7 messagingfw/msgsrvnstore/server/inc/MSVUTILS.H
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/messagingfw/msgsrvnstore/server/inc/MSVUTILS.H	Wed Nov 03 22:41:46 2010 +0530
@@ -0,0 +1,53 @@
+// Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// 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".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+//
+
+#include <msvstd.h>
+
+#if !defined(__MSVUTILS_H__)
+#define __MSVUTILS_H__
+
+_LIT(KMsvUtilsNewExtension,".new");
+
+class MsvUtils
+/**
+@internalAll
+@released
+*/
+	{
+public:
+/**
+@internalAll
+@released
+*/
+	enum TNameMode {EStore, EFolder, EPath};
+	IMPORT_C static TBool ValidEntry(const TMsvEntry& aEntry);
+	IMPORT_C static void ConstructEntryName(TMsvId aService, TMsvId aEntry, TDes& aName, TNameMode aMode);
+	IMPORT_C static TInt HasDirectory(const RFs& aFs, const TDesC& aMessageFolder, TMsvId aService, TMsvId aEntry);
+	IMPORT_C static TInt HasStore(const RFs& aFs, const TDesC& aMessageFolder, TMsvId aService, TMsvId aEntry);
+	static TBool ValidEntry(const TMsvEntry& aEntry, TBool aCreate);
+	IMPORT_C static void AddPathAndExtensionToResFileL(TFileName& aFileName);
+
+#if (defined SYMBIAN_MSGS_ENHANCED_REMOVABLE_MEDIA_SUPPORT)
+	//added for Preq557
+	static TMsvId UnmaskTMsvId(TMsvId aId);
+	static TUint GetDriveId(TMsvId aMaskedId);
+	static TUint GetCurrentDriveId();
+	static TBool IsStandardId(TMsvId aId);
+	static TMsvId MaskTMsvId(TUint aDriveId, TMsvId aUnmaskedId);
+#endif
+
+	};
+
+#endif