--- a/filemanager/App/src/CFileManagerViewBase.cpp	Mon Mar 15 12:39:38 2010 +0200
+++ b/filemanager/App/src/CFileManagerViewBase.cpp	Wed Mar 31 21:15:58 2010 +0300
@@ -1556,11 +1556,12 @@
             }
         case EFormatProcess:
             {
-            RefreshDriveInfoL();
+            TFileManagerDriveInfo drvInfo;
+            DriveInfoAtCurrentPosL( drvInfo );
             if ( aError == KErrNone )
                 {
 #ifdef RD_MULTIPLE_DRIVE
-                if ( DriveInfo().iState & TFileManagerDriveInfo::EDriveMassStorage )
+                if ( drvInfo.iState & TFileManagerDriveInfo::EDriveMassStorage )
                     {
                     FileManagerDlgUtils::ShowInfoNoteL(
                         R_QTN_FMGR_MASS_FORMAT_COMPLETED );
@@ -2197,6 +2198,11 @@
             // User cancelled rename
             aNewName.Zero();
             }
+        else
+            {
+            //file server doesn't support the space in the end of the folder/file name
+            aNewName.TrimRight();
+            }
         }
 
     if ( iActiveProcess == aOperation &&
@@ -4007,6 +4013,7 @@
             {
             pwdGiven = FileManagerDlgUtils::ShowSimplePasswordQueryL( res, oldPwd );
             }
+        
         if( pwdGiven )
             {
             ConvertCharsToPwd( oldPwd, pwd );
@@ -4023,9 +4030,19 @@
                 {
                 isDone = ETrue;
                 }
+            else if ( err == KErrAccessDenied )
+                {
+                FileManagerDlgUtils::ShowErrorNoteL( resWrong );
+                }
+            else if ( err = KErrNotReady )
+                {
+                isDone = ETrue;
+                FileManagerDlgUtils::ShowErrorNoteL( R_QTN_MEMC_NOT_AVAILABLE );
+                }
             else
                 {
-                FileManagerDlgUtils::ShowErrorNoteL( resWrong );
+                isDone = ETrue;
+                FileManagerDlgUtils::ShowErrorNoteL( R_QTN_CRITICAL_ERROR );
                 }
             }
         else
@@ -4034,6 +4051,7 @@
             isDone = ETrue;
             }
         }
+
     if ( text )
         {
         CleanupStack::PopAndDestroy( text );