--- a/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp	Thu Jan 07 13:15:03 2010 +0200
+++ b/terminalsecurity/SCP/SCPTimestampPlugin/src/SCPTimestampPlugin.cpp	Mon Jan 18 21:00:49 2010 +0200
@@ -589,19 +589,22 @@
             HBufC16* resText = NULL;
             TRAPD( err, resText = LoadResourceL( R_SET_SEC_CODE_AGING ) );         
             FormatResourceString(*resText);        
-            if ( err == KErrNone ) // If this fails, go on anyway to signal the psw change
+            if (err == KErrNone) // If this fails, go on anyway to signal the psw change
                 {
-    	        TPtr16 bufDes = resText->Des();
-                
+                TPtr16 bufDes = resText->Des();
+                TRequestStatus userResponse;
+
+                CAknGlobalNote* note = CAknGlobalNote::NewLC();
                 TRAP_IGNORE(
-                    CAknGlobalNote* note = CAknGlobalNote::NewLC();
-    		        note->ShowNoteL( EAknGlobalWarningNote, bufDes );
-    		        CleanupStack::PopAndDestroy( note );
-    		        );    	        
-    	        
-    	        // Wait here a while so the dialog won't appear on top of the note
-                User::After( KSCPNoteTimeout ); 
-                
+                        note->SetSoftkeys(R_AVKON_SOFTKEYS_OK_EMPTY);
+                        note->ShowNoteL(userResponse, EAknGlobalWarningNote,
+                                bufDes);
+                );
+
+                // Wait for the User Response
+                User::WaitForRequest(userResponse);
+                CleanupStack::PopAndDestroy(note);
+
                 delete resText;
                 }