--- a/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrviewerlocationfield.cpp	Wed Mar 31 21:08:33 2010 +0300
+++ b/meetingrequest/mrgui/mrfieldbuilderplugin/src/cesmrviewerlocationfield.cpp	Wed Apr 14 15:42:15 2010 +0300
@@ -134,7 +134,7 @@
     		CMRImage::NewL( NMRBitmapManager::EMRBitmapLocationWaypoint, ETrue );
     		iWaypointIcon->SetParent( this );
     		}
-    	}    
+    	}
     }
 
 // ---------------------------------------------------------------------------
@@ -393,7 +393,7 @@
     // Move focus rect so that it's relative to field's position.
     bgRect.Move( -Position() );
     SetFocusRect( bgRect );
-    
+
     // Failures are ignored.
     TRAP_IGNORE(
     		// Try setting font
@@ -428,11 +428,6 @@
         {
         HandleTapEventL( aPosition );
         }
-    else
-        {
-        // Reset action menu after link selection
-        iRichTextViewer->ResetActionMenuL();
-        }
     }
 
 // ---------------------------------------------------------------------------
@@ -479,7 +474,7 @@
 		{
 		return;
 		}
-	
+
 	CESMRField::LockL();
 
 	delete iWaypointIcon;
@@ -487,7 +482,7 @@
 	iWaypointIcon = CMRImage::NewL( NMRBitmapManager::EMRBitmapLockField, ETrue );
 
 	iWaypointIcon->SetParent( this );
-	iWaypointIcon->SetObserver( this );	 
+	iWaypointIcon->SetObserver( this );
 	}
 
 // ---------------------------------------------------------------------------
@@ -524,7 +519,8 @@
                 // Clear viewer selection
                 iRichTextViewer->ClearSelectionL();
                 iRichTextViewer->DrawDeferred();
-        		
+                iRichTextViewer->ResetActionMenuL();
+
                 // Show context menu
                 HandleTactileFeedbackL();
                 NotifyEventL( EAknSoftkeyContextOptions );