--- a/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp Tue Aug 31 15:11:31 2010 +0300
+++ b/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp Wed Sep 01 12:31:54 2010 +0100
@@ -167,12 +167,7 @@
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);
@@ -1413,7 +1408,6 @@
{
// Set vCard flag in message
aMessage.SetVCard(ETrue);
- aMessage.iType=KUidMsvEmailTextEntry;
}
// text/x-vcalendar
else if (aMime.ContentSubType().CompareF(KMIME_VCALENDAR)==0)
@@ -1421,7 +1415,6 @@
// Set vCalendar flag in message
aMessage.SetVCalendar(ETrue);
iIsVCalendar = ETrue;
- aMessage.iType=KUidMsvEmailTextEntry;
}
// text/calendar
else if (aMime.ContentSubType().CompareF(KMIME_ICALENDAR)==0)
@@ -1429,7 +1422,6 @@
// Set iCalendar flag in message
aMessage.SetICalendar(ETrue);
iIsICalendar = ETrue;
- aMessage.iType=KUidMsvEmailTextEntry;
}
else
aMessage.iType=KUidMsvEmailTextEntry;
@@ -1510,7 +1502,6 @@
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);
@@ -1898,7 +1889,7 @@
}
if(aHeader->Subject().Length() > 0)
{
- // Set subject in TMsvEntry
+ // Set subject in TMsvEntry
aEntry.iDescription.Set(aHeader->Subject());
}