--- a/uifw/AvKon/src/aknqueryeditorindicator.cpp	Tue Aug 31 15:28:30 2010 +0300
+++ b/uifw/AvKon/src/aknqueryeditorindicator.cpp	Wed Sep 01 12:16:19 2010 +0100
@@ -25,6 +25,7 @@
 #include "aknQueryControl.h"
 
 #include <AknTasHook.h> // for testability hooks
+#include "akntrace.h"
 //
 // CAknQueryEditIndicator
 //  Handles editor indicator for queries
@@ -51,6 +52,7 @@
 
 void CAknQueryEditIndicator::ConstructL(CCoeControl* aControl)
     {
+    _AKNTRACE_FUNC_ENTER;
     if ( CAknEnv::Static()->TransparencyEnabled() )
         {
         // In transparency everything broke when this had its own
@@ -70,18 +72,22 @@
     // Set to zero size - derived queries must set extent in PreDynInitLayout
     SetExtent(TPoint(0,0), TSize(0,0));
     ActivateL();
+    _AKNTRACE_FUNC_EXIT;
     }
 
 void CAknQueryEditIndicator::SetState(TAknEditingState aState)
     {
+    _AKNTRACE_FUNC_ENTER;
+    _AKNTRACE( "[%s][%s] aState: %d", "CAknQueryEditIndicator", __FUNCTION__,aState);
     iState = aState;
     if (Observer())
     	{
-    	Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged );
+    	TRAP_IGNORE(Observer()->HandleControlEventL( this, MCoeControlObserver::EEventStateChanged ));
     	}
     
     if ( iFlags.IsSet(CAknQueryControl::EEditorIndicatorOff) )
         {
+        _AKNTRACE_FUNC_EXIT;
         return;
         }
 
@@ -370,6 +376,7 @@
         {
         DrawDeferred();
         }
+    _AKNTRACE_FUNC_EXIT;
     }
 
 CAknIndicatorContainer* CAknQueryEditIndicator::IndicatorContainer()