--- a/emailuis/nmsettingui/src/nmmailboxentryitem.cpp	Fri Sep 17 08:27:21 2010 +0300
+++ b/emailuis/nmsettingui/src/nmmailboxentryitem.cpp	Mon Oct 04 00:05:37 2010 +0300
@@ -16,8 +16,8 @@
 */
 
 #include <cpitemdatahelper.h>
-#include <hbicon.h>
-#include <hbdataformmodelitem.h>
+#include <HbIcon>
+#include <HbDataFormModelItem>
 
 #include "nmmailboxentryitem.h"
 
@@ -61,8 +61,8 @@
 CpBaseSettingView *NmMailboxEntryItem::createSettingView() const
 {
     NM_FUNCTION;
-    
-    return 0;
+
+    return NULL;
 }
 
 /*!
@@ -71,6 +71,6 @@
 const NmId &NmMailboxEntryItem::id() const
 {
     NM_FUNCTION;
-    
+
     return mMailboxId;
 }