diff -r 4490afcb47b1 -r a5fecba4b1e4 pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp
--- a/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp	Thu Jan 07 12:39:15 2010 +0200
+++ b/pnpmobileservices/pnpms/PnP/PnpProvisioningAppSrc/PnpProvisioningSaver.cpp	Mon Jan 18 20:09:30 2010 +0200
@@ -39,10 +39,10 @@
 // ================= MEMBER FUNCTIONS =======================
 
 // C++ default constructor.
-CPnpProvisioningSaver::CPnpProvisioningSaver( CWPEngine& aEngine, TBool aSetAsDefault )
+CPnpProvisioningSaver::CPnpProvisioningSaver( CWPEngine& aEngine, TBool aSetAsDefault, TBool aWaitNote )
 : CActive( EPriorityStandard ), iEngine( aEngine ), 
   iSetAsDefault( aSetAsDefault ),
-  iCurrentItem( 0 ), iResult( KErrNone ),iEndKeyPressed(EFalse)
+  iCurrentItem( 0 ), iResult( KErrNone ),iEndKeyPressed(EFalse), iShowWaitNote(aWaitNote)
     {
     CActiveScheduler::Add( this );
     }
@@ -64,6 +64,7 @@
     LOGSTRING("Constructing dialog");
     
     // Set up the dialog and callback mechanism.
+    if(iSetAsDefault && iShowWaitNote)
     ShowWaitNoteL();
     }
 
@@ -161,16 +162,10 @@
         }
     else
         {
-        if(iWaitDialogMonitor->iStatus != KErrCancel)
-        	{
+
         LOGSTRING2("Saving item: %i", iCurrentItem );
         TRAP( err, iEngine.SaveL( iCurrentItem ) );
-        	}
-        else
-        	{
-        	iEndKeyPressed = ETrue; //means End key or cancel pressed before saving some sttings
-        	LOGSTRING2("item: %i not saved", iCurrentItem );
-        	}
+        
         }
 
     // If CommsDB or BookmarkDB are locked, schedule a retry
@@ -203,12 +198,12 @@
     if( iCurrentItem == iEngine.ItemCount()-1 )
         {
         LOGSTRING("All saved");
-        LOGSTRING2( "Saver RunL iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );        
+        //LOGSTRING2( "Saver RunL iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );        
         ProcessFinishedL();
         }
     else
         {
-        LOGSTRING2( "Saver RunL 2nd iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
+        //LOGSTRING2( "Saver RunL 2nd iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
         iCurrentItem++;
         CompleteRequest();
         }
@@ -220,7 +215,10 @@
 //
 void CPnpProvisioningSaver::ProcessFinishedL()
     {
-    LOGSTRING2( "Saver iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
+    //LOGSTRING2( "Saver iWaitDialogMonitor->iStatus %i", iWaitDialogMonitor->iStatus.Int() );
+    iWait.AsyncStop();
+    if(iWaitDialogMonitor)
+    {
     //End key or cancel pressed after saving settings
     if(iWaitDialogMonitor->iStatus == KErrCancel)
     	{
@@ -231,6 +229,7 @@
         delete iGlobalWaitNote;
         iGlobalWaitNote = NULL;
         }
+     }
     }
 
 // ---------------------------------------------------------