--- a/messagingappbase/msgeditor/viewsrc/MsgAddressControl.cpp	Tue Apr 27 16:33:37 2010 +0300
+++ b/messagingappbase/msgeditor/viewsrc/MsgAddressControl.cpp	Tue May 11 16:10:04 2010 +0300
@@ -742,7 +742,6 @@
 EXPORT_C void CMsgAddressControl::SetAddressFieldAutoHighlight( TBool aValidHighlightable )
     {
     iAddressControlEditor->SetAddressFieldAutoHighlight( aValidHighlightable );    
-    TRAP_IGNORE( iAddressControlEditor->CheckHighlightingL() );
     DrawDeferred();
     }
 
@@ -821,8 +820,6 @@
             {
             iAddressControlEditor->PrepareForViewing();
             
-            // TODO: Implement better error handling?
-            TRAP_IGNORE( iAddressControlEditor->CheckHighlightingL() );
             }
         }
     }
@@ -1149,15 +1146,6 @@
     {
     CMsgExpandableControl::FocusChanged( aDrawNow );
 
-    // TODO: Implement better error handling?
-    if ( !IsFocused() )
-        {
-        TRAP_IGNORE( iAddressControlEditor->TurnHighlightingOffL() );
-        }
-    else
-        {
-        TRAP_IGNORE( iAddressControlEditor->CheckHighlightingL() );
-        }
     }
 
 // ---------------------------------------------------------