--- a/filesystemuis/memscaneng/serversrc/msenginfoarray.cpp	Tue May 11 16:01:48 2010 +0300
+++ b/filesystemuis/memscaneng/serversrc/msenginfoarray.cpp	Tue May 25 12:28:34 2010 +0300
@@ -148,7 +148,8 @@
         || CMseng::IsRemovableDrive(aFsSession, iCurrentScannedDrive)),
         User::Panic(KPanic, KErrNotSupported));
 
-    if(CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive))
+    if( CMseng::IsInternalDrive(aFsSession, iCurrentScannedDrive) 
+	    && !CMseng::IsMassStorageDrive( aFsSession, iCurrentScannedDrive ) )
         {        
         theReader.OpenLC( &aResFile, C_DIRECTORIES );
         iDirArray = theReader.ReadDesCArrayL();
@@ -162,7 +163,7 @@
         // reading later...
         
         }
-    else if(CMseng::IsRemovableDrive(aFsSession, iCurrentScannedDrive))
+    else // other drives except Phone Memory should be scanned from root folder.
         {
         theReader.OpenLC( &aResFile, E_DIRECTORIES );
         iDirArray = theReader.ReadDesCArrayL();