--- a/omads/omadsextensions/adapters/sms/src/smsdataprovider.cpp	Tue Sep 28 18:46:16 2010 +0530
+++ b/omads/omadsextensions/adapters/sms/src/smsdataprovider.cpp	Tue Oct 12 17:42:13 2010 +0530
@@ -36,9 +36,7 @@
 // C++ default constructor can NOT contain any code, that might leave
 // -----------------------------------------------------------------------------
 CSmsDataProvider::CSmsDataProvider() :
-    iOwnStoreFormat( NULL ),
-    iFilters( 1 ),
-    iMsvSession( NULL )
+    iFilters( 1 )
     {
     }
 
@@ -50,9 +48,9 @@
     {
     LOGGER_ENTERFN( "ConstructL" ); 
     
+  	iStringPool.OpenL();
   	User::LeaveIfError( iRFs.Connect() );
-  	iStringPool.OpenL();
-
+    
     LOGGER_LEAVEFN( "ConstructL" )
     }
 
@@ -83,10 +81,11 @@
     {
     LOGGER_ENTERFN( "~CSmsDataProvider()" );
     
-    SAFEDELETE( iOwnStoreFormat );	
+    delete iOwnStoreFormat;	
 	
     iStringPool.Close();
     iFilters.Close();
+    iRFs.Close();
     
     LOGGER_LEAVEFN( "~CSmsDataProvider()" );
     }