--- a/phonebookui/Speeddial/VPbkControlInc/speeddialprivate.h	Wed Apr 14 15:45:35 2010 +0300
+++ b/phonebookui/Speeddial/VPbkControlInc/speeddialprivate.h	Tue Apr 27 16:23:35 2010 +0300
@@ -56,6 +56,7 @@
 class MVPbkContactAttribute;
 class CAiwServiceHandler;
 class MRefreshObserver;
+class TXspIconHelper;
 
 const TInt KArraySize =9;
 //for the timebeing..
@@ -509,7 +510,7 @@
         * @return   the matching index, -1 if not found.
         */
       
-      	TInt FindIconIndex( TInt aId) const;
+      	TInt FindIconIndex( TInt aId, MVPbkStoreContactField* aField );
 
 
 		/**
@@ -616,6 +617,7 @@
         AiwContactAssign::TAiwContactAttributeAssignDataV1 aData);
     
     	TInt SetIconArrayL(CArrayPtrFlat<CGulIcon>* aArray);
+    	TInt CreateIndexIconsL( CArrayPtrFlat<CGulIcon>* aArray );
     	void InitializeArray();
     	void CreateFieldIconsL(CArrayPtrFlat<CGulIcon>* aArray);
     	
@@ -624,7 +626,9 @@
     	
     	void SetSpeedDialIndexL(MVPbkStoreContact* aContact);
     	void Wait();
+        void WaitFetchMail();
     	void Release();
+        void ReleaseFetchMail();
     	
     	void SetDetails(TInt aIndex);
     	
@@ -686,6 +690,7 @@
     
     TBool iRetrieveComplete;
     TBool iOperationComplete;
+    TBool iFetchmailComplete;
     TBool iFetchAll;
     TBool iUpdateFlag;
     TBool iFetchmail;
@@ -694,6 +699,7 @@
 	CArrayFixFlat<TSpdiaIndexDataVPbk>* iSdmArray;  // owned by this
 	CPbk2ImageManager* aImageManager;
 	CActiveSchedulerWait *iWait;
+    CActiveSchedulerWait *iWaitFetchmail;
 	CAknQueryDialog* iQueryDialog;       
 	CRepository*  ivmbxvariation;
 	CRepository* ivmbxkey2;
@@ -713,6 +719,9 @@
     TBool iCancelFlag;
 
     CAknQueryDialog* iRemoveConfirmQueryDialog;
+    
+    RArray<TXspIconHelper> ixspIconInfoArray;
+    
 };