equal
deleted
inserted
replaced
1187 R_FREESTYLE_EMAIL_UI_DELETE_MESSAGE_CONFIRMATION ); |
1187 R_FREESTYLE_EMAIL_UI_DELETE_MESSAGE_CONFIRMATION ); |
1188 } |
1188 } |
1189 |
1189 |
1190 if ( reallyDelete ) |
1190 if ( reallyDelete ) |
1191 { |
1191 { |
|
1192 CancelFetchings(); |
|
1193 |
1192 // Reset container content, so that plugins may really delete files |
1194 // Reset container content, so that plugins may really delete files |
1193 if ( iContainer ) |
1195 if ( iContainer ) |
1194 { |
1196 { |
1195 HideContainer(); |
1197 HideContainer(); |
1196 iContainer->ResetContent(); |
1198 iContainer->ResetContent(); |
1400 { |
1402 { |
1401 switch ( aCommand ) |
1403 switch ( aCommand ) |
1402 { |
1404 { |
1403 case EFsEmailUiCmdActionsReply: |
1405 case EFsEmailUiCmdActionsReply: |
1404 { |
1406 { |
1405 if ( iMessage && !iActivationData.iEmbeddedMessageMode ) |
1407 if ( iMessage ) |
1406 { |
1408 { |
|
1409 if ( iActivationData.iEmbeddedMessageMode ) |
|
1410 { |
|
1411 iCreateNewMsgFromEmbeddedMsg = ETrue; |
|
1412 } |
1407 delete iNewMailTempAddress; |
1413 delete iNewMailTempAddress; |
1408 iNewMailTempAddress = NULL; |
1414 iNewMailTempAddress = NULL; |
1409 iNewMailTempAddress = CFSMailAddress::NewL(); |
1415 iNewMailTempAddress = CFSMailAddress::NewL(); |
1410 iNewMailTempAddress->SetEmailAddress( aEmailAddress ); |
1416 iNewMailTempAddress->SetEmailAddress( aEmailAddress ); |
1411 iAppUi.LaunchEditorL( iNewMailTempAddress ); |
1417 iAppUi.LaunchEditorL( iNewMailTempAddress ); |
2594 ret = ETrue; |
2600 ret = ETrue; |
2595 break; |
2601 break; |
2596 case EESMRCmdMailFlagMessage: |
2602 case EESMRCmdMailFlagMessage: |
2597 ret = TFsEmailUiUtility::IsFollowUpSupported( *iMailBox ); |
2603 ret = TFsEmailUiUtility::IsFollowUpSupported( *iMailBox ); |
2598 break; |
2604 break; |
|
2605 //Changed to EFalse to fix defect EJZG-83CDRX |
2599 case EESMRCmdMailMessageDetails: |
2606 case EESMRCmdMailMessageDetails: |
2600 ret = ETrue; |
2607 ret = EFalse; |
2601 break; |
2608 break; |
2602 case EESMRCmdMailDelete: |
2609 case EESMRCmdMailDelete: |
2603 ret = ETrue; |
2610 ret = ETrue; |
2604 break; |
2611 break; |
2605 case EESMRCmdMailPreviousMessage: |
2612 case EESMRCmdMailPreviousMessage: |