--- a/emailservices/nmclientapi/src/nmapipopimapsettingsmanager.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/emailservices/nmclientapi/src/nmapipopimapsettingsmanager.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -25,8 +25,8 @@
 static const unsigned int DefaultImapPortSsl = 993;
 static const unsigned int DefaultSmtpPortSsl = 465;
 
-using namespace EmailClientApi;
-
+namespace EmailClientApi
+{
 NmApiPopImapSettingsManager::NmApiPopImapSettingsManager()
 {
     NM_FUNCTION;
@@ -283,7 +283,7 @@
     NM_FUNCTION;
     data.setValue(DownloadPictures, int(0));
     data.setValue(MessageDivider, int(0));
-    data.setValue(ReceptionActiveProfile, EmailClientApi::EmailProfileOffsetSE);
+    data.setValue(ReceptionActiveProfile, EmailProfileOffsetSE);
     data.setValue(ReceptionUserDefinedProfile, int(0));	// 0, because default profile is save energy
     data.setValue(ReceptionInboxSyncWindow, IpsServices::DefaultValueSaveEnergyInboxSyncWindow);
     data.setValue(ReceptionGenericSyncWindowInMessages, int(0)); // all messages
@@ -294,3 +294,5 @@
     data.setValue(ReceptionRefreshPeriodDayTime, IpsServices::DefaultValueSaveEnergyReceptionRefreshPeriodDayTime);
     data.setValue(UserNameHidden, int(0));
 }
+}
+