--- a/uifw/EikStd/coctlsrc/EIKLABEL.CPP	Tue May 25 12:58:19 2010 +0300
+++ b/uifw/EikStd/coctlsrc/EIKLABEL.CPP	Wed Jun 09 09:58:37 2010 +0300
@@ -270,7 +270,7 @@
 	
 TInt CEikLabel::HeightInPixels() const
     {
-    return(iMargin.iTop+iMargin.iBottom + iGapBetweenLines*(iNumberOfLines-1) + iNumberOfLines*iFont->HeightInPixels());
+    return(iMargin.iTop+iMargin.iBottom + iGapBetweenLines*(iNumberOfLines-1) + iNumberOfLines*iFont->FontMaxHeight());
     }
 
 TInt CEikLabel::WidthInPixels(TPtrC& aText) const
@@ -403,7 +403,7 @@
     
     const TRect rect = Rect();
 
-    const TInt deltaHeight=rect.Height()-HeightInPixels();
+    const TInt deltaHeight=rect.Height() - HeightInPixels();
     TInt preHeight=iMargin.iTop; // used on first line
     TInt postHeight=iMargin.iBottom; // used on last line
     if (deltaHeight>0)
@@ -437,14 +437,14 @@
         }
     else
         {
-        textPaneTopToBaseline = iFont->AscentInPixels();
-        textPaneHeight = iFont->HeightInPixels();
+        textPaneTopToBaseline = iFont->FontMaxAscent();
+        textPaneHeight = iFont->FontMaxHeight();
         }
     
     // iGapBetweenLines is defined as baseline separation - CFont::HeightInPixels
     // Since we are using the better metrics above, we have to actually use something which is 
     // derived from iGapBetweenLines, but is e.g. reduced if textpaneheight > heightInPixels
-    TInt gapBetweenTextPanes( iGapBetweenLines - (textPaneHeight - iFont->HeightInPixels()) );
+    TInt gapBetweenTextPanes( iGapBetweenLines - (textPaneHeight - iFont->FontMaxHeight() ) );
 
     FOREVER
         {