--- a/emailuis/uicomponents/src/fstreeplainonelinenodevisualizer.cpp	Thu Dec 17 08:39:21 2009 +0200
+++ b/emailuis/uicomponents/src/fstreeplainonelinenodevisualizer.cpp	Thu Jan 07 12:38:38 2010 +0200
@@ -407,13 +407,17 @@
                 iSize );*/
         CFsLayoutManager::LayoutMetricsSize(
                 parentLayoutRect,
-                CFsLayoutManager::EFsLmListSingleDycRowPane,
+                CFsLayoutManager::EFsLmListSingleFsDycPane,
                 iSize );
         // </cmail> Platform layout change
         }
 
     //one line node is not extendable
     TRect currentSize = iSize;
+    if ( !IsLayoutHintSet( EFolderLayout ) )
+        {
+        CFsLayoutManager::LayoutMetricsRect(currentSize, CFsLayoutManager::EFsLmListSingleDycRowPane, currentSize);
+        }
     if (CFsLayoutManager::IsMirrored())
         {
         currentSize.iBr = currentSize.iBr - TPoint(aIndentation, 0);
@@ -788,7 +792,11 @@
                 }
 
             iTextMarquee->StopScrolling();
-            iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapTruncate);
+            
+            if ( iTextVisual )
+            	{
+            	iTextVisual->SetWrapping(CAlfTextVisual::ELineWrapTruncate);
+            	}
             }
         }
     }