--- a/uifw/AvKon/aknhlist/src/aknsinglecolumnstylecoredatarow.cpp	Mon Mar 15 12:41:34 2010 +0200
+++ b/uifw/AvKon/aknhlist/src/aknsinglecolumnstylecoredatarow.cpp	Wed Mar 31 21:59:52 2010 +0300
@@ -23,6 +23,7 @@
 #include "akntree.h"
 #include "aknsinglecolumnstylecoredatarow.h"
 #include "akntreelistinternalconstants.h"
+#include "akntrace.h"
 
 using AknTreeListIconID::KDefault;
 using AknTreeListIconID::KNone;
@@ -457,6 +458,7 @@
 void CAknSingleColumnStyleCoreDataRow::Draw( CWindowGc& aGc,
     const TRect& aItemRect, const TRect& /*aRect*/, TBool aFocused ) const
     {
+    _AKNTRACE_FUNC_ENTER;
     CAknTree* root = Root();
     __ASSERT_DEBUG( root, User::Invariant() );
 
@@ -493,9 +495,18 @@
             
         if ( iFirstColumn )
             {
+            if ( Flags() & EFirstColumnSmiley )
+                {
+                root->DrawSmiley( aGc, aItemRect, AknLayoutScalable_Avkon::
+                                  list_single_2heading_msg_pane_t2( textVariety), 
+                                  *iFirstColumn, NULL, aFocused );
+                }
+            else
+                {
             root->DrawText( aGc, aItemRect, AknLayoutScalable_Avkon::
                 list_single_2heading_msg_pane_t2( textVariety ),
-                *iFirstColumn, NULL, this, aFocused, EFalse );
+                                *iFirstColumn, NULL, this, aFocused, ETrue );
+                }
             }        
         }
 
@@ -507,9 +518,20 @@
             list_single_2heading_msg_pane_t3( textVariety ).LayoutLine() );
         if ( iSecondColumn )
             {
+            if ( Flags() & ESecondColumnSmiley )
+                {
+                _AKNTRACE("Draw Smiley");
+                root->DrawSmiley( aGc, aItemRect, AknLayoutScalable_Avkon::
+                                  list_single_2heading_msg_pane_t3(textVariety),
+                                  *iSecondColumn, NULL, aFocused );
+                }
+            else
+                {
+                _AKNTRACE("Draw Text ");
             root->DrawText( aGc, aItemRect, AknLayoutScalable_Avkon::
                 list_single_2heading_msg_pane_t3( textVariety ),
-                *iSecondColumn, NULL, this, aFocused, EFalse );
+                                *iSecondColumn, NULL, this, aFocused, ETrue );
+                }
             }        
         }
 
@@ -546,6 +568,7 @@
         root->DrawIcon( optIconId2, optIconRect2.Size(), aGc,
             optIconRect2.iTl, optIconRect2.Size() );
         }    
+    _AKNTRACE_FUNC_EXIT;
     }