--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp	Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp	Fri Apr 16 15:13:44 2010 +0300
@@ -621,7 +621,7 @@
                     }
                 }
             }
-        //SizeChanged();
+        SizeChanged();
         }
     }
 
@@ -758,8 +758,19 @@
         {
         // Implementation when graphics are ready.
         }
-    else if ( aType == KEikMessageFadeAllWindows 
-              || aType == KEikDynamicLayoutVariantSwitch ) 
+    else if ( aType == KEikDynamicLayoutVariantSwitch )
+        {
+
+        // Background under highlight may have changed -> we need to update
+        // highlight background to animation
+        if ( iExtension )
+            {
+            iExtension->HandleLayoutSwitch();
+            }
+            
+        iPopUpMenu.UpdatePosition();
+        }
+    else if ( aType == KEikMessageFadeAllWindows ) 
         {
         if ( Observer() ) 
             {
@@ -767,7 +778,7 @@
             TRAP_IGNORE( Observer()->HandleControlEventL( this,
                 MCoeControlObserver::EEventRequestExit ) );
             }    
-        }            
+        }    
     }
 
 // -----------------------------------------------------------------------------
@@ -1174,17 +1185,6 @@
                     }
                 }
             }
-        else
-        	{
-            if ( AknLayoutUtils::LayoutMirrored() )
-	            {
-                listRect.iTl.iX += AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW;
-	            }
-            else
-	            {
-                listRect.iBr.iX -= AknLayoutScalable_Avkon::scroll_pane().LayoutLine().iW;
-                }        	
-        	}
 
         }