diff -r 6b8f3b30d0ec -r efd4f1afd43e emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp
--- a/emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp	Wed Jun 09 09:22:57 2010 +0300
+++ b/emailservices/emailserver/cmailhandlerplugin/src/cmailcpshandler.cpp	Mon Jun 21 15:20:54 2010 +0300
@@ -26,8 +26,6 @@
 #include <emailobserverplugin.h>
 #include <memaildata.h>
 #include <memailmailboxdata.h>
-#include <e32property.h>
-#include <connect/sbdefs.h>
 #include <scs/cleanuputils.h> // CleanupResetAndDestroyPushL
 
 #include "emailtrace.h"
@@ -410,7 +408,7 @@
             // if contentId found from array, update the mailbox
             if ( found )
                 {
-                 INFO_1("found = TRUE iAccountsArray.Count() == %d", iAccountsArray.Count());
+                INFO_1("found = TRUE iAccountsArray.Count() == %d", iAccountsArray.Count());
                 // Update fields from left to right
                 UpdateMailBoxIconL( mailbox, aInstance, row );
                 UpdateMailboxNameL( mailbox, aInstance, row );
@@ -789,7 +787,7 @@
             {
             iLiwIf->PublishIndicatorIconL( aWidgetInstance,
                                            aRowNumber,
-                                           EMbmCmailhandlerpluginQgn_stat_message_mail_uni );
+                                           EMbmCmailhandlerpluginQgn_indi_cmail_unseen_msg );
             }
         else if( !IsOutboxEmptyL(mailBoxId) )
             {
@@ -861,11 +859,10 @@
     FUNC_LOG;
 
     // If backup or restore is ongoing ignore all events
-    if ( BackupOrRestoreMode() )
+    if ( iSettings->BackupOrRestoreMode() )
         {
         return;
         }
-    
     switch ( aEvent )
         {
         case TFSEventNewMailbox:
@@ -906,7 +903,13 @@
             SetUpdateNeeded( aMailbox );
             UpdateFullL();
             break;
-            }            
+            }
+        case TFSEventMailMoved:
+            {
+            SetUpdateNeeded( aMailbox );
+            UpdateFullL();
+            break;
+            }
         default:
             {
             break;
@@ -1107,9 +1110,7 @@
     CMailMailboxDetails* mailbox = FindMailboxDetails( aMailbox );
     if ( !mailbox )
         {
-        //<Cmail>
         CleanupStack::PopAndDestroy( entries );
-        //<Cmail>
         return;
         }
 
@@ -1154,10 +1155,11 @@
         TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSInbox ) );
         delete mailbox; // transferred ownership
         // Check that folder is correct
-        CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
-        if ( !folder )
+        CFSMailFolder* folder(NULL);                                                    
+        TRAPD( err, folder = MailClient().GetFolderByUidL( aMailbox, folderId ) );
+        if ( !folder || err != KErrNone )
             {
-            return KErrNotFound;
+            return 0;
             }
         CleanupStack::PushL( folder );
 
@@ -1189,10 +1191,11 @@
         TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSInbox ) );
         delete mailbox; // transferred ownership
         // Check that folder is correct
-        CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
-        if ( !folder )
+        CFSMailFolder* folder(NULL);                                                    
+        TRAPD( err, folder = MailClient().GetFolderByUidL( aMailbox, folderId ) );
+        if ( !folder || err != KErrNone )        
             {
-            return KErrNotFound;
+            return 0;
             }
         CleanupStack::PushL( folder );
 
@@ -1225,10 +1228,11 @@
         TFSMailMsgId folderId( mailbox->GetStandardFolderId( EFSOutbox ) );
         delete mailbox; // ownership was transferred
         // Check that folder is correct
-        CFSMailFolder* folder = MailClient().GetFolderByUidL( aMailbox, folderId );
-        if ( !folder )
+        CFSMailFolder* folder(NULL);
+        TRAPD( err, folder = MailClient().GetFolderByUidL( aMailbox, folderId ) );
+        if ( !folder || err != KErrNone )        
             {
-            return KErrNotFound;
+            return ret;
             }
         CleanupStack::PushL( folder );
 
@@ -1974,45 +1978,6 @@
     }
 
 // ----------------------------------------------------------------------------
-// CMailCpsHandler::BackupOrRestoreMode()
-// Check if phone is in backup/restore mode
-// ----------------------------------------------------------------------------
-//
-TBool CMailCpsHandler::BackupOrRestoreMode()
-    {
-    FUNC_LOG;
-    
-    TBool backupOrRestore = EFalse;
-    
-    // Get the back-up restore key, return EFalse if we can't get the key
-    TInt keyVal = 0;
-    const TInt error = RProperty::Get(  KUidSystemCategory, conn::KUidBackupRestoreKey, keyVal );
-    if( error == KErrNone )
-        {
-        const conn::TBURPartType partType = 
-                static_cast< conn::TBURPartType >( keyVal & conn::KBURPartTypeMask );
-                
-        if ( keyVal != 0 )
-            {
-            switch( partType )
-                {
-                case conn::EBURBackupFull:
-                case conn::EBURBackupPartial:
-                case conn::EBURRestoreFull:
-                case conn::EBURRestorePartial:
-                    backupOrRestore = ETrue;
-                    break;
-                case conn::EBURUnset:
-                case conn::EBURNormal:
-                default:
-                    break;                
-                }
-            }
-        }
-    return backupOrRestore;
-    }
-
-// ----------------------------------------------------------------------------
 // class CMailCpsUpdateHelper : public CTimer
 // Used to limit the rate of updates to Homescreen widget
 // ----------------------------------------------------------------------------