--- a/uifw/AvKon/src/aknutils.cpp	Wed Sep 15 12:29:17 2010 +0300
+++ b/uifw/AvKon/src/aknutils.cpp	Wed Oct 13 14:50:15 2010 +0300
@@ -3574,16 +3574,6 @@
                 aRect = rect.Rect();
                 return ETrue;
                 }
-            //add below code for vga_touch
-            else if ( screenRect.iBr.iX == 640 && screenRect.iBr.iY == 480 )
-                {
-                TInt variety = 13;
-
-                 rect.LayoutRect( screenRect,
-                                  AknLayoutScalable_Avkon::main_pane( variety ) );
-                 aRect = rect.Rect();
-                 return ETrue;
-                }
             else
                 {
                 return LayoutMetricsRect( EMainPane, aRect );
@@ -5310,21 +5300,8 @@
         CleanupStack::PopAndDestroy(); // wrapWidthArray
         } ); // TRAP end
 
-    if ( error == KErrNone )
-        {
-        n = 0;
-        for ( i = 0; i < buffer.Length(); i++ )
-            {
-            if ( buffer[i] == '\n' )
-                {
-                n++;
-                }
-            }        
-        }
-    
-    // There is no layout for empty popuplist
-    // The second layout that 2 lines with big font is used for two lines text.
-    if ( n < 3 || error != KErrNone || popupList )
+    // there is no layout for empty popuplist
+    if ( error != KErrNone || popupList )
         {
         DrawEmptyListImpl_real_DrawUpToTwoLines( aGc, aText, line1, line2,
                                                  line1length, line2length,