--- a/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp	Mon May 03 12:29:07 2010 +0300
+++ b/email/imap4mtm/imapprotocolcontroller/src/cimapopfetchbody.cpp	Fri Jun 25 15:47:40 2010 +0530
@@ -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);

--- a/email/imap4mtm/imapsession/inc/cimapfetchbody.h	Mon May 03 12:29:07 2010 +0300
+++ b/email/imap4mtm/imapsession/inc/cimapfetchbody.h	Fri Jun 25 15:47:40 2010 +0530
@@ -182,6 +182,7 @@
 	TBool iSendFetch;
 	// When server responses with no body length, iUnexpectedFormat is set to ETrue.
 	TBool iUnexpectedFormat;
+	TBool iCancelled;
 	};
 
 #endif // __CIMAPFETCHBODY_H__

--- a/email/imap4mtm/imapsession/src/cimapfetchbody.cpp	Mon May 03 12:29:07 2010 +0300
+++ b/email/imap4mtm/imapsession/src/cimapfetchbody.cpp	Fri Jun 25 15:47:40 2010 +0530
@@ -66,7 +66,8 @@
 	iImapMailStore(aImapMailStore),
 	iParent(aParent),
 	iFetchBodyResponse(aFetchBodyResponse),
-	iSendFetch(ETrue)
+	iSendFetch(ETrue),
+	iCancelled(EFalse)
 	{
 	}
 	
@@ -86,7 +87,7 @@
 void CImapFetchBody::Cancel()
 	{
 	__LOG_TEXT(iLogId, "CImapFetchBody::Cancel()"); // Overrides CImapCommand::Cancel()
-	
+	iCancelled = ETrue;
 	iImapMailStore.CancelRequest(*this);
 	CImapCommand::Cancel();
 	}
@@ -226,6 +227,10 @@
 	{	
 	iOutStream=&aStream;
 	
+	if(iCancelled)
+	{
+	   return; 
+	}
 #if (defined SYMBIAN_EMAIL_CAPABILITY_SUPPORT)		
 	// check for BINARY capability
 	const CImapCapabilityInfo& capabilityInfo = iParent.CapabilityInfo();

--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Mon May 03 12:29:07 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.mmp	Fri Jun 25 15:47:40 2010 +0530
@@ -19,6 +19,7 @@
 /**
  @file
 */
+#include <platform_paths.hrh>
 
 TARGET                  imcm.dll
 TARGETPATH              /system/libs
@@ -47,10 +48,10 @@
 LIBRARY			centralrepository.lib tzclient.lib numberconversion.lib
 
 SOURCEPATH              .
-START RESOURCE	IMCM.rss
-TARGETPATH resource/messaging
+START RESOURCE  imcm.rss
 LANG	SC
 HEADER
+TARGETPATH      resource/messaging
 END
 
 #include                "../../../../../../mw/messagingmw/messagingfw/msgtests/group/msgopt.mph"
@@ -70,7 +71,7 @@
 #endif	
 
 
-
+OS_LAYER_SYSTEMINCLUDE
 
 
 

--- a/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Mon May 03 12:29:07 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/group/IMCM.rss	Fri Jun 25 15:47:40 2010 +0530
@@ -16,6 +16,8 @@
 //
 
 #include "imcm.rls"
+#include <imcm.loc>
+#include <imcm_default_charset.loc>
 
 #define PARABREAK	8233
 #define TABCHAR		9
@@ -37,12 +39,12 @@
 
 RESOURCE LBUF forward_formatting_string
 	{
-	buffer=STRING_forward_formatting_string1;
+	buffer=qtn_mail_fwd"%S";
 	}
 
 RESOURCE LBUF reply_formatting_string
 	{
-	buffer=STRING_reply_formatting_string1;
+	buffer=qtn_mail_re"%S";
 	}
 
 RESOURCE LBUF receipt_formatting_string
@@ -52,17 +54,17 @@
 
 RESOURCE LBUF email_address_formatting_string
 	{
-	buffer=STRING_email_address_formatting_string1;
+	buffer="%S <%S>";//STRING_email_address_formatting_string1;
 	}        
 
 // Headers used in Body for Forwarded/Replyed message
 
 RESOURCE LBUF forward_body_header
 	{
-	buffer=STRING_forward_body_header1
-			STRING_forward_body_header2
-			STRING_forward_body_header3
-			STRING_forward_body_header4;
+	buffer=<PARABREAK><PARABREAK>qtn_mail_forward_separator<PARABREAK>
+			qtn_mail_copy_subject" %S"<PARABREAK>
+			qtn_mail_copy_sender" %S"<PARABREAK>
+			qtn_mail_copy_date" %S"<PARABREAK>;
 	}
 
 RESOURCE LBUF forward_body_header_toonly
@@ -95,10 +97,10 @@
 
 RESOURCE LBUF reply_body_header
 	{
-	buffer=STRING_reply_body_header1
-			STRING_reply_body_header2
-			STRING_reply_body_header3
-			STRING_reply_body_header4;
+	buffer=<PARABREAK><PARABREAK>qtn_mail_reply_separator<PARABREAK>
+			qtn_mail_copy_subject" %S"<PARABREAK>
+			qtn_mail_copy_sender" %S"<PARABREAK>
+			qtn_mail_copy_date" %S"<PARABREAK>;
 	}
 
 RESOURCE LBUF reply_body_header_toonly
@@ -174,28 +176,29 @@
 	}
 
 // List of available character sets in Charconv.h
