--- a/emailuis/emailui/src/FreestyleEmailUiSearchListVisualiser.cpp	Wed Sep 15 11:52:37 2010 +0300
+++ b/emailuis/emailui/src/FreestyleEmailUiSearchListVisualiser.cpp	Wed Oct 13 14:11:15 2010 +0300
@@ -213,7 +213,7 @@
 
     // Set mark type and icon
     iSearchList->SetMarkTypeL( CFsTreeList::EFsTreeListMultiMarkable );
-    iSearchTreeListVisualizer->SetMarkOnIcon( iAppUi.FsTextureManager()->TextureByIndex( EListControlMarkOnIcon ) );
+    iSearchTreeListVisualizer->SetMarkIcon( iAppUi.FsTextureManager()->TextureByIndex( EListControlMarkIcon ) );
     iSearchTreeListVisualizer->SetMenuIcon( iAppUi.FsTextureManager()->TextureByIndex( EListControlMenuIcon ) );
 	iSearchTreeListVisualizer->SetFlipState( iKeyboardFlipOpen );
 	iSearchTreeListVisualizer->SetFocusVisibility( iFocusVisible );
@@ -443,6 +443,8 @@
 		iAppUi.SetActiveMailboxNameToStatusPaneL();	
 		}
     CAknEnv::Static()->GetCurrentGlobalUiZoom( iCurrentZoomLevel );
+	// Set msk always empty when view is activated.
+	SetMskL();
 	// <cmail>
 	ReScaleUiL(); // In case that Landscape/Portrait has changed.
 	// </cmail>
@@ -1694,6 +1696,8 @@
     sortCriteria.iField = EFSMailSortByDate;
     sortCriteria.iOrder = EFSMailDescending;
    	iSearchOngoing = ETrue;
+	// Model and list is set to be empty, set also MSK to empty
+	SetMskL();
 	// Initialisr TextSearcher
 
 	// Start search.
@@ -1909,6 +1913,9 @@
 				// Set the extendedability and extended size
 		   		iSearchTreeListVisualizer->SetItemsAlwaysExtendedL( EFalse );
 				}
+
+			// Set msk to "Open when first is found".
+			SetMskL();
 			}
 		}
 
@@ -2460,6 +2467,11 @@
                 LaunchStylusPopupMenuL( aPoint );
                 }
             break;
+        case MFsTreeListObserver::EFsTreeListItemWillGetFocused:
+            {
+            SetMskL();
+            break;
+            }
         case MFsTreeListObserver::EFsFocusVisibilityChange:
         	{
         	iAppUi.SetFocusVisibility( EFalse );
@@ -2552,6 +2564,27 @@
   return EFalse; //no calling key up will execute Call app
 	}
 
+
+// ---------------------------------------------------------------------------
+// Logic for changing msk
+// ---------------------------------------------------------------------------
+//
+void CFSEmailUiSearchListVisualiser::SetMskL()
+	{
+    FUNC_LOG;
+	if ( iFirstStartCompleted )
+	    {
+	    if ( iSearchList && iSearchList->Count() )
+	        {
+	        ChangeMskCommandL( R_FSE_QTN_MSK_OPEN );
+	        }
+	    else
+	        {
+	        ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
+	        }
+	    }
+	}
+
 //<cmail>
 // ---------------------------------------------------------------------------
 // CFSEmailUiSearchListVisualiser::SetHeaderTextAttributesL()