--- a/filemanager/App/src/CFileManagerMainView.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/App/src/CFileManagerMainView.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -220,11 +220,6 @@
         return;
         }
 
-    if ( !FeatureManager().IsRemoteStorageFwSupported() )
-        {
-        aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
-        }
-
     CFileManagerItemProperties* prop = iEngine.GetItemInfoLC(
         iContainer->ListBoxCurrentItemIndex() );
     TUint32 drvState( 0 );
@@ -239,6 +234,7 @@
         // No drive selected
         aMenuPane.SetItemDimmed( EFileManagerMemoryStorage, ETrue );
         aMenuPane.SetItemDimmed( EFileManagerEject, ETrue );
+        aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
         }
     else
         {
@@ -256,6 +252,11 @@
             {
             aMenuPane.SetItemDimmed( EFileManagerMemoryStorage, ETrue );
             }
+        if  ( !FeatureManager().IsRemoteStorageFwSupported() ||
+              !( drvInfo.iState & TFileManagerDriveInfo::EDriveRemote ) )
+            {
+            aMenuPane.SetItemDimmed( EFileManagerRemoveDrives, ETrue );
+            }
         }
 
 #ifndef RD_FILE_MANAGER_BACKUP

--- a/filemanager/App/src/CFileManagerViewBase.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/App/src/CFileManagerViewBase.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -5002,6 +5002,11 @@
             {
             defaultNameResId = R_QTN_MEMLO_NOT_ENOUGH_MASS_MEMORY;
             }
+        else if ( drvInfo.iState & TFileManagerDriveInfo::EDriveUsbMemory )
+            {
+            defaultNameResId = R_QTN_MEMLO_NOT_ENOUGH_MEMORY_CARD_NAME;
+            namedResId = R_QTN_MEMLO_NOT_ENOUGH_MEMORY_CARD_NAME;
+            }
         else if ( drvInfo.iState & TFileManagerDriveInfo::EDriveRemovable )
             {
             defaultNameResId = R_QTN_MEMLO_NOT_ENOUGH_MEMORY_CARD_DEFAULTNAME;

--- a/filemanager/Engine/data/FileManagerEngine.rss	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/Engine/data/FileManagerEngine.rss	Mon Jun 21 15:26:15 2010 +0300
@@ -586,5 +586,6 @@
 RESOURCE TBUF r_qtn_fmgr_backup_content_mass_storage{ buf = qtn_fmgr_backup_content_mass_storage; }
 RESOURCE TBUF r_qtn_fmgr_restore_device_memory { buf = qtn_fmgr_restore_device_memory; }
 RESOURCE TBUF r_qtn_fmgr_restore_mass_storage { buf = qtn_fmgr_restore_mass_storage; }
+RESOURCE TBUF r_qtn_fmgr_usb_memory_default_name { buf = qtn_fmgr_usb_memory_default_name; }
 
 // End of File

--- a/filemanager/Engine/src/CFileManagerItemProperties.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/Engine/src/CFileManagerItemProperties.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -379,6 +379,10 @@
     iActiveSize = NULL;
     iActiveSize = CFileManagerActiveSize::NewL( iEngine.Fs(), aFullPath );
     iEngine.ShowWaitDialogL( *iActiveSize );
+    if ( !iActiveSize->IsProcessDone() )
+        {
+        User::Leave( KErrCancel );
+        }
     return iActiveSize->GetFolderSize();
     }
 

--- a/filemanager/Engine/src/CFileManagerUtils.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/Engine/src/CFileManagerUtils.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -903,8 +903,8 @@
 				CleanupStack::PushL( usbLetterName );
 				
 				TPtrC16 driveletter=array->MdcaPoint( KDriveLetterIndex );
-				usbLetterName->AppendL( driveletter );
-				
+				usbLetterName->AppendL( driveletter );							
+				HBufC* usbDriveDefaultName = NULL;			
 				if(array->MdcaCount() > 1 )
 					{
 					TPtrC16 drivename=array->MdcaPoint( KDriveNameIndex );
@@ -912,8 +912,9 @@
 					}
 				else
 					{
-					TPtrC16 drivename=_L("");
-					usbLetterName->AppendL( drivename );
+				    usbDriveDefaultName = StringLoader::LoadLC( R_QTN_FMGR_USB_MEMORY_DEFAULT_NAME );
+				    TPtrC16 drivename = usbDriveDefaultName->Des();
+				    usbLetterName->AppendL( drivename );
 					}
 				
 				
@@ -921,10 +922,14 @@
 				aTextIdForDefaultName,*usbLetterName );
 	
 				CleanupStack::PopAndDestroy( usbLetterName );
-			}
-		else
-			{
-			ret = StringLoader::LoadL(aTextIdForDefaultName, array->MdcaPoint(
+				if ( usbDriveDefaultName )
+				    {
+				    CleanupStack::PopAndDestroy( usbDriveDefaultName );
+				    }
+			    }
+		    else
+			    {
+			    ret = StringLoader::LoadL(aTextIdForDefaultName, array->MdcaPoint(
 					KDriveLetterIndex));
             	}
         }

--- a/filemanager/View/src/FileManagerDlgUtils.cpp	Wed Jun 09 09:28:11 2010 +0300
+++ b/filemanager/View/src/FileManagerDlgUtils.cpp	Mon Jun 21 15:26:15 2010 +0300
@@ -630,9 +630,13 @@
         CFileManagerItemProperties& aProperties,
         const CFileManagerFeatureManager& aFeatureManager )
     {
-    CFileManagerInfoPopup* popup = CFileManagerInfoPopup::NewL(
-        aProperties, aFeatureManager );
-    popup->ExecuteLD();
+    CFileManagerInfoPopup* popup = NULL;
+    TRAPD ( err,  popup = CFileManagerInfoPopup::NewL(
+        aProperties, aFeatureManager ) );
+    if ( err == KErrNone )
+        {
+        popup->ExecuteLD();
+        }
     }
 
 // ----------------------------------------------------------------------------