+// at some point flags should be removed and only qtn_default_charset be used for all builds.
 RESOURCE L8BUF default_system_charset
-	{
-	buffer=STRING_default_system_charset;
-	}
+    {
+    buffer = qtn_default_email_charset;
+    }
 
 // If this value is set to 1, 8 bit body text data and character set information will be stored
 // when downloaded via IMPS and POPS.  The body text will be decoded to the correct character set
 // when opened.  If this value is set to 0, the body text is decoded and stored when downloading.
 RESOURCE INT8 store_8bit_body_text
 	{
-	value = 0;
+	value = 1;
 	}
 
 // Used for localised date time formatting for email forward and reply body headers
 RESOURCE LBUF body_header_datetime_format
 	{
-	buffer=STRING_body_header_datetime_format;
+	buffer="%D%M%Y%/0%1%/1%2%/2%3%/3 %-B%:0%J%:1%T%:3%+B"; //STRING_body_header_datetime_format;
 	}
 
 RESOURCE LBUF partial_download_footer_message
 	{
-	buffer=STRING_partial_download_footer_message;
+	buffer=qtn_mail_rest_of_mail_not_fetched;
 	}
 
 // If this value is set to 1,body text data  will be stored when downloaded via IMPS and POPS using chunk storage option.  
@@ -203,5 +206,5 @@
 
 RESOURCE INT8 store_plain_body_text
 	{
-	value = 1;
+	value = 0;
 	}

--- a/email/pop3andsmtpmtm/clientmtms/group/bld.inf	Mon May 03 12:29:07 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/group/bld.inf	Fri Jun 25 15:47:40 2010 +0530
@@ -14,6 +14,7 @@
 // bld.inf
 //
 
+#include <platform_paths.hrh>
 PRJ_EXPORTS
 
 ../inc/MIUTHDR.H 	SYMBIAN_APP_LAYER_PUBLIC_EXPORT_PATH(miuthdr.h)
@@ -64,6 +65,13 @@
 #endif
 
 
+//IBY exports
+../rom/gtemailmtmResources.iby  LANGUAGE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtmResources.iby)
+../rom/gtemailmtm.hby  CORE_OS_LAYER_IBY_EXPORT_PATH(gtemailmtm.hby)
+
+// export localised loc file
+../loc/imcm.loc  OS_LAYER_LOC_EXPORT_PATH(imcm.loc)
+../loc/imcm_default_charset.loc  OS_LAYER_LOC_EXPORT_PATH(imcm_default_charset.loc)
 PRJ_MMPFILES
 
 IMCM.mmp

--- a/email/pop3andsmtpmtm/clientmtms/inc/MIUTRSLV.H	Mon May 03 12:29:07 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/inc/MIUTRSLV.H	Fri Jun 25 15:47:40 2010 +0530
@@ -130,6 +130,7 @@
 private:
 	void DoRunL();
 	void DoComplete(TInt& );
+	void DoCancel();
 
 	void CheckCurrentEntryL();
 	inline TBool CheckContentDetailsL(const TDesC& aContentLocation, const TDesC& aContentId);
@@ -210,6 +211,7 @@
 
 	void DoRunL();
 	void DoComplete(TInt& );
+	void DoCancel();
 	inline void SetStartParameterL();
 private:
 	CMsvEntry& iCurrentEntry;

--- a/email/pop3andsmtpmtm/clientmtms/inc/cimfinder.h	Mon May 03 12:29:07 2010 +0300
+++ b/email/pop3andsmtpmtm/clientmtms/inc/cimfinder.h	Fri Jun 25 15:47:40 2010 +0530
@@ -57,7 +57,7 @@
 
 private:
 	void DoRunL();
-
+	void DoCancel();
 	virtual void AddChildEntriesL() = 0;
 	virtual TBool IsRequiredEntryType(TUid aEntryType) const = 0;
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/email/pop3andsmtpmtm/clientmtms/loc/imcm.loc	Fri Jun 25 15:47:40 2010 +0530
@@ -0,0 +1,66 @@
+/*
+* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  
+*     This is a localisation file for imcm.dll
+*     A .loc file is the one and only place where the logical strings
+*     to be localised are defined. 
+* >>>
+* The text between >>> and <<< is just to document the syntax and
+* you can remove it if you like.
+*
+*/
+
+
+
+
+// LOCALISATION STRINGS
+
+// d: Added in the beginning of the subject line when replying
+// l: mce_header_field_pane_t1
+#define qtn_mail_re         "RE: "
+
+// d: Added in the beginning of the subject line when forwarding
+// l: mce_header_field_pane_t1
+#define qtn_mail_fwd         "FWD: "
+
+// d: Text to be inserted into a message when replying
+// d: Inerted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_reply_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_forward_separator "--- original message ---"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_subject "Subject:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_sender "Sender:"
+
+// d: Text to be inserted into a message when forwarding or replying
+// d: Inserted in the beginning of the original message
+// l: msg_header_pane_t2
+#define qtn_mail_copy_date "Date:"
+
+// d: Text to be inserted into a message body if part of message body is filtered out
+// l:none
+#define qtn_mail_rest_of_mail_not_fetched "- - - Retrieve total mail selecting Retrieve from Options list. - - -"
+
+// End of File