diff -r e8f259fad141 -r c3c9c6dcfb80 emailuis/uicomponents/src/fstreeplainonelineitemvisualizer.cpp
--- a/emailuis/uicomponents/src/fstreeplainonelineitemvisualizer.cpp	Tue May 11 15:57:15 2010 +0300
+++ b/emailuis/uicomponents/src/fstreeplainonelineitemvisualizer.cpp	Tue May 25 12:23:16 2010 +0300
@@ -241,12 +241,6 @@
                 mainIconMetrics,
                 rect,
                 mainIconVariety );
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK
-    if (rect.iTl.iY < 15)
-        {
-        rect.Move(0, 15 - rect.iTl.iY);    
-        }
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK   
     tpMainIconTl.SetTarget(TAlfRealPoint(rect.iTl));
     tpMainIconBr.SetTarget(TAlfRealPoint(rect.iBr));
 
@@ -255,12 +249,6 @@
             markIconMetrics,
             rect,
             markIconVariety );
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK
-    if (rect.iTl.iY < 15)
-        {
-        rect.Move(0, 15 - rect.iTl.iY);    
-        }
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK   
     tpMarkIconTl.SetTarget(TAlfRealPoint(rect.iTl));
     tpMarkIconBr.SetTarget(TAlfRealPoint(rect.iBr));
 
@@ -269,12 +257,6 @@
             menuIconMetrics,
             rect,
             menuIconVariety );
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK
-    if (rect.iTl.iY < 15)
-        {
-        rect.Move(0, 15 - rect.iTl.iY);    
-        }
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK   
     tpMenuIconTl.SetTarget(TAlfRealPoint(rect.iTl));
     tpMenuIconBr.SetTarget(TAlfRealPoint(rect.iBr));
 
@@ -293,12 +275,6 @@
     CFsLayoutManager::LayoutMetricsText(textRect,
             textMetrics,
             textInfo, textPaneVariety);
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK
-    if (textInfo.iTextRect.iTl.iY < 15)
-        {
-        textInfo.iTextRect.Move(0, 15 - textInfo.iTextRect.iTl.iY);    
-        }
-    // WORKAROUND FIX FOR LAYOUT PROBLEM -- RETURN THIS TO NORMAL WHEN LAYOUT'S ARE OK
     tpTextTl.SetTarget(TAlfRealPoint(textInfo.iTextRect.iTl));
     tpTextBr.SetTarget(TAlfRealPoint(textInfo.iTextRect.iBr));