--- a/emailuis/emailui/inc/FreestyleEmailUiContactHandler.h	Tue Sep 14 20:48:24 2010 +0300
+++ b/emailuis/emailui/inc/FreestyleEmailUiContactHandler.h	Wed Sep 15 11:52:37 2010 +0300
@@ -259,15 +259,13 @@
 	 * @param aObserver = observer to collect results
 	 */
 	void GetAddressesFromPhonebookL( MFSEmailUiContactHandlerObserver* aObserver );
-	
-    // <cmail> video call
+
     /**
      * Enables/disables video call.
      *
      * @param aState ETrue for 'enable', EFalse for 'disable'
      */
     void SetVideoCall( TBool aState );
-    // </cmail>
 
 // from base class MFSEmailUiClsListsObserver
 
@@ -277,18 +275,14 @@
 // from base class MVPbkSingleContactOperationObserver
 
     void VPbkSingleContactOperationCompleteL(
-    		    MVPbkContactOperationBase& aOperation,
-    		    MVPbkStoreContact* aContact );
-    
-    
-	void VPbkSingleContactOperationComplete(
-	    MVPbkContactOperationBase& aOperation,
-	    MVPbkStoreContact* aContact );
-	
-	void VPbkSingleContactOperationFailedL(
-		    MVPbkContactOperationBase& aOperation, TInt aError );
-	void VPbkSingleContactOperationFailed(
-	    MVPbkContactOperationBase& aOperation, TInt aError );
+        MVPbkContactOperationBase& aOperation, MVPbkStoreContact* aContact );
+    void VPbkSingleContactOperationComplete(
+        MVPbkContactOperationBase& aOperation, MVPbkStoreContact* aContact );
+
+    void VPbkSingleContactOperationFailedL(
+        MVPbkContactOperationBase& aOperation, TInt aError );
+    void VPbkSingleContactOperationFailed(
+        MVPbkContactOperationBase& aOperation, TInt aError );
 
 // from base class MVPbkContactStoreListObserver
 
@@ -346,6 +340,12 @@
 // from MCCAObserver      
     void CCASimpleNotifyL( TNotifyType aType, TInt aReason );
       
+    TUid GetDetailsViewUid();
+    TUid GetDetailsAppUid();
+    TBool WasDetailsClosed();
+    void CloseContactDetailsL();
+    void ReopenContactDetailsL(RWsSession&);
+
 private:
     
     CFSEmailUiContactHandler( RFs& aSession );
@@ -354,18 +354,21 @@
     
 // <cmail> call observer's MFSEmailUiContactHandlerObserver::OperationErrorL( TContactHandlerCmd aCmd, TInt aError ) 
     void ObserverOperationErrorL( TContactHandlerCmd aCmd, TInt aErrorCode );
-    
 
 private:
-    
-	TInt SelectBetweenCsAndVoip() const;
+
+    TInt SelectBetweenCsAndVoip() const;
     void HandleCallL( const RPointerArray<CFSEmailUiClsItem>& aMatchingItems );
-    
-	void CreateMessageL( const RPointerArray<CFSEmailUiClsItem>& aMatchingItems );
-	void SendMessageL( CAiwGenericParamList& aEventParamList, TInt aServiceType );
- 	void GetSmsAddressFromPhonebookAndSendL( MVPbkContactLink* aContactLink );
-	void GetMmsAddressFromPhonebookAndSendL( MVPbkContactLink* aContactLink, TBool aIsVoiceMessage = EFalse );
- 
+
+    void CreateMessageL( const RPointerArray<CFSEmailUiClsItem>& aMatchingItems );
+    void SendMessageL( CAiwGenericParamList& aEventParamList, TInt aServiceType );
+    void GetSmsAddressFromPhonebookAndSendL( MVPbkContactLink* aContactLink );
+    void GetMmsAddressFromPhonebookAndSendL( MVPbkContactLink* aContactLink,
+        TBool aIsVoiceMessage = EFalse );
+
+    // Starts retrieving addresses from contact stores.
+    void RetrieveContactsL();
+
     TBool IsRemoteLookupSupported();
     
     void GetContactFieldsL( RArray<TInt>& aFieldIds, RPointerArray<HBufC>& aNumbers, 
@@ -456,6 +459,9 @@
     // Flag for making video call
     TBool iVideoCall;
 
+    // flag to check if it was remotely closed (using CloseContactDetailsL method)
+    TBool iContactDetailsClosed;
+    
     // connection to CCMA launcher    
     MCCAConnection* iConnection;