--- a/emailservices/emailstore/base_plugin/src/basepluginnotifications.cpp	Tue Aug 31 15:04:17 2010 +0300
+++ b/emailservices/emailstore/base_plugin/src/basepluginnotifications.cpp	Wed Sep 01 12:28:57 2010 +0100
@@ -18,11 +18,11 @@
 
 
 //<cmail>
-#include "MsgStore.h"
-#include "MsgStoreFolder.h"
+#include "msgstore.h"
+#include "msgstorefolder.h"
 //</cmail>
 
-#include "BasePlugin.h"
+#include "baseplugin.h"
 #include "baseplugincommonutils.h"
 
 
@@ -545,9 +545,7 @@
         CleanupStack::PopAndDestroy( part );
         CleanupStack::PopAndDestroy( msg );
 
-//<qmail>
-        TFSProgress progress = TFSProgress();
-//</qmail>
+        TFSProgress progress;
         progress.iError = KErrNone;
         progress.iMaxCount = size;
         progress.iCounter = fetchedSize;