--- a/menufw/menufwui/mmwidgets/src/mmwidgetcontainer.cpp	Fri Feb 19 22:42:37 2010 +0200
+++ b/menufw/menufwui/mmwidgets/src/mmwidgetcontainer.cpp	Fri Mar 12 15:41:49 2010 +0200
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:
-*  Version     : %version: MM_71.1.17.1.55 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_71.1.17.1.56 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -233,7 +233,12 @@
         templateLibrary->CleanAndClearCache();
         }
 
+    TBool highlightVisibleBefore = iWidget->IsVisible() && IsHighlightVisible();
     CCoeControl::HandleResourceChange( aType );
+    if ( highlightVisibleBefore )
+        {
+        SetHighlightVisibilityL( ETrue );
+        }
 
 	if ( aType == KEikDynamicLayoutVariantSwitch && !IsHighlightVisible() )
 		{
@@ -1185,6 +1190,8 @@
     numberOfItemsBefore = GetMmModel()->NumberOfItems();
 
     GetMmModel()->SetSuiteModelL( aModel );
+    
+    TBool highlightVisibleBefore = iWidget->IsVisible() && IsHighlightVisible();
 
     // This needs to be in place (disabling redraw)
     // to udpate widget internal state, however to wait for
@@ -1203,6 +1210,11 @@
         SetupWidgetLayoutL();
         }
     iWidget->MakeVisible(ETrue);
+    
+    if ( highlightVisibleBefore )
+        {
+        SetHighlightVisibilityL( ETrue );
+        }
 
     Widget()->View()->ItemDrawer()->ClearFlags(
     		CListItemDrawer::EPressedDownState );