--- a/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp Fri Jun 04 10:25:39 2010 +0100
+++ b/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp Fri Jun 11 13:35:48 2010 +0300
@@ -167,7 +167,12 @@
void CImapOpFetchBody::FetchBodyL(TRequestStatus& aRequestStatus, const TMsvId aPart, const TImImap4GetPartialMailInfo& aGetPartialMailInfo)
{
__LOG_TEXT(iSession->LogId(), "CImapOpFetchBody::FetchBodyL(): fetching message");
-
+
+ if(IsActive())
+ {
+ Cancel();
+ }
+
iRequestedPart=aPart;
iGetPartialMailInfo=aGetPartialMailInfo;
Queue(aRequestStatus);
@@ -1408,6 +1413,7 @@
{
// Set vCard flag in message
aMessage.SetVCard(ETrue);
+ aMessage.iType=KUidMsvEmailTextEntry;
}
// text/x-vcalendar
else if (aMime.ContentSubType().CompareF(KMIME_VCALENDAR)==0)
@@ -1415,6 +1421,7 @@
// Set vCalendar flag in message
aMessage.SetVCalendar(ETrue);
iIsVCalendar = ETrue;
+ aMessage.iType=KUidMsvEmailTextEntry;
}
// text/calendar
else if (aMime.ContentSubType().CompareF(KMIME_ICALENDAR)==0)
@@ -1422,6 +1429,7 @@
// Set iCalendar flag in message
aMessage.SetICalendar(ETrue);
iIsICalendar = ETrue;
+ aMessage.iType=KUidMsvEmailTextEntry;
}
else
aMessage.iType=KUidMsvEmailTextEntry;
@@ -1502,6 +1510,7 @@
TPtrC8 dispositionName = aBodyStructure->ExtDispositionName();
if (dispositionName.Size() != 0)
{
+ aMime.SetContentDispositionL(dispositionName);
__LOG_FORMAT((iSession->LogId(), " adding disp name: %S", &dispositionName));
aMime.ContentDispositionParams().AppendL(dispositionName);
aMime.ContentDispositionParams().AppendL(KNullDesC8);