--- a/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemPopup.cpp	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AknGlobalUI/OldStyleNotif/Src/AknSystemPopup.cpp	Wed Sep 01 12:16:19 2010 +0100
@@ -49,7 +49,7 @@
 #include <AknMediatorFacade.h>
 #include <aknSDData.h>
 
-#include <SecondaryDisplay/AknSecondaryDisplayDefs.h>
+#include <secondarydisplay/AknSecondaryDisplayDefs.h>
 #include <AknsUtils.h>
 #include <aknglobalpopupprioritycontroller.h>
 #include "GlobalWindowPriorities.h"
@@ -766,12 +766,13 @@
 
 void CAknGlobalNoteDialog::HandlePointerEventL(const TPointerEvent& aPointerEvent)
     {
-    if(aPointerEvent.iType == TPointerEvent::EButton1Down)
+    if (aPointerEvent.iType == TPointerEvent::EButton1Down)
         {
         iCaptured = ETrue;
         }
+    
     if (Rect().Contains(aPointerEvent.iPosition) && (aPointerEvent.iType == TPointerEvent::EButton1Up)
-        && iIsAlarm)
+        && iIsAlarm && iCaptured)
         {
         if (!iIsAlarmWakeup)
             {
@@ -788,12 +789,10 @@
         {
         CAknStaticNoteDialog::HandlePointerEventL(aPointerEvent);
         }
-    
-    if(aPointerEvent.iType == TPointerEvent::EButton1Up)
+    if (aPointerEvent.iType == TPointerEvent::EButton1Up)
         {
         iCaptured = EFalse;
         }
-    
     }
 
 // class CAknGlobalNoteSubject
@@ -1455,7 +1454,7 @@
 
 void CAknGlobalNoteSubject::TryDisplayNextNoteL(TBool aShowAsynch)
     {
-    if ( iGlobalNoteList && iGlobalNoteList->Count() == 0 )
+    if ( !iGlobalNoteList || iGlobalNoteList->Count() == 0 )
         {
         return;
         }