MCL/sf/app/commonemail: comparison emailuis/emailui/src/FreestyleEmailUiMailListVisualiser.cpp

equal deleted inserted replaced

-:12c456ceeff2
+:5253a20d2a1e
 #include <freestyleemailui.mbg>
 #include <AknUtils.h>
 #include <gulicon.h>
 #include <StringLoader.h>
 #include <FreestyleEmailUi.rsg>
-//<cmail>
 #include <featmgr.h>
-//</cmail>
 #include "CFSMailClient.h"
 #include "CFSMailBox.h"
 #include "CFSMailFolder.h"
 #include "fscontrolbar.h"
 #include "fscontrolbuttoninterface.h"
 #include <alf/alfstatic.h>
 #include <aknnotewrappers.h>
 #include <msvapi.h>
 #include <akntitle.h>
-//<cmail>
 #include "ESMailSettingsPluginUids.hrh"
 #include "ESMailSettingsPlugin.h"
 #include "MFSMailBrandManager.h"
-//</cmail>
 #include <AknWaitDialog.h>
-// <cmail>
 #include <aknlayoutscalable_apps.cdl.h>
 #include <layoutmetadata.cdl.h>
 #include <csxhelp/cmail.hlp.hrh>
-// </cmail>
 // Meeting request
 #include <MeetingRequestUids.hrh>
-// <cmail>
 #include "cesmricalviewer.h"
-//</cmail>
 #include <aknstyluspopupmenu.h>
 #include <akntoolbar.h>
 // INTERNAL INCLUDES
 #include "FreestyleEmailUiUtilities.h"
 	iFirstStartCompleted = EFalse;
 	iAsyncCallback = new (ELeave) CAsyncCallBack( CActive::EPriorityStandard );
 	iAsyncRedrawer = new (ELeave) CAsyncCallBack( CActive::EPriorityLow );
+	iLastFocus = EFalse;
 	}
 // CFSEmailUiMailListVisualiser::DoFirstStartL()
 // Purpose of this function is to do first start things only when list is
 // really needed to be shown. Implemented to make app startuo faster.
 iStylusPopUpMenu = CAknStylusPopUpMenu::NewL( this , point );
 		TResourceReader reader;
 		iCoeEnv->CreateResourceReaderLC( reader,
 				R_STYLUS_POPUP_MENU_MESSAGE_LIST_VIEW );
 		iStylusPopUpMenu->ConstructFromResourceL( reader );
-		CleanupStack::PopAndDestroy();
+		CleanupStack::PopAndDestroy(); // reader
 }
 iAppUi.LayoutHandler()->SetListMarqueeBehaviour( iMailList );
 iDateChangeTimer = CDateChangeTimer::NewL( *this );
 CFSEmailUiMailListVisualiser::CFSEmailUiMailListVisualiser( CAlfEnv& aEnv,
 CFreestyleEmailUiAppUi* aAppUi, CAlfControlGroup& aMailListControlGroup )
 : CFsEmailUiViewBase( aMailListControlGroup, *aAppUi ),
 iEnv( aEnv ),
 iListMarkItemsState( ETrue ), //Initlly list has no markings
-	iMoveToFolderOngoing( EFalse ),
+iConsumeStdKeyYes_KeyUp( EFalse ), // use to prevent Call application execution if call for contact processed
-	iStylusPopUpMenuLaunched( EFalse )
+iMoveToFolderOngoing( EFalse )
 	{
 FUNC_LOG;
 	}
 // ---------------------------------------------------------------------------
 	iShiftDepressed = EFalse; // clear state just in case
 	// Inform MR observer if needed, special MR case, returning from attachment list
 	iAppUi.MailViewer().CompletePendingMrCommand();
-	//Make sure that correct component is set to focused.
+	// Make sure that correct component is set to focused.
 	if ( iFocusedControl == EMailListComponent )
 	    {
 	    SetTreeListFocusedL();
 	    }
 	else
 	    {
 	    SetControlBarFocusedL();
 	    iControlBarControl->MakeSelectorVisible( iAppUi.IsFocusShown() );
 	    }
 	UpdateButtonTextsL();
 	FocusVisibilityChange( iAppUi.IsFocusShown() );
 	iAppUi.ShowTitlePaneConnectionStatus();
 	}
 // ---------------------------------------------------------------------------
 	    }
 // MAIN MENU ***************************************************************************
 	if ( aResourceId == R_FSEMAILUI_MAILLIST_MENUPANE )
 		{
+		// Saves a focus visibility.
+		iLastFocus = EFalse;
+		if( iFocusedControl == EMailListComponent && IsFocusShown() )
+		    {
+		    iLastFocus = ETrue;
+		    }
 	    if (FeatureManager::FeatureSupported( KFeatureIdFfCmailIntegration ))
 		   {
 		   // remove help support in pf5250
 		   aMenuPane->SetItemDimmed( EFsEmailUiCmdHelp, ETrue);
 		   }
 	    // Checks if a device has a keyboard or not.
-		if( !iKeyboardFlipOpen )
+		if( !iLastFocus )
 	    {
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsOpen, ETrue );
+// Hide all the normal email message specific actions
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReply, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsForward, ETrue );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdMailActions, ETrue);
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, ETrue );
-}
+TInt markedCount = CountMarkedItemsL();
+// Hide mark/unmark all when not applicable
-// OFFLINE/ONLINE MENU SELECTION
+if ( markedCount == EmailsInModelL() ) // Hide mark all
-TFSMailBoxStatus onlineStatus = iAppUi.GetActiveMailbox()->GetMailBoxStatus();
+		       {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdGoOnline, onlineStatus == EFSMailBoxOnline );
+		       aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuMark, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdGoOffline, onlineStatus == EFSMailBoxOffline );
+		       }
+if ( markedCount == 0 ) // Hide unmark all
-// Sync/cancel sync
+		       {
-TBool supportsSync = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaSupportsSync );
+		       aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue );
-if ( !supportsSync )
+		       }
-{
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCancelSync, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdSync, ETrue );
-}
-else if ( GetLatestSyncState() )
-{
-aMenuPane->SetItemDimmed( EFsEmailUiCmdSync, ETrue );
 }
 else
-{
+	    {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCancelSync, ETrue );
+		CFSMailMessage* targetMessage = NULL;
-}
+if ( targetEntries.Count() == 1 )
+{
-//MESSAGEREADER MENU SELECTION
+targetMessage = &MsgPtrFromListIdL( targetEntries[0] );
-		if ( iAppUi.MessageReaderSupportsFreestyle() )
+}
-			{
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, EFalse );
+// Hide the irrelevant reply / reply all / forward commands
-			}
+TInt numRecipients(0);
-		else
+if ( targetMessage )
-			{
+{
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, ETrue );
+//Get # of recipients
-			}
+numRecipients = TFsEmailUiUtility::CountRecipientsSmart( iAppUi, targetMessage );
-		// Disable read in outbox and drafts
+}
-		if ( currentFolderType == EFSDraftsFolder ||
+// All reply/forward options are hidden when multiple marked messages or folder is outbox or drafts
-		     currentFolderType == EFSOutbox )
+if ( targetEntries.Count() != 1 ||
-			{
+currentFolderType == EFSOutbox ||
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, ETrue );
+currentFolderType == EFSDraftsFolder )
-			}
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReply, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsForward, ETrue );
+}
+// Reply all is hidden also when the single target message has multiple recipients
+else if ( !targetMessage || numRecipients <= 1 )
+{
+aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
+}
+aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue);
+}
 	    // EMPTY LIST, MOST OPTIONS ARE HIDDEN
 	    if ( !iModel->Count() || !iMailFolder )
 	        {
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsOpen, ETrue );
 	        aMenuPane->SetItemDimmed( EFsEmailUiCmdMailActions, ETrue );
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdMore, ETrue );
+	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuMark, ETrue );
+	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSubMenuUnmark, ETrue );
 	        aMenuPane->SetItemDimmed( EFsEmailUiCmdSearch, ETrue );
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, ETrue );
 	        }
-	    // NO TARGET ITEMS, E.G FOCUS ON DIVIDER AND NO MARKED ITEMS, ITEM RELATED OPTIONS ARE HIDDEN
-	    else if ( !targetEntries.Count() )
-	        {
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdMailActions, ETrue );
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdReadEmail, ETrue );
-	        }
-	    // Open command is available only if there's exactly one target item
-	    if ( targetEntries.Count() != 1 )
-	        {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsOpen, ETrue );
-	        }
 	    // FOLDER SPECIFIC COMMAND HIDING
-	    // In the outbox folder, Open command is inavailable in any case
-	    if ( currentFolderType == EFSOutbox )
-	        {
-	        aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsOpen, ETrue );
-	        }
 	    // "Clear deleted folder" command is available only in Deleted folder
 	    if ( currentFolderType != EFSDeleted || !iModel->Count() )
 	        {
 	        aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsEmptyDeleted, ETrue );
 	        }
 	// ACTIONS SUBMENU *********************************************************************
 	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_MAIL_ACTIONS  )
 		{
-		// Actions menu should never be available when there's no marked or focused item(s)
-		__ASSERT_DEBUG( targetEntries.Count(), Panic(EFSEmailUiUnexpectedValue) );
-		CFSMailMessage* targetMessage = NULL;
-if ( targetEntries.Count() == 1 )
-{
-targetMessage = &MsgPtrFromListIdL( targetEntries[0] );
-}
-		// Meeting request mode is in use when there's exactly one target item and it's a
-		// calendar message and MRUI is available.
-		TBool showMrActions = EFalse;
-if ( targetMessage && targetMessage->IsFlagSet( EFSMsgFlag_CalendarMsg ) &&
-iAppUi.MrViewerInstanceL() &&
-iAppUi.MrViewerInstanceL()->CanViewMessage( *targetMessage ) &&
-currentFolderType != EFSOutbox &&
-		     currentFolderType != EFSDraftsFolder )
-		    {
-		    showMrActions = ETrue;
-		    }
-// CALENDAR EVENT ACTIONS SUBMENU
-if ( showMrActions )
-{
-// Hide all the normal email message specific actions
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReply, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsForward, ETrue );
-// Hide the irrelevant MR actions
-TESMRMeetingRequestMethod mrMethod( EESMRMeetingRequestMethodUnknown );
-if ( iAppUi.MrViewerInstanceL() )
-{
-TRAP_IGNORE( mrMethod = iAppUi.MrViewerInstanceL()->ResolveMeetingRequestMethodL( *targetMessage ) );
-}
-switch ( mrMethod )
-{
-case EESMRMeetingRequestMethodRequest:
-{
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalRemoveFromCalendar, ETrue);
-}
-break;
-case EESMRMeetingRequestMethodCancellation:
-{
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsAccept, ETrue);
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsTentative, ETrue);
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsDecline, ETrue);
-TBool supportsRemove = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaRemoveFromCalendar );
-if( !supportsRemove )
-{
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalRemoveFromCalendar, ETrue);
-}
-}
-break;
-case EESMRMeetingRequestMethodResponse:
-case EESMRMeetingRequestMethodUnknown:
-{
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalRemoveFromCalendar, ETrue);
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsAccept, ETrue);
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsTentative, ETrue);
-aMenuPane->SetItemDimmed(EFsEmailUiCmdCalActionsDecline, ETrue);
-}
-break;
-default:
-break;
-}
-}
-// MAIL MESSAGE ACTIONS SUBMENU
-else
-{
-// Hide all the calendar event options
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCalActionsAccept, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCalActionsTentative, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCalActionsDecline, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdCalRemoveFromCalendar, ETrue );
-// Hide the irrelevant reply / reply all / forward commands
-TInt numRecipients(0);
-if ( targetMessage )
-{
-//Get # of recipients
-numRecipients = TFsEmailUiUtility::CountRecipientsSmart( iAppUi, targetMessage );
-}
-// All reply/forward options are hidden when multiple marked messages or folder is outbox or drafts
-if ( targetEntries.Count() > 1 ||
-currentFolderType == EFSOutbox ||
-currentFolderType == EFSDraftsFolder )
-{
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReply, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsForward, ETrue );
-}
-// Reply all is hidden also when the single target message has multiple recipients
-else if ( !targetMessage || numRecipients <= 1 )
-{
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsReplyAll, ETrue );
-}
-}
 // COMMON PART OF ACTIONS SUBMENU
 		aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkAsRead, !IsMarkAsReadAvailableL() );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkAsUnread, !IsMarkAsUnreadAvailableL() );
 		if ( !supportsMoving || !iMailFolder ) // Hide move from actions if not supported
 			{
 			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMove, ETrue );
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMoveToDrafts, ETrue );
 			}
 		else
 			{
 			// Moving supported, show/hide moving options depending on the current folder
-			// First check deleted items case, IMS does not support deleted sync
+			// Check for outbox case
-			if ( currentFolderType == EFSDeleted )
+			if ( currentFolderType == EFSOutbox )
 				{
-				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMoveToDrafts, ETrue );	// Dim in deleted
-				}
-			// Then check for outbox case, move to drafts is allowed, other moves not
-			else if ( currentFolderType == EFSOutbox )
-				{
-				// move from outbox to drafts is allowed
-				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMoveToDrafts, EFalse );	// Allow in outbox
 				// moving from outbox is not allowed otherwise
 				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMove, ETrue );
 				}
-			else if ( currentFolderType == EFSDraftsFolder )
-				{
-				// move from drafts to drafts is not allowed
-				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMoveToDrafts, ETrue );
-				// moving from drafts folder is not allowed
-				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMove, ETrue );
-				}
 			// Handle rest of the folders
 			else
 				{
-				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMoveToDrafts, ETrue );	// Dim in other folders
 				aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsMove, EFalse );
 				}
 			}
-		}
-// ACTIONS SUBMENU *********************************************************************
-	// MORE SUBMENU ************************************************************************
-	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_MORE )
-		{
 		TInt markedCount = CountMarkedItemsL();
-	    // Checks if a device has a keyboard or not.
-		if( !iKeyboardFlipOpen )
-	    {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMark, ETrue );
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsCallSender, ETrue );
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsAddContact, ETrue );
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdMessageDetails, ETrue );
-	        }
 	    // Hide expand/collapse all when not applicable
 		if ( iNodesInUse == EListControlSeparatorDisabled || !iModel->Count() )
 			{
 			aMenuPane->SetItemDimmed(EFsEmailUiCmdActionsCollapseAll, ETrue);
 		else
 			{
 			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsCollapseAll, AllNodesCollapsed() );
 			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, AllNodesExpanded() );
 			}
-		// Some commands are available only when there's exactly one target message
-		if ( targetEntries.Count() != 1 )
-			{
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsCallSender, ETrue );
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsAddContact, ETrue );
-			aMenuPane->SetItemDimmed( EFsEmailUiCmdMessageDetails, ETrue );
-			}
-		// Hide mark/unmark all when not applicable
-		if ( markedCount == EmailsInModelL() ) // Hide mark all
-		    {
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMarkAll, ETrue );
-		    //aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkUnmarkAll, EFalse );
-		    }
-		else if ( !markedCount ) // hide unmark all
-		    {
-		    //aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMarkAll, EFalse );
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkUnmarkAll, ETrue );
-		    }
 		// Hide followup flagging if not applicable
 		if ( !supportsFlag || !targetEntries.Count() )
 		    {
 		    aMenuPane->SetItemDimmed(EFsEmailUiCmdActionsFlag, ETrue);
 		    }
-		// Hide Download Manager if no downloads present
-// <cmail> Prevent Download Manager opening with attachments
-//		if ( !iAppUi.DownloadInfoMediator() || !iAppUi.DownloadInfoMediator()->IsAnyAttachmentDownloads() )
-//		    {
-//		    aMenuPane->SetItemDimmed(EFsEmailUiCmdDownloadManager, ETrue);
-//		    }
-// </cmail>
-		// Availability of the mark/unmark commands depends only on the focused item
-		if ( !iMailList || iMailList->FocusedItem() == KFsTreeNoneID ||
-		     iMailList->IsNode( iMailList->FocusedItem() ) )
-		    {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMark, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkUnmark, ETrue );
-		    }
-		else if ( iMailList->IsMarked( iMailList->FocusedItem() ) ) // Item was already marked
-		    {
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMark, ETrue );
-		    }
-		else
-		    {
-		    aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkUnmark, ETrue );
-		    }
 	    // Some commands are hidden in the outbox and drafts folders
 if ( currentFolderType == EFSOutbox ||
 currentFolderType == EFSDraftsFolder )
 {
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsCallSender, ETrue );
-aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsAddContact, ETrue );
 aMenuPane->SetItemDimmed( EFsEmailUiCmdActionsFlag, ETrue );
 }
 		}
-// MORE SUBMENU ************************************************************************
+// ACTIONS SUBMENU *********************************************************************
-	// SETTINGS SUBMENU ********************************************************************
+	// MARK SUBMENU ************************************************************************
-	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_MAIL_SETTINGS )
+	// Mark submenu show only when focus is visible
+	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_MARK)
 		{
-		TUid pluginUid = iAppUi.GetActiveMailbox()->GetSettingsUid();
+	    // Checks if a device has a keyboard or not.
+		if( !iLastFocus )
-		CESMailSettingsPlugin* settingsPlugin =
+	    {
-			static_cast<CESMailSettingsPlugin*>( iAppUi.View( pluginUid ) );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMark, ETrue );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkMarkAll, ETrue );
-		if ( !settingsPlugin )
+	        }
-			{
+else
-			settingsPlugin = CESMailSettingsPlugin::NewL( pluginUid );
+	    {
-			CleanupStack::PushL( settingsPlugin );
+aMenuPane->SetItemDimmed( EFsEmailUiCmdMarkSubAll, ETrue );
-			iAppUi.AddViewL( settingsPlugin );
+	        }
-			CleanupStack::Pop( settingsPlugin ); // ownership transferred
-			}
-		TInt count( settingsPlugin->MailSettingsSubviewCount() );
-		if ( count > 0 )
-			{
-			TInt index = 0;
-			while ( index < count )
-				{
-				CEikMenuPaneItem::SData newMenuItem;
-				newMenuItem.iCommandId = EFsEmailUiCmdSettingsBaseCommandId + index;
-				newMenuItem.iCascadeId = 0;
-				newMenuItem.iFlags = 0;
-				newMenuItem.iText = settingsPlugin->MailSettingsSubviewCaption(
-		        		iAppUi.GetActiveMailboxId(),
-		        		index,
-		        		EFalse
-		        		);
-		        aMenuPane->InsertMenuItemL(
-		        		newMenuItem,
-		        		aMenuPane->NumberOfItemsInPane() );
-		        ++index;
-				}
-			}
-		else
-			{
-			// POP/IMAP mailbox settings
-			HBufC* ipsText = StringLoader::LoadLC( R_FREESTYLE_EMAIL_UI_SETTINGS_IPS_TEXT );
-			CEikMenuPaneItem::SData newMenuItem;
-			newMenuItem.iCommandId = EFsEmailUiCmdSettingsBaseCommandId;
-			newMenuItem.iCascadeId = 0;
-			newMenuItem.iFlags = 0;
-			newMenuItem.iText = *ipsText;
-	        aMenuPane->InsertMenuItemL(
-	        		newMenuItem,
-	        		aMenuPane->NumberOfItemsInPane() );
-	        CleanupStack::PopAndDestroy( ipsText );
-			}
 		}
-// SETTINGS SUBMENU ********************************************************************
+// MARK SUBMENU ************************************************************************
+	// UNMARK SUBMENU ************************************************************************
+	// Unmark submenu show only when focus is not visible
+	if ( aResourceId == R_FSEMAILUI_MAILLIST_SUBMENU_UNMARK)
+		{
+		// Nothing to do yet
+		}
+// UNMARK SUBMENU ************************************************************************
 	CleanupStack::PopAndDestroy( &targetEntries );
 	// Add shortcut hints
 	iAppUi.ShortcutBinding().AppendShortcutHintsL( *aMenuPane,
 if ( aFocusToMessage && !aFocusToMessage->IsNullId() )
 {
 TInt idx = ItemIndexFromMessageId( *aFocusToMessage );
 if ( idx >= 0 )
 {
-iMailList->SetFocusedItemL( iTreeItemArray[idx].iListItemId );
+TFsTreeItemId itemId = iTreeItemArray[idx].iListItemId;
+iMailList->SetFocusedItemL( itemId );
+// If contorl bar is focused, we need to hide
+// focus then.
+if( iFocusedControl == EControlBarComponent )
+{
+iMailTreeListVisualizer->UpdateItemL( itemId );
+}
 }
 }
 	    }
 SetListAndCtrlBarFocusL();
 // SetNullId sets just the null id flag,
 // so we need to null the actual id manually
 iMsgToFocusAfterRedraw.SetId( 0 );
 iMsgToFocusAfterRedraw.SetNullId();
 }
-// <cmail>
 if ( iAsyncRedrawer )
 {
 TCallBack asyncRefresh( DoRefresh, this );
 iAsyncRedrawer->Cancel();
 iAsyncRedrawer->Set( asyncRefresh );
 iAsyncRedrawer->CallBack();
 }
-// </cmail>
 }
 // ---------------------------------------------------------------------------
 // Static wrapper function for RefreshL() to enable asynchronous calling
 //
 //
 void CFSEmailUiMailListVisualiser::CompletePendingRefresh()
 {
 FUNC_LOG;
-if ( iAsyncRedrawer && iAsyncRedrawer->IsActive() ) //<cmail>
+if ( iAsyncRedrawer && iAsyncRedrawer->IsActive() )
 {
 iAsyncRedrawer->Cancel();
 DoRefresh( this );
 }
 TFsTreeItemId aParentNodeId,
 TInt aChildIdx, /*= KErrNotFound*/
 TBool aAllowRefresh )
 {
 FUNC_LOG;
-TRect screenRect = iAppUi.ClientRect();
+TRect screenRec( iAppUi.ClientRect() );
-CFsTreePlainTwoLineItemData* itemData(0);
+CFsTreePlainTwoLineItemData* itemData = NULL;
-CFsTreePlainTwoLineItemVisualizer* itemVisualizer(0);
+CFsTreePlainTwoLineItemVisualizer* itemVisualizer = NULL;
 TRgb focusedColor = iAppUi.LayoutHandler()->ListFocusedStateTextSkinColor();
 TRgb normalColor = iAppUi.LayoutHandler()->ListNormalStateTextSkinColor();
 CFSEmailUiMailListModelItem* item =
 static_cast<CFSEmailUiMailListModelItem*>( iModel->Item(aModelIndex) );
 // Set placeholder for body preview
 itemData->SetPreviewPaneDataL( KMissingPreviewDataMarker );
 // Create item visualiser
-itemVisualizer = CFsTreePlainTwoLineItemVisualizer::NewL(*iMailList->TreeControl());
+itemVisualizer = CFsTreePlainTwoLineItemVisualizer::NewL(
+*iMailList->TreeControl() );
 CleanupStack::PushL( itemVisualizer );
-// Enable menu icon
-itemVisualizer->SetFlags( itemVisualizer->Flags() | KFsTreeListItemHasMenu );
 	itemVisualizer->SetTextAlign( EAlfAlignHLocale );
 	TBool previewOn = ( iListMode == EListControlTypeDoubleLinePreviewOn ||
 iListMode == EListControlTypeSingleLinePreviewOn );
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::HandleDynamicVariantSwitchL( CFsEmailUiViewBase::TDynamicSwitchType aType )
+void CFSEmailUiMailListVisualiser::HandleDynamicVariantSwitchL(
+CFsEmailUiViewBase::TDynamicSwitchType aType )
 	{
 FUNC_LOG;
 CFsEmailUiViewBase::HandleDynamicVariantSwitchL( aType );
 if ( iFirstStartCompleted ) // Safety
 return contains;
 }
 // ---------------------------------------------------------------------------
 //
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::HandleArrowEventInPortraitL(
+const TInt aScancode,
+const TAlfEvent& aEvent,
+const TBool aShiftState )
+{
+FUNC_LOG;
+TBool result( EFalse );
+if( aScancode == EStdKeyLeftArrow )
+{
+if( ( iControlBarControl ) &&
+( iFocusedControl == EMailListComponent ) )
+{
+// Move focus to control bar (focused button is
+// sort button).
+HandleCommandL( EFsEmailUiCmdGoToSwitchSorting );
+result = ETrue;
+}
+else if( ( iControlBarControl ) &&
+( iFocusedControl == EControlBarComponent  ) )
+{
+TInt focusedButtonId( iControlBarControl->GetFocusedButton()->Id() );
+if ( focusedButtonId == iNewEmailButtonId )
+{
+// Change focus to mail list if there are any
+// emails in it.
+if( iModel->Count() )
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+// Leave focus to control bar because there are no
+// mails in mail list.
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+iFocusedControl = EControlBarComponent;
+result = ETrue; // Do not set focus to empty list
+}
+}
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+iFocusedControl = EControlBarComponent;
+result = EFalse;
+}
+}
+else
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+SetMskL();
+}
+else if( aScancode == EStdKeyRightArrow )
+{
+// Show toolbar if there is data on the list
+const TInt modelCount( iModel->Count() );
+TBool focusShown( IsFocusShown() );
+// If control bar is focused.
+if( ( iControlBarControl ) &&
+( iFocusedControl == EControlBarComponent ) )
+{
+TInt focusedButtonId( iControlBarControl->GetFocusedButton()->Id() );
+// If sort button is focused and there are mails in mail
+// list then focus is moved to mail list, otherwise
+// leave focus to control bar
+if( focusedButtonId == iSortButtonId )
+{
+if ( modelCount > 0 ) // Check for empty folder
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+else
+{
+iFocusedControl = EControlBarComponent;
+iControlBarControl->MakeSelectorVisible( focusShown );
+result = ETrue; // Do not set focus to empty list
+}
+}
+else
+{
+iFocusedControl = EControlBarComponent;
+iControlBarControl->MakeSelectorVisible( focusShown );
+result = EFalse;
+}
+}
+else if( ( iControlBarControl ) &&
+( iFocusedControl == EMailListComponent ) )
+{
+HandleCommandL( EFsEmailUiCmdGoToSwitchNewEmail );
+result = ETrue;
+}
+else
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+SetMskL();
+}
+else if( aScancode ==  EStdKeyDownArrow )
+{
+const TInt itemCount( iModel->Count() );
+if ( iFocusedControl == EMailListComponent )
+{
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if ( aShiftState )
+{
+DoScrollMarkUnmarkL(); // marking is done after moving the cursor
+}
+}
+else if( ( iFocusedControl == EControlBarComponent ) &&
+( itemCount == 0 ) )
+{
+result = ETrue; // Do not set focus to empty list
+}
+else if( ( iFocusedControl == EControlBarComponent ) &&
+( itemCount > 0 ) )
+{
+iFocusedControl = EMailListComponent;
+result = iMailList->TreeControl()->OfferEventL(aEvent);
+if ( aShiftState )
+{
+DoScrollMarkUnmarkL(); // marking is done after moving the cursor
+}
+}
+else
+{
+result = EFalse;
+}
+SetMskL();
+}
+else if( aScancode == EStdKeyUpArrow )
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+if ( iFocusedControl == EMailListComponent )
+{
+if ( HighlightedIndex() == 0 )
+{
+HandleCommandL( EFsEmailUiCmdGoToSwitchFolder );
+result = ETrue;
+}
+else
+{
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if ( aShiftState )
+{
+// marking is done after moving the cursor
+DoScrollMarkUnmarkL();
+}
+SetMskL();
+}
+}
+else if( iFocusedControl == EControlBarComponent )
+{
+result = ETrue;
+}
+else
+{
+result = EFalse;
+}
+}
+return result;
+}
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
+TBool CFSEmailUiMailListVisualiser::HandleArrowEventInLandscapeL(
+const TInt aScancode,
+const TAlfEvent& aEvent,
+const TBool aShiftState )
+{
+FUNC_LOG;
+TBool result( EFalse );
+if( aScancode == EStdKeyRightArrow )
+{
+if ( iFocusedControl == EMailListComponent )
+{
+HandleCommandL( EFsEmailUiCmdGoToSwitchFolder );
+result = ETrue;
+}
+else if( iFocusedControl == EControlBarComponent )
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+result = ETrue;
+}
+}
+else if( aScancode == EStdKeyLeftArrow )
+{
+if ( iFocusedControl == EControlBarComponent )
+{
+const TInt modelCount( iModel->Count() );
+if( modelCount > 0 )
+{
+iFocusedControl = EMailListComponent;
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if( aShiftState )
+{
+// marking is done after moving the cursor
+DoScrollMarkUnmarkL();
+}
+}
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+// Do not set focus to empty list
+result = ETrue;
+}
+}
+else if( iFocusedControl == EMailListComponent )
+{
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if ( aShiftState )
+{
+// marking is done after moving the cursor
+DoScrollMarkUnmarkL();
+}
+}
+SetMskL();
+}
+if( aScancode == EStdKeyUpArrow )
+{
+if( iFocusedControl == EMailListComponent )
+{
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if ( aShiftState )
+{
+// marking is done after moving the cursor
+DoScrollMarkUnmarkL();
+}
+}
+else if( iFocusedControl == EControlBarComponent )
+{
+TInt focusedButtonId( iControlBarControl->GetFocusedButton()->Id() );
+if ( focusedButtonId == iNewEmailButtonId )
+{
+// Change focus to mail list if there are any
+// mails in it.
+if( iModel->Count() > 0 )
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+// Leave focus to control bar because there are no
+// mails in mail list.
+else
+{
+// Do not set focus to empty list
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+result = ETrue;
+}
+}
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+result = static_cast<CAlfControl*>( iControlBarControl )->OfferEventL( aEvent );
+}
+}
+SetMskL();
+}
+else if( aScancode == EStdKeyDownArrow )
+{
+if( iFocusedControl == EMailListComponent )
+{
+result = iMailList->TreeControl()->OfferEventL( aEvent );
+if( aShiftState )
+{
+// marking is done after moving the cursor
+DoScrollMarkUnmarkL();
+}
+}
+else if( iFocusedControl == EControlBarComponent )
+{
+const TInt modelCount( iModel->Count() );
+TInt focusedButtonId( iControlBarControl->GetFocusedButton()->Id() );
+// If sort button is focused and there are mails in mail
+// list then focus is moved to mail list, otherwise
+// leave focus to control bar
+if( focusedButtonId == iSortButtonId )
+{
+if ( modelCount > 0 ) // Check for empty folder
+{
+iFocusedControl = EMailListComponent;
+result = EFalse;
+}
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+result = ETrue; // Do not set focus to empty list
+}
+}
+else
+{
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+result = static_cast<CAlfControl*>( iControlBarControl )->OfferEventL( aEvent );
+}
+}
+SetMskL();
+}
+return result;
+}
+// ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::UpdateTheme()
 {
 RFsTreeItemIdList actionTargetItems;
 CleanupClosePushL( actionTargetItems );
 GetActionsTargetEntriesL( actionTargetItems );
 // Check if the focus needs to be removed.
-if ( aCommand == KErrCancel || aCommand == EFsEmailUiCmdActionsDelete ||
+if ( ( iStylusPopUpMenuVisible ) &&
-	 aCommand == EFsEmailUiCmdMarkAsRead ||
+( aCommand == KErrCancel ||
-	 aCommand == EFsEmailUiCmdMarkAsUnread ||
+aCommand == EFsEmailUiCmdActionsDelete ||
-	 aCommand == EFsEmailUiCmdActionsMove ||
+	   aCommand == EFsEmailUiCmdMarkAsRead ||
-	 aCommand == EFsEmailUiCmdMarkUnmarkToggle )
+	   aCommand == EFsEmailUiCmdMarkAsUnread ||
+	   aCommand == EFsEmailUiCmdActionsMove ||
+	   aCommand == EFsEmailUiCmdActionsMoveMessage ||
+	   aCommand == EFsEmailUiCmdMarkUnmarkToggle ||
+	   aCommand == EFsEmailUiCmdActionsCollapseAll ||
+	   aCommand == EFsEmailUiCmdActionsExpandAll ) )
 	{
 		// We end up here if the user selects an option from the pop up menu
 	// or exits the menu by tapping outside of it's area.
 	// Remove the focus from a list item if an item is focused.
-		iStylusPopUpMenuLaunched = EFalse;
+	iStylusPopUpMenuVisible = EFalse;
-		FocusVisibilityChange( EFalse );
+	iAppUi.SetFocusVisibility( EFalse );
 	}
-switch ( aCommand )
+switch( aCommand )
 {
 	case EAknSoftkeyOpen:
-		{
+{
-		if( !iAppUi.IsFocusShown() )
+if( !iAppUi.IsFocusShown() )
-			{
+{
-			iAppUi.SetFocusVisibility( ETrue );
+iAppUi.SetFocusVisibility( ETrue );
-			break;
+break;
-			}
+}
-		}
+}
 	case EAknSoftkeySelect:
 	    {
 	    if ( iFocusedControl == EMailListComponent )
 	        {
 	        CFSEmailUiMailListModelItem* item = dynamic_cast<CFSEmailUiMailListModelItem*>(iModel->Item(HighlightedIndex()));
 		case EFsEmailUiCmdMarkUnmarkAll:
 			{
 			UnmarkAllItemsL();
 			}
 			break;
+		case EFsEmailUiCmdMarkSubAll:
+			{
+			MarkAllItemsL();
+			}
+			break;
+		case EFsEmailUiCmdUnmarkSubAll:
+			{
+			UnmarkAllItemsL();
+			}
+			break;
 		case EFsEmailUiCmdReadEmail:
 			{
 			iAppUi.StartReadingEmailsL();
 			}
 			break;
 else
 {
 HandleCommandL(EFsEmailUiCmdMarkMark);
 }
 					}
+				else if ( item && item->ModelItemType() == ETypeSeparator )
+					{
+					// Currently only mark is done since mark should activate
+					// marking mode for messages. Unmark can be done via message long tap menu.
+					TInt index = HighlightedIndex();
+					MarkItemsUnderSeparatorL( ETrue, index );
+					}
 }
 }
 break;
 case EFsEmailUiCmdGoToSwitchFolder:
 {
 iControlBarControl->MakeSelectorVisible( IsFocusShown() );
 iFocusedControl = EControlBarComponent;
 	iMailList->SetFocusedL( EFalse );
 }
 break;
+case EFsEmailUiCmdGoToSwitchNewEmail:
+{
+iControlBarControl->SetFocusByIdL( iNewEmailButtonId );
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
+iFocusedControl = EControlBarComponent;
+iMailList->SetFocusedL( EFalse );
+break;
+}
 case EFsEmailUiCmdCalActionsAccept:
 case EFsEmailUiCmdCalActionsTentative:
 case EFsEmailUiCmdCalActionsDecline:
 case EFsEmailUiCmdCalRemoveFromCalendar:
 			{
 					CleanupStack::PopAndDestroy( &msgIds );
 					}
 			}
 		}
 			break;
+case EFsEmailUiCmdSettings:
+{
+TInt tmp = 0;
+const TPckgBuf<TInt> pkgBuf( tmp );
+iAppUi.EnterFsEmailViewL( SettingsViewId,
+TUid::Uid(KMailSettingsOpenMainList), pkgBuf );
+}
+break;
 	    default:
-	    	{
-	    	// No default action.
-	    	}
 	break;
 } // switch ( aCommand )
 CleanupStack::PopAndDestroy( &actionTargetItems );
 }
 //
 void CFSEmailUiMailListVisualiser::CollapseAllNodesL()
 	{
 FUNC_LOG;
 // Safety check, ignore command if the list is empty
-if ( iMailList->Count() )
+if ( iMailList->Count() > 0 )
 {
 	iMailTreeListVisualizer->CollapseAllL();
 }
 }
 // ---------------------------------------------------------------------------
 //
-//
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::ExpandAllNodesL()
 	{
 FUNC_LOG;
 // Safety check, ignore command if the list is empty
-	if ( iMailList->Count() )
+	if ( iMailList->Count() > 0 )
 	    {
 	TFsTreeItemId prevId = iMailList->FocusedItem();
 	iMailTreeListVisualizer->ExpandAllL();
 	iMailTreeListVisualizer->SetFocusedItemL( prevId );
 }
 	}
+// ---------------------------------------------------------------------------
+//
+// ---------------------------------------------------------------------------
+//
 void CFSEmailUiMailListVisualiser::ExpandOrCollapseL()
 {
 FUNC_LOG;
 CFSEmailUiMailListModelItem* item =
 dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
 listCount = iMailList->Count();
 }
 if ( iFocusedControl == EControlBarComponent )
 {
-/* <cmail> Sorting enabled also for empty list
+ChangeMskCommandL( R_FSE_QTN_MSK_CHANGE );
-// Sort menu can't be opened if mail list is empty. Hide MSK label in that case.
-if ( !listCount && iControlBarControl->GetFocusedButton() == iSortButton )
-{
-ChangeMskCommandL( R_FSE_QTN_MSK_EMPTY );
-}
-else
-</cmail> */
-{
-ChangeMskCommandL( R_FSE_QTN_MSK_CHANGE );
-}
 }
 else  if ( iFocusedControl == EMailListComponent )
 {
 if ( listCount ) // Safety check
 {
 // ---------------------------------------------------------------------------
 //
 //
 // ---------------------------------------------------------------------------
 //
-TBool CFSEmailUiMailListVisualiser::OfferEventL(const TAlfEvent& aEvent)
+TBool CFSEmailUiMailListVisualiser::OfferEventL( const TAlfEvent& aEvent )
 {
 FUNC_LOG;
 TBool result( EFalse );
 if ( !aEvent.IsKeyEvent() )
 SetControlBarFocusedL();
 }
 }
 else
 {
-// if pointer up event was not made on control bar area
+// If pointer down event was not made on control bar area
-// then focus need to be set to mail list component if it
+// then focus need to be set to mail list component, if it
-// didn't already have focus.
+// didn't already have focus. If mail list is empty, then
-if( iFocusedControl != EMailListComponent )
+// focus is hidden and control bar stays as a focused item.
+if( ( iFocusedControl != EMailListComponent ) &&
+( iMailList->Count() > 0 ) )
 {
 SetTreeListFocusedL();
+}
+else
+{
+iAppUi.SetFocusVisibility( EFalse );
 }
 }
 }
 // Offer event to focused control.
 iOtherKeyPressedWhileShiftDepressed = ETrue;
 }
 // MSK label can now be updated when shift key has been handled
 SetMskL();
+// On KeyUp of EStdKeyYes usually Call application is called - prevent it
+if ( iConsumeStdKeyYes_KeyUp && (aEvent.Code() == EEventKeyUp ))
+		{
+		iConsumeStdKeyYes_KeyUp = EFalse; // in case call button was consumed elsewhere first key up enables calling Call application
+		if ( EStdKeyYes == scanCode)
+			{
+			  result = ETrue; // consume not to switch to Call application when call to contact was processed
+			  return result;
+			}
+		}
 if ( aEvent.IsKeyEvent() && aEvent.Code() == EEventKey )
 {
-TBool shiftState = (aEvent.KeyEvent().iModifiers & EModifierShift );
+TBool shiftState = ( aEvent.KeyEvent().iModifiers & EModifierShift );
 // Do the (un)marking if in shift state and suitable key is received
 if ( shiftState )
 {
 switch ( aEvent.KeyEvent().iScanCode )
 // If event not handled by now
 if ( !result )
 {
 // Handle possible focus visibility change
-if ((scanCode == EStdKeyRightArrow)
+if ( ( scanCode == EStdKeyRightArrow ) ||
-|| (scanCode == EStdKeyLeftArrow)
+( scanCode == EStdKeyLeftArrow ) ||
-|| (scanCode == EStdKeyUpArrow)
+( scanCode == EStdKeyUpArrow ) ||
-|| (scanCode == EStdKeyDownArrow)
+( scanCode == EStdKeyDownArrow ) ||
-|| (scanCode == EStdKeyEnter)
+( scanCode == EStdKeyEnter ) ||
-|| (scanCode == EStdKeyDeviceA)
+( scanCode == EStdKeyDeviceA ) ||
-|| (scanCode ==EStdKeyDevice3))
+( scanCode ==EStdKeyDevice3 ) )
 {
 // If the focus was not active already, ignore the key press
 if( !iAppUi.SetFocusVisibility( ETrue ) )
 {
 return ETrue;
 }
 case EAknSoftkeySelect:
 {
 SetMskL();
 if ( iFocusedControl == EMailListComponent )
 {
-TInt modelCount(0);
+TInt modelCount( modelCount = iModel->Count() );
-// <cmail>
-modelCount = iModel->Count();
-// </cmail>
 if ( modelCount ) // Safety check
 {
 CFSEmailUiMailListModelItem* item =
 dynamic_cast<CFSEmailUiMailListModelItem*>( iModel->Item( HighlightedIndex() ) );
 // MAIL ITEM; OPEN MAIL
 }
 }
 }
 else
 {
-TInt focusedButtonId = iControlBarControl->GetFocusedButton()->Id();
+TInt focusedButtonId( iControlBarControl->GetFocusedButton()->Id() );
 if ( focusedButtonId == iNewEmailButtonId )
 {
 HandleCommandL(EFsEmailUiCmdCompose);
 }
 else if ( focusedButtonId == iFolderListButtonId )
 {
-//<cmail>
+// Set touchmanager not active for preventing getting events.
-//Set touchmanager not active for preventing getting events.
+DisableMailList( ETrue );
-DisableMailList(ETrue);
-//</cmail>
 iAppUi.ShowFolderListInPopupL( FolderId(), this, iFolderListButton );
 }
 else if ( focusedButtonId == iSortButtonId )
 {
 TFSFolderType folderType;
 folderType = EFSInbox;
 }
 // Show sort if model has data.
 if ( iModel->Count() )
 {
-//<cmail>
+// Set touchmanager not active for preventing getting events.
-//Set touchmanager not active for preventing getting events.
 DisableMailList(ETrue);
-//</cmail>
 iAppUi.ShowSortListInPopupL( iCurrentSortCriteria, folderType, this, iSortButton );
 }
 else
 {
 // hide selector focus if popup is not opened
 // and selection was not made via HW-keys
 iControlBarControl->MakeSelectorVisible(
 IsFocusShown() );
 }
 }
-return ETrue;//iControlBar->OfferEventL( aEvent );
+return ETrue; // iControlBar->OfferEventL( aEvent );
 }
 }
 break;
 case EStdKeyLeftArrow:
+case EStdKeyRightArrow:
+case EStdKeyDownArrow:
+case EStdKeyUpArrow:
 {
-if( iControlBarControl && iFocusedControl == EMailListComponent )
+if( Layout_Meta_Data::IsLandscapeOrientation() )
 {
-HandleCommandL( EFsEmailUiCmdGoToSwitchSorting );
+result = HandleArrowEventInLandscapeL( scanCode,
-result = ETrue;
+aEvent, shiftState );
-}
-else if( ( iControlBarControl ) &&
-( iFocusedControl == EControlBarComponent  ) )
-{
-TInt focusedButtonId = iControlBarControl->GetFocusedButton()->Id();
-iControlBarControl->MakeSelectorVisible( IsFocusShown() );
-if ( focusedButtonId == iFolderListButtonId )
-{
-if ( iModel->Count() )
-{
-iFocusedControl = EMailListComponent;
-result = EFalse;
-}
-else
-{
-iFocusedControl = EControlBarComponent;
-result = ETrue; // Do not set focus to empty list
-}
-}
-else
-{
-iFocusedControl = EControlBarComponent;
-result = EFalse;
-}
 }
 else
 {
-iFocusedControl = EMailListComponent;
+result = HandleArrowEventInPortraitL( scanCode,
-result = EFalse;
+aEvent, shiftState );
 }
-SetMskL();
+break;
 }
-break;
-case EStdKeyRightArrow:
-{
-// Show toolbar if there is data on the list
-// <cmail>
-if ( iFocusedControl == EMailListComponent && iModel->Count() )
-// </cmail>
-{
-RFsTreeItemIdList targetEntries;
-CleanupClosePushL( targetEntries );
-GetActionsTargetEntriesL( targetEntries );
-TInt targetCount = targetEntries.Count();
-CleanupStack::PopAndDestroy( &targetEntries );
-if ( targetCount )
-{
-LaunchStylusPopupMenuL();
-result = ETrue;
-}
-}
-else if( ( iControlBarControl ) &&
-( iFocusedControl == EControlBarComponent ) )
-{
-TInt focusedButtonId = iControlBarControl->GetFocusedButton()->Id();
-iControlBarControl->MakeSelectorVisible( IsFocusShown() );
-if ( focusedButtonId == iFolderListButtonId )
-{
-iFocusedControl = EControlBarComponent;
-result = EFalse;
-}
-else
-{
-if ( iModel->Count() ) // Check for empty folder
-{
-iFocusedControl = EMailListComponent;
-result = EFalse;
-}
-else
-{
-iFocusedControl = EControlBarComponent;
-result = ETrue; // Do not set focus to empty list
-}
-}    					                                   ;
-}
-else
-{
-iFocusedControl = EMailListComponent;
-result = EFalse;
-}
-SetMskL();
-}
-break;
-case EStdKeyDownArrow:
-{
-if ( iFocusedControl == EMailListComponent )
-{
-result = iMailList->TreeControl()->OfferEventL(aEvent);
-if ( shiftState )
-{
-DoScrollMarkUnmarkL(); // marking is done after moving the cursor
-}
-}
-// <cmail>
-else if ( iFocusedControl == EControlBarComponent && iModel->Count() == 0 )
-{
-iControlBarControl->MakeSelectorVisible( IsFocusShown() );
-result = ETrue; // Do not set focus to empty list
-}
-else if ( iFocusedControl == EControlBarComponent && iModel->Count() != 0 )
-// </cmail>
-{
-iFocusedControl = EMailListComponent;
-result = iMailList->TreeControl()->OfferEventL(aEvent);
-if ( shiftState )
-{
-DoScrollMarkUnmarkL(); // marking is done after moving the cursor
-}
-}
-else
-{
-result = EFalse;
-}
-SetMskL();
-}
-break;
-case EStdKeyUpArrow:
-{
-iControlBarControl->MakeSelectorVisible( IsFocusShown() );
-if ( iFocusedControl == EMailListComponent )
-{
-if ( HighlightedIndex() == 0 )
-{
-HandleCommandL( EFsEmailUiCmdGoToSwitchFolder );
-result = ETrue;
-}
-else
-{
-result = iMailList->TreeControl()->OfferEventL(aEvent);
-if ( shiftState )
-{
-DoScrollMarkUnmarkL(); // marking is done after moving the cursor
-}
-SetMskL();
-}
-}
-else if (iFocusedControl == EControlBarComponent)
-{
-result = ETrue;
-}
-else
-{
-result = EFalse;
-}
-}
-break;
 case EStdKeyYes:
 {
 if ( !iAppUi.ViewSwitchingOngoing() )
 {
 if ( iMailFolder && iMailFolder->GetFolderType() != EFSOutbox &&
 else
 {
 CFsDelayedLoader::InstanceL()->GetContactHandlerL()->FindAndCallToContactByEmailL(
 *mailAddress, iAppUi.GetActiveMailbox(), this, ETrue );
 }
+// consume following KyUp event to prevent execution of Call application when call to contact processing
+iConsumeStdKeyYes_KeyUp = result = ETrue;
 }
 }
 }
 }
 }
 // to react to those until the in the key up event. There hash key works as mark/unmark shortcut only
 // if it hasn't been used as shift modifier.
 result = ETrue;
 }
 break;
-//<cmail>
 // Backspace (C key) must be handled on Key-Down instead of Key-Up
 // ( this was the reason that deleted two emails from opened mail in viewer )
 case EStdKeyBackspace:
 {
 TInt shortcutCommand = iAppUi.ShortcutBinding().CommandForShortcutKey( aEvent.KeyEvent(),
 result = ETrue;
 }
 else result = EFalse;
 }
 break;
-//</cmail>
 default:
 {
 if ( iFocusedControl == EMailListComponent )
 {
 result = iMailList->TreeControl()->OfferEventL(aEvent);
 // because half-QWERTY keyboad has shortcuts also on shift and chr keys which do
 // no send any key events, only key down and key up.
 TInt shortcutCommand =
 iAppUi.ShortcutBinding().CommandForShortcutKey( aEvent.KeyEvent(),
 CFSEmailUiShortcutBinding::EContextMailList );
 // Hash/shift key of ITU-T and half-QWERTY keyboards is an exception case to other
 // shortcuts: it is handled only if it hasn't been used as shift modifier
 if ( (scanCode == EStdKeyHash || scanCode == EStdKeyLeftShift || scanCode == EStdKeyRightShift) &&
 iOtherKeyPressedWhileShiftDepressed )
 {
 shortcutCommand = KErrNotFound;
 }
-//<cmail>  // block Backspace (C key) handle on Key-Up
+// block Backspace (C key) handle on Key-Up
-if ( scanCode == EStdKeyBackspace) shortcutCommand = KErrNotFound; // handled on Key-Down, see above
+if ( scanCode == EStdKeyBackspace )
-//</cmail>
+{
+shortcutCommand = KErrNotFound; // handled on Key-Down, see above
+}
 if ( shortcutCommand != KErrNotFound )
 {
 HandleCommandL( shortcutCommand );
 result = ETrue;
 }
 return result;
 }
-//<cmail>
 // ---------------------------------------------------------------------------
 // CFSEmailUiMailListVisualiser::DoHandleListItemOpenL
 // ---------------------------------------------------------------------------
 //
 void CFSEmailUiMailListVisualiser::DoHandleListItemOpenL()
 // ---------------------------------------------------------------------------
 // CFSEmailUiMailListVisualiser::DoHandleListItemLongTapL
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::DoHandleListItemLongTapL()
+void CFSEmailUiMailListVisualiser::DoHandleListItemLongTapL( const TPoint& aPoint )
 {
 FUNC_LOG;
 if ( 0 < iModel->Count() ) // Safety check
 {
 RFsTreeItemIdList markedEntries;
 iMailList->GetMarkedItemsL( markedEntries );
 if ( markedEntries.Count() >= 0 )
 {
-LaunchStylusPopupMenuL();
+LaunchStylusPopupMenuL( aPoint );
 }
 }
 }
 // ---------------------------------------------------------------------------
 if( iFocusedControl == EControlBarComponent )
 {
 iControlBarControl->MakeSelectorVisible( aVisible );
 }
-if ( iStylusPopUpMenuLaunched && !aVisible )
+if ( iStylusPopUpMenuVisible && !aVisible )
 	{
 	// Do not allow to remove the focus from a list element if the pop up
 	// menu was just launched.
-	iStylusPopUpMenuLaunched = EFalse;
 	return;
 	}
 iMailTreeListVisualizer->SetFocusVisibility( aVisible );
 }
 				TFSMailMsgId mailBox = iAppUi.GetActiveMailbox()->GetId();
 				iAppUi.GetMailClient()->DeleteMessagesByUidL( mailBox, folderId, msgIds );
 RemoveMsgItemsFromListIfFoundL( msgIds );
 CleanupStack::PopAndDestroy( &msgIds );
 				}
+			else
+				{
+				UnmarkAllItemsL();
+				}
 			}
 		}
 	}
 // ---------------------------------------------------------------------------
 iAsyncCallback->Set( TCallBack(DoDeleteMarkedMessages, this) );
 iAsyncCallback->CallBack();
 }
 // </cmail>
 }
+else
+	{
+		UnmarkAllItemsL();
+	}
 CleanupStack::PopAndDestroy( &markedEntries );
 	}
 // ---------------------------------------------------------------------------
 					{
 					folderType = EFSInbox;
 					}
 			    iControlBarControl->SetFocusByIdL( iSortButtonId );
 			    iControlBarControl->MakeSelectorVisible( IsFocusShown() );
-/* <cmail> Sorting empty list enabled
-// Show sort list only if maiil list is not empty
+			    // Sorting empty mail list disabled
+// Show sort list only if mail list is not empty
 if ( iModel->Count() )
-</cmail> */
 {
 iAppUi.ShowSortListInPopupL( iCurrentSortCriteria, folderType, this, iSortButton );
 }
 				}
 				return;
 		}
 	return ret;
 	}
 // ---------------------------------------------------------------------------
-// LaunchActionMenuL
-// Function launches action menu based on the highlighted or marked messages
-// ---------------------------------------------------------------------------
-//
-void CFSEmailUiMailListVisualiser::LaunchActionMenuL()
-	{
-FUNC_LOG;
-	// Get marked entries
-	RFsTreeItemIdList markedEntries;
-	CleanupClosePushL( markedEntries );
-	iMailList->GetMarkedItemsL( markedEntries );
-	TInt markedCount = markedEntries.Count();
-	// Remove old items from action menu
-CFSEmailUiActionMenu::RemoveAllL();
-	// Construct item list
-RFsEActionMenuIdList itemList;
-CleanupClosePushL( itemList );
-	// Check support for object mail iten moving
-	TBool supportsMoving = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaMoveToFolder );
-	if ( markedCount == 0 || markedCount == 1 ) // Action menu for a single item
-		{
-		// Get pointer to the single message we are dealing with
-	    TFsTreeItemId listItemId;
-	    if ( markedCount == 0 )
-	        {
-	        listItemId = iMailList->FocusedItem();
-	        }
-	    else // ( markedCount == 1)
-	        {
-	        listItemId = markedEntries[0];
-	        }
-	    CFSMailMessage* msgPtr = &MsgPtrFromListIdL( listItemId );
-	    if ( iMailFolder->GetFolderType() == EFSOutbox )
-			{
-			if ( supportsMoving )
-				{
-			    itemList.AppendL( FsEActionMenuMoveToDrafts );
-				}
-			}
-		else if( iMailFolder->GetFolderType() == EFSDraftsFolder )
-			{
-			// Create mark unread / mark read flag
-			if ( msgPtr->IsFlagSet( EFSMsgFlag_Read ) )
-				{
-			    itemList.AppendL( FsEActionMenuMarkUnread );
-				}
-			else
-				{
-			    itemList.AppendL( FsEActionMenuMarkRead );
-				}
-			// Add Move message item if applicable
-			if ( supportsMoving )
-				{
-				itemList.AppendL( FsEActionMenuMove );
-				}
-			}
-		else
-			{
-			// Construct menu for calendar message based on resolved mr object
-			// and whether the MRUI object is available
-			if ( msgPtr->IsFlagSet( EFSMsgFlag_CalendarMsg ) &&  iAppUi.MrViewerInstanceL() )
-				{
-			    TESMRMeetingRequestMethod mrMethod( EESMRMeetingRequestMethodUnknown );
-			    TRAP_IGNORE( mrMethod = iAppUi.MrViewerInstanceL()->ResolveMeetingRequestMethodL( *msgPtr ) );
-			    switch ( mrMethod )
-					{
-					case EESMRMeetingRequestMethodRequest:
-						{
-						if ( iMailFolder && iMailFolder->GetFolderType() != EFSOutbox &&
-							 iMailFolder->GetFolderType() != EFSDraftsFolder )
-							{
-							// No choices in outbox in outbox or drafts
-							itemList.AppendL( FsEActionMenuAccept );
-						    itemList.AppendL( FsEActionMenuTentative );
-						    itemList.AppendL( FsEActionMenuDecline );
-							}
-						}
-						break;
-					case EESMRMeetingRequestMethodCancellation:
-						{
-						// No "remove from calendar" in outbox or drafts
-						if ( iMailFolder && iMailFolder->GetFolderType() != EFSOutbox &&
-							 iMailFolder->GetFolderType() != EFSDraftsFolder )
-							{
-							TBool supportsRemove = iAppUi.GetActiveMailbox()->HasCapability( EFSMBoxCapaRemoveFromCalendar );
-							if( supportsRemove )
-							    {
-							    itemList.AppendL( FsEActionMenuRemoveFormCal );
-							    }
-							}
-						}
-						break;
-case EESMRMeetingRequestMethodUnknown:
-case EESMRMeetingRequestMethodResponse:
-					default:
-					    {
-					    // Only "Open" options is available for responses and when MR method
-					    // cannot be resolved without opening the message (this is the case with IMAP)
-	                    itemList.AppendL( FsEActionMenuOpenCalendarEvent );
-					    }
-						break;
-					}
-				}
-			// No mrui object or message is typical mail
-			// Append normal menu commands
-			else
-				{
-			    itemList.AppendL( FsEActionMenuReply );
-			    // Show ReplyAll if more than 1 recepient
-			    TInt numRecipients(0);
-if ( msgPtr )
-{
-//Get # of recipients
-numRecipients =TFsEmailUiUtility::CountRecepients( msgPtr );
-if ( numRecipients == 1 )
-{
-//check if the malbox ownmailaddress is same as the recipients email address. If not, then assume that the
-//email is a distribution list and we need to inc num of Recipients so that "Reply ALL" option appears in UI.
-if ( msgPtr->GetToRecipients().Count() )
-{
-if( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(msgPtr->GetToRecipients()[0]->GetEmailAddress()) )
-{
-numRecipients++;
-}
-}
-if ( msgPtr->GetCCRecipients().Count() )
-{
-if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(msgPtr->GetCCRecipients()[0]->GetEmailAddress()) )
-{
-numRecipients++;
-}
-}
-if( msgPtr->GetBCCRecipients().Count() )
-{
-if ( iAppUi.GetActiveMailbox()->OwnMailAddress().GetEmailAddress().Compare(msgPtr->GetBCCRecipients()[0]->GetEmailAddress()) )
-{
-numRecipients++;
-}
-}
-}
-}
-			    if ( numRecipients > 1 )
-			        {
-	                itemList.AppendL( FsEActionMenuReplyAll );
-			        }
-			    itemList.AppendL( FsEActionMenuForward );
-				}
-			// Add mark as read/unread options
-			if ( IsMarkAsUnreadAvailableL() )
-				{
-			    itemList.AppendL( FsEActionMenuMarkUnread );
-				}
-			if ( IsMarkAsReadAvailableL() )
-				{
-			    itemList.AppendL( FsEActionMenuMarkRead );
-				}
-			// Add Move message item if applicable
-			if ( supportsMoving )
-				{
-				itemList.AppendL( FsEActionMenuMove );
-				}
-			}
-	    itemList.AppendL( FsEActionMenuDelete );
-		// Execute action list and handle the menu command
-		TFSMailMsgId oldMsgId = msgPtr->GetMessageId();
-// <cmail> Touch
-		TActionMenuCustomItemId itemId = CFSEmailUiActionMenu::ExecuteL( itemList, EFscCustom, 0, this );
-// </cmail>
-		// Make sure that focus or marking is still on the same item as when Action menu was launched.
-		// This is beacause message added/deleted event migh have occured and deleted the original meessage or
-	   	// resulted in complete redraw of the message list.
-TInt newItemIdx = ItemIndexFromMessageId( oldMsgId );
-if ( newItemIdx >= 0 ) // items still exists
-{
-TFsTreeItemId newItemListId = iTreeItemArray[ newItemIdx ].iListItemId;
-if ( markedCount )
-{
-// Item was marked. Make sure it's marked now.
-iMailList->MarkItemL( newItemListId, ETrue );
-}
-else
-{
-// No items were marked. Make sure the focus is on the same item as before.
-if ( iMailList->FocusedItem() != newItemListId )
-{
-iMailList->SetFocusedItemL( newItemListId );
-}
-}
-HandleActionMenuCommandL( itemId );
-}
-		}
-	else // Multiple items marked
-		{
-// Add mark as read/unread options
-if ( IsMarkAsUnreadAvailableL() )
-{
-itemList.AppendL( FsEActionMenuMarkUnread );
-}
-if ( IsMarkAsReadAvailableL() )
-{
-itemList.AppendL( FsEActionMenuMarkRead );
-}
-		if ( iMailFolder->GetFolderType() == EFSOutbox ) // Append move to drafts in outbox
-			{
-			if ( supportsMoving )
-				{
-			    itemList.AppendL( FsEActionMenuMoveToDrafts );
-				}
-			}
-		else 	// Append move in any other cases dirtectly if supported
-			{
-			if ( supportsMoving )
-				{
-			    itemList.AppendL( FsEActionMenuMove );
-				}
-			}
-	    itemList.AppendL( FsEActionMenuDelete );
-	   	TActionMenuCustomItemId itemId = CFSEmailUiActionMenu::ExecuteL( itemList );
-		iMailList->GetMarkedItemsL( markedEntries );
-		if ( markedEntries.Count() ) // Safety check
-			{
-			HandleActionMenuCommandL( itemId );
-			}
-		}
-	CleanupStack::PopAndDestroy( &itemList );
-	CleanupStack::PopAndDestroy( &markedEntries );
-	}
-// ---------------------------------------------------------------------------
-// HandleActionMenuCommandL
-// Action menu command callback handler
-// ---------------------------------------------------------------------------
-//
-void CFSEmailUiMailListVisualiser::HandleActionMenuCommandL( TActionMenuCustomItemId itemId )
-	{
-FUNC_LOG;
-	// Map each Action Menu ID to correcponding command ID.
-	TInt commandId = KErrNotFound;
-	switch( itemId )
-		{
-		case FsEActionMenuOpenCalendarEvent:
-		case FsEActionMenuOpen:
-		    commandId = EFsEmailUiCmdOpen;
-		    break;
-		case FsEActionMenuAccept:
-		    commandId = EFsEmailUiCmdCalActionsAccept;
-		    break;
-		case FsEActionMenuTentative:
-		    commandId = EFsEmailUiCmdCalActionsTentative;
-		    break;
-		case FsEActionMenuDecline:
-		    commandId = EFsEmailUiCmdCalActionsDecline;
-		    break;
-		case FsEActionMenuRemoveFormCal:
-		    commandId = EFsEmailUiCmdCalRemoveFromCalendar;
-		    break;
-		case FsEActionMenuMarkRead:
-		    commandId = EFsEmailUiCmdMarkAsRead;
-		    break;
-		case FsEActionMenuMarkUnread:
-		    commandId = EFsEmailUiCmdMarkAsUnread;
-			break;
-		case FsEActionMenuDelete:
-		    commandId = EFsEmailUiCmdActionsDelete;
-			break;
-		case FsEActionMenuReply:
-		    commandId = EFsEmailUiCmdActionsReply;
-			break;
-		case FsEActionMenuReplyAll:
-commandId = EFsEmailUiCmdActionsReplyAll;
-			break;
-		case FsEActionMenuForward:
-commandId = EFsEmailUiCmdActionsForward;
-			break;
-		case FsEActionMenuMove:
-		    commandId = EFsEmailUiCmdActionsMoveMessage;
-			break;
-		case FsEActionMenuMoveToDrafts:
-commandId = EFsEmailUiCmdActionsMoveToDrafts;
-			break;
-		case FsEActionMenuDismissed:
-		    commandId = KErrCancel;
-		    break;
-		default:
-		    __ASSERT_DEBUG( EFalse, Panic(EFSEmailUiUnexpectedValue) );
-		    break;
-		}
-	if ( commandId >= 0 )
-	    {
-	    HandleCommandL( commandId );
-	    }
-	}
-// ---------------------------------------------------------------------------
 // LaunchStylusPopupMenuL
 // Function launches avkon stylus popup menu based on the selected message item/items
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::LaunchStylusPopupMenuL()
+void CFSEmailUiMailListVisualiser::LaunchStylusPopupMenuL( const TPoint& aPoint )
 	{
 	// Irrelevant items for focused mail list item get dimmed at runtime
 	// Check mail list item's type
 	CFSEmailUiMailListModelItem* item =
 			iStylusPopUpMenu->SetItemDimmed( EFsEmailUiCmdActionsExpandAll, AllNodesExpanded() );
 			}
 		}
 	// Set the position for the popup
-	iStylusPopUpMenu->SetPosition( ActionMenuPosition() );
+	iStylusPopUpMenu->SetPosition( aPoint );
 	// Display the popup and set the flag to indicate that the menu was
 	// launched.
 	iStylusPopUpMenu->ShowMenu();
-	iStylusPopUpMenuLaunched = ETrue;
+	iStylusPopUpMenuVisible = ETrue;
 	}
 // ---------------------------------------------------------------------------
 // CreateNewMsgL
 // Launches editor.
 // ---------------------------------------------------------------------------
 //
 // ---------------------------------------------------------------------------
 //
-void CFSEmailUiMailListVisualiser::TreeListEventL(
+void CFSEmailUiMailListVisualiser::TreeListEventL( const TFsTreeListEvent aEvent,
-const TFsTreeListEvent aEvent, const TFsTreeItemId aId )
+const TFsTreeItemId aId,
+const TPoint& /*aPoint*/ )
 	{
 FUNC_LOG;
 switch( aEvent )
 {
 case EFsTreeListItemWillGetFocused:
 	    iMailTreeListVisualizer->SetFocusedItemL( iTreeItemArray[prevIdx].iListItemId, EFalse );
 	    // </cmail>
 	    ChangeReadStatusOfHighlightedL( ETrue );
 aFoundPreviousMsgId = MsgIdFromIndex( prevIdx );
 	    ret = KErrNone;
 	    }
 	if ( ret == KErrNone )
 		{
 		OpenHighlightedMailL();
 		}
 	return ret;
 	}
 TInt CFSEmailUiMailListVisualiser::MoveToPreviousMsgAfterDeleteL( TFSMailMsgId aFoundPreviousMsgId )
 	{
 	FUNC_LOG;
 	TInt ret(KErrNotFound);
 	TInt idx = ItemIndexFromMessageId( aFoundPreviousMsgId );
 	if ( idx >= 0 )
 		{
 		// Focus the previous message
 		iMailTreeListVisualizer->SetFocusedItemL( iTreeItemArray[idx].iListItemId, EFalse );
 		ChangeReadStatusOfHighlightedL( ETrue );
 		ret = KErrNone;
 		}
 	if ( ret == KErrNone )
 		{
 		OpenHighlightedMailL();
 		}
 	return ret;
 	}
 void CFSEmailUiMailListVisualiser::ManualMailBoxSync( TBool aManualMailBoxSync )
 	{
 iMailList->SetFocusedL( ETrue );
 iControlBarControl->SetFocusL( EFalse );
 }
 else
 {
-if ( iStylusPopUpMenuLaunched )
+if( iStylusPopUpMenuVisible )
 	{
 	return;
 	}
 iMailList->SetFocusedL( EFalse );
 MFsControlButtonInterface* focusedBtn = iControlBarControl->GetFocusedButton();
 if ( focusedBtn )
 {
 focusedBtnId = focusedBtn->Id();
 }
-iControlBarControl->MakeSelectorVisible( IsFocusShown() );
 iControlBarControl->SetFocusL( ETrue );
 if ( focusedBtnId != KErrNotFound )
 {
 iControlBarControl->SetFocusByIdL( focusedBtnId );
 }
-}
+iControlBarControl->MakeSelectorVisible( IsFocusShown() );
 }
+}
-// <cmail>
-// ---------------------------------------------------------------------------
-// ActionMenuPosition
-// ---------------------------------------------------------------------------
-//
-TPoint CFSEmailUiMailListVisualiser::ActionMenuPosition()
-{
-RFsTreeItemIdList markedEntries;
-TRAP_IGNORE(iMailList->GetMarkedItemsL( markedEntries ));
-TInt markedCount = markedEntries.Count();
-TFsTreeItemId listItemId;
-if ( markedCount == 0 )
-{
-listItemId = iMailList->FocusedItem();
-}
-else // ( markedCount == 1)
-{
-listItemId = markedEntries[0];
-}
-TAlfRealRect focusRect;
-iMailList->GetItemDisplayRectTarget(listItemId, focusRect);
-markedEntries.Close();
-return focusRect.iTl;
-}
-// </cmail>
 void CFSEmailUiMailListVisualiser::GetParentLayoutsL( RPointerArray<CAlfVisual>& aLayoutArray ) const
 {
 aLayoutArray.AppendL( iScreenAnchorLayout );
 aLayoutArray.AppendL( iControlBarControl->Visual() );
 // -----------------------------------------------------------------------------
 //
 void CDateChangeTimer::RunL()
 {
 FUNC_LOG;
-// Update mail list and reissue the request for timer event
+if ( KErrCancel == iStatus.Int() )
-iMailListVisualiser.NotifyDateChangedL();
+{
-Start();
+;
 }
+// System time changed?
+else if ( KErrAbort == iStatus.Int() )
+{
+Start();
+}
+// Interval is over
+else
+{
+// Update mail list and reissue the request for timer event
+TRAP_IGNORE( iMailListVisualiser.NotifyDateChangedL() );
+Start();
+}
+}

changeset 2	5253a20d2a1e
parent 1	12c456ceeff2
child 3	a4d6f1ea0416