--- a/emailservices/emailserver/cmailhandlerplugin/src/fsnotificationhandlerbaseimpl.cpp	Fri Mar 12 15:41:14 2010 +0200
+++ b/emailservices/emailserver/cmailhandlerplugin/src/fsnotificationhandlerbaseimpl.cpp	Mon Mar 15 12:39:10 2010 +0200
@@ -25,8 +25,8 @@
 #include "fsnotificationhandlerbase.h"
 #include "cmailhandlerpluginpanic.h"
 #include "commonemailcrkeys.h"
-#include "FreestyleEmailCenRepKeys.h"
-#include "FreestyleEmailuiConstants.h"
+#include "freestyleemailcenrepkeys.h"
+#include "FreestyleEmailUiConstants.h"
 
 
 // ======== MEMBER FUNCTIONS ========
@@ -178,28 +178,28 @@
     {
     FUNC_LOG;
     if ( aEvent != TFSEventMailboxDeleted )
-    	{
-    	CFSMailBox* mailBox( MailClient().GetMailBoxByUidL( aMailbox ) );
-    	if ( mailBox == NULL )
-    		{
-    		User::Leave( KErrArgument );
-    		}
+        {
+        CFSMailBox* mailBox( MailClient().GetMailBoxByUidL( aMailbox ) );
+        if ( mailBox == NULL )
+            {
+            User::Leave( KErrArgument );
+            }
 
-    	if ( mailBox->HasCapability( EFSMBoxCapaNewEmailNotifications ) )
-    		{
-    		delete mailBox;
-    		return EFalse;
-    		}
-    	else
-    		{
-    		delete mailBox;
-    		return ETrue;
-    		}
-    	}
+        if ( mailBox->HasCapability( EFSMBoxCapaNewEmailNotifications ) )
+            {
+            delete mailBox;
+            return EFalse;
+            }
+        else
+            {
+            delete mailBox;
+            return ETrue;
+            }
+        }
     else
-    	{
-    	return ETrue;
-    	}
+        {
+        return ETrue;
+        }
     }
 
 void CFSNotificationHandlerBase::HandleEventL(