--- a/messagingapp/msgsettings/settingsview/src/msgsmscentersettingsform.cpp	Tue Jul 06 14:12:40 2010 +0300
+++ b/messagingapp/msgsettings/settingsview/src/msgsmscentersettingsform.cpp	Wed Aug 18 09:45:25 2010 +0300
@@ -32,8 +32,9 @@
 //Localized constants
 #define LOC_SMS_CENTRE_NAME hbTrId("txt_messaging_setlabel_message_centre_name")
 #define LOC_SMS_CENTRE_NUMBER hbTrId("txt_messaging_setlabel_message_centre_number")
-#define LOC_SMS_CENTRE_DELETE hbTrId("txt_messaging_button_delete_message_centre")
-#define LOC_MESSAGE_CENTER_SAVED hbTrId("txt_messaging_setlabel_message_centre_saved")
+#define LOC_SMS_CENTRE_DELETE_BUTTON hbTrId("txt_messaging_button_delete_message_centre")
+#define LOC_SMS_CENTRE_DELETE_DIALOG hbTrId("txt_messaging_dialog_delete_message_centre")
+#define LOC_MESSAGE_CENTER_SAVED hbTrId("txt_messaging_dpopinfo_message_centre_saved")
 
 MsgSMSCenterSettingsForm::MsgSMSCenterSettingsForm(int view,
                                                    QGraphicsItem *parent) :
@@ -114,12 +115,9 @@
                                 QString(""),
                                 settingsmodel->invisibleRootItem());
 
-        deleteMessageCentre->setContentWidgetData("text", 
-                                                  LOC_SMS_CENTRE_DELETE);
-        this->addConnection(deleteMessageCentre,
-                            SIGNAL(clicked()),
-                            this,
-                            SLOT(onPressedCustomButton()));
+        deleteMessageCentre->setContentWidgetData("text",LOC_SMS_CENTRE_DELETE_BUTTON);
+        this->addConnection(deleteMessageCentre,SIGNAL(clicked()),
+                            this,SLOT(onPressedCustomButton()));
     }
 
     this->setModel(settingsmodel);
@@ -153,12 +151,11 @@
     }
     else
     {
-        mSettingEngine->editSmsMessageCenter(centerName, 
-                                             centerNumber, 
-                                             mView);
-        
-        HbNotificationDialog::launchDialog(LOC_MESSAGE_CENTER_SAVED);
+        mSettingEngine->editSmsMessageCenter(centerName, centerNumber, mView);
     }
+    
+    HbNotificationDialog::launchDialog(LOC_MESSAGE_CENTER_SAVED);
+    
     QDEBUG_WRITE("ex MsgSMSCenterSettingsForm::commitChanges");
 }
 
@@ -189,7 +186,7 @@
 
 void MsgSMSCenterSettingsForm::onPressedCustomButton()
 {
-   HbMessageBox::question(LOC_SMS_CENTRE_DELETE, this,
+   HbMessageBox::question(LOC_SMS_CENTRE_DELETE_DIALOG, this,
                           SLOT(onDialogDeleteMsgCentre(HbAction*)),
                           HbMessageBox::Delete | HbMessageBox::Cancel);
 }