--- a/messagingapp/msgsettings/settingsview/src/smssettingsprivate.cpp	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/msgsettings/settingsview/src/smssettingsprivate.cpp	Wed Aug 18 09:45:25 2010 +0300
@@ -62,22 +62,7 @@
     //do nothing
 }
 
-void SmsSettingsPrivate::setReceiveSerivceMessages(
-        TBool serviceMessages)
-{
-    CSmsAccount* smsAccount = CSmsAccount::NewLC();
-    CSmsSettings* smsSettings = CSmsSettings::NewLC();
-
-    smsAccount->LoadSettingsL(*smsSettings);
-
-    //TODO set the receive message part
-
-    smsAccount->SaveSettingsL(*smsSettings);
-
-    CleanupStack::PopAndDestroy(2);
-}
-
-void SmsSettingsPrivate::setCharacterEncoding(TBool status)
+void SmsSettingsPrivate::setCharacterEncodingL(TBool status)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
     CSmsSettings* smsSettings = CSmsSettings::NewLC();
@@ -98,17 +83,13 @@
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::settingsServiceMessagesAndCharEncoding(
-                                                              TBool& report,
-                                                              TBool& statusEncoding)
+void SmsSettingsPrivate::settingsCharEncodingL(TBool& statusEncoding)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
     CSmsSettings* smsSettings = CSmsSettings::NewLC();
 
     smsAccount->LoadSettingsL(*smsSettings);
 
-    //TODO: service messages read
-
     TSmsDataCodingScheme::TSmsAlphabet charSet = smsSettings->CharacterSet();
 
     statusEncoding = ETrue;
@@ -119,7 +100,7 @@
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::getAllSMSMessageCenter(
+void SmsSettingsPrivate::getAllSMSMessageCenterL(
                                                 RPointerArray<HBufC>& accessPoints,
                                                 TInt &defaultIndex)
 {
@@ -144,7 +125,7 @@
     return;
 }
 
-void SmsSettingsPrivate::setSMSMessageCenter(int index)
+void SmsSettingsPrivate::setSMSMessageCenterL(int index)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
     CSmsSettings* smsSettings = CSmsSettings::NewLC();
@@ -156,7 +137,7 @@
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::editSMSServiceCentre(HBufC* address, HBufC* name,
+void SmsSettingsPrivate::editSMSServiceCentreL(HBufC* address, HBufC* name,
                                               TInt index)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
@@ -170,9 +151,7 @@
     {
         flag = true;
     }
-
-    //remove the service center
-    //smsSettings->RemoveServiceCenter(index);
+       
     //add a new service center
     smsSettings->AddServiceCenterL(name->Des(), address->Des());
     
@@ -182,20 +161,15 @@
                smsSettings->ServiceCenterCount()- 1);
     }
     
-    smsAccount->SaveSettingsL(*smsSettings);
-
-    smsAccount->LoadSettingsL(*smsSettings);
-    if (flag == true)
-    {
-        smsSettings->RemoveServiceCenter(index);
-    }
+    //remove the service center
+    smsSettings->RemoveServiceCenter(index);
     
-    smsAccount->SaveSettingsL(*smsSettings);
+    smsAccount->SaveSettingsL(*smsSettings);  
     
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::addSmsMessageCenter(HBufC* address, HBufC* name)
+void SmsSettingsPrivate::addSmsMessageCenterL(HBufC* address, HBufC* name)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
     CSmsSettings* smsSettings = CSmsSettings::NewLC();
@@ -215,7 +189,7 @@
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::deleteSmsMessageCenter(TInt aDeleteIndex)
+void SmsSettingsPrivate::deleteSmsMessageCenterL(TInt aDeleteIndex)
 {
     CSmsAccount* smsAccount = CSmsAccount::NewLC();
     CSmsSettings* smsSettings = CSmsSettings::NewLC();
@@ -238,7 +212,7 @@
     CleanupStack::PopAndDestroy(2);
 }
 
-void SmsSettingsPrivate::smsCenterNameAndNumber(int index,
+void SmsSettingsPrivate::smsCenterNameAndNumberL(int index,
                                                 HBufC** centerNumber,
                                                 HBufC** centerName)
 {