diff -r ebe688cedc25 -r 7fdbb852d323 mmsengine/mmsmessage/src/mmsmessageoperation.cpp --- a/mmsengine/mmsmessage/src/mmsmessageoperation.cpp Tue Aug 31 15:11:31 2010 +0300 +++ b/mmsengine/mmsmessage/src/mmsmessageoperation.cpp Wed Sep 01 12:31:54 2010 +0100 @@ -574,7 +574,7 @@ if ( ( iOperation == EReply ) || ( iOperation == EForward )) { - // Copy appropriate parts from original MMS headers + // Copy appropiate parts from original MMS headers // We checked in the beginning that we have a source entry originalMmsHeaders = CMmsHeaders::NewL( iSettings->MmsVersion() ); CleanupStack::PushL( originalMmsHeaders ); // *** @@ -607,7 +607,27 @@ TMmsGenUtils::PureAddress( iNewMmsHeaders->BccRecipients().MdcaPoint( i ) ) ); } - + // Find own number + // don't remove if only one recipient in the list + if ( recipientList->MdcaCount() > 1 ) + { + CMmsOwnNumber* ownNumberSearcher = + CMmsOwnNumber::NewL( &iMsvSession.FileSession() ); + CleanupStack::PushL( ownNumberSearcher ); + + TInt index = -1; + index = ownNumberSearcher->StartL( *recipientList ); + + if ( index >= 0 ) + { + // found something + while ( iNewMmsHeaders->RemoveAddressee( recipientList->MdcaPoint( index ) ) ) + { + } + } + + CleanupStack::PopAndDestroy( ownNumberSearcher ); + } CleanupStack::PopAndDestroy( recipientList ); }