--- a/phonebookui/pbkcommonui/src/cnthistoryviewitem.cpp	Wed Jun 23 18:02:44 2010 +0300
+++ b/phonebookui/pbkcommonui/src/cnthistoryviewitem.cpp	Tue Jul 06 14:05:47 2010 +0300
@@ -53,9 +53,9 @@
 //---------------------------------------------------------------
 void CntHistoryViewItem::updateChildItems()
 {
-    int flags = modelIndex().data(CntHistoryModel::FlagsRole).toInt();
-    mIncoming = flags & CntHistoryModel::Incoming ? true : false;
-    mNewMessage = flags & CntHistoryModel::Unseen ? true : false;
+    int flags = modelIndex().data(CntFlagsRole).toInt();
+    mIncoming = flags & CntIncoming ? true : false;
+    mNewMessage = flags & CntUnseen ? true : false;
 
     if (mNewMessage)
     {
@@ -92,10 +92,6 @@
             QRectF frameRect = HbWidget::primitive("frame")->boundingRect();
             QPointF framePoint = HbWidget::primitive("frame")->pos();
             
-            // W12:
-            //QRectF frameRect = primitive(HbStyle::P_ItemViewItem_frame)->boundingRect();
-            //QPointF framePoint = primitive(HbStyle::P_ItemViewItem_frame)->pos();
-            
             frameRect.moveTo(framePoint);
             
             if (mIncoming)