diff -r e1b950c65cb4 -r 837f303aceeb epoc32/include/app/miut_err.h
--- a/epoc32/include/app/miut_err.h	Wed Mar 31 12:27:01 2010 +0100
+++ b/epoc32/include/app/miut_err.h	Wed Mar 31 12:33:34 2010 +0100
@@ -1,9 +1,9 @@
 // Copyright (c) 1998-2009 Nokia Corporation and/or its subsidiary(-ies).
 // All rights reserved.
 // This component and the accompanying materials are made available
-// under the terms of the License "Symbian Foundation License v1.0" to Symbian Foundation members and "Symbian Foundation End User License Agreement v1.0" to non-members
+// under the terms of "Eclipse Public License v1.0"
 // which accompanies this distribution, and is available
-// at the URL "http://www.symbianfoundation.org/legal/licencesv10.html".
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
 //
 // Initial Contributors:
 // Nokia Corporation - initial contribution.
@@ -11,12 +11,22 @@
 // Contributors:
 //
 // Description:
+// MIUT_ERR.H
 //
 
+/**
+ * @file 
+ * @publishedAll
+ * @released
+ */
+
 #ifndef __MIUT_ERR_H__
 #define __MIUT_ERR_H__
 
-// Minimum value for an MTM-specific error
+#ifndef SYMBIAN_ENABLE_SPLIT_HEADERS  
+#include "miut_errconsts.h"
+#endif
+
 /**
 @publishedAll
 @released
@@ -83,6 +93,15 @@
 @publishedAll
 @released
 */
+// if Authentcation flag is ON, Fallback flag is OFF and email server doesn't support CRAM-MD5 
+// authentication mechanism, then KPop3AuthenticationFailed error will be returned.
+const TInt KPop3AuthenticationFailed			= KPop3ErrorBase-8;
+
+
+/**
+@publishedAll
+@released
+*/
 const TInt KPopTopError							= (-179);
 
 // IMSK-specific error code
@@ -235,6 +254,15 @@
 //since there is no scope to declare the error within pop range. 
 const TInt KErrPop3ServerAlreadyConnected 		= KImapBaseError-14;
 
+
+/**
+@publishedAll
+@released
+*/
+// if Authentcation flag is ON, Fallback flag is OFF and email server doesn't support CRAM-MD5 
+// authentication mechanism, then KErrImapAuthenticationFailed error will be returned.
+const TInt KErrImapAuthenticationFailed		= 	KImapBaseError-15;
+
 /**
 @publishedAll
 @released
@@ -431,91 +459,5 @@
 */
 const TInt KErrPop3TLSNegotiateFailed			=  KPop3BaseError;
 
-/**
-@internalComponent
-@released
-*/
-enum TImcmPanic
-	{
-	EOffOpNoBodyText = 0,
-	EOffOpBadMtmTypeUid = 1,
-	EOffOpNoCMsvEntrySet = 2,
-	EOffOpEntryShouldBeFolder = 3,
-	EOffOpTwoSameLinesNotAllowed = 4,
-	EOffOpNoMemory = 5,
-	EOffOpInvalidConstruction = 6,
-	EOffOpListOutOfSync = 7,
-	EOffOpNoMtmParameters = 8,
-	EMiutBadStreamVersion = 9,
-	EEntryIsNotMessage = 10,
-	EMiutArrayHasOddNumberOfElements = 11,		// ie there should be even number of entries in array
-	EMiutLocalServiceIdSet = 12,				// iServiceId should not be set to Local
-	EPopcMTMNoBodyText = 13,
-	EPopcMTMBadMtmTypeUid = 14,
-	EPopcMTMNoCMsvEntrySet = 15,
-	EPopcMTMOperationNULL = 16,
-	EPopcMTMNotAServiceEntry = 17,
-	EPopcUnknownNewEmailType = 18,
-	EPopcUnknownSyncFunction = 19,
-	ESmtcMTMNoBodyText = 20,
-	ESmtcMTMBadMtmTypeUid = 21,
-	ESmtcMTMNoCMsvEntrySet = 22,
-	ESmtcMTMOperationNULL = 23,
-	ESmtcMTMNotAServiceEntry = 24,
-	ESmtcUnknownNewEmailType = 25,
-	ESmtcUnknownSyncFunction = 26,
-	ESmtcMTMStoringBadEntryType = 27,
-	ESmtcMTMRestoringBadEntryType = 28,
-	ESmtcMTMNotAMessageEntry = 29,
-	EMiutActiveInFinalProgress = 30,
-	EImpcNoBodyText = 31,
-	EImpcBadMtmTypeUid = 32,
-	EImpcNoCMsvEntrySet = 33,
-	EImpcEntryShouldBeFolder = 34,
-	EImpcTwoSameLinesNotAllowed = 35,
-	EImpcNoMemory = 36,
-	EImpcInvalidConstruction = 37,
-	EImpcBadServiceEntry = 38,
-	EImpcNoBaseMtm = 39,
-	EImpcNoAddresseeList = 40,
-	EImpcInvalidProgress = 41,
-	EImpcNotSupported = 42,
-	EImpcMTMNotAMessageEntry = 43,
-	EImpcMTMNotAServiceEntry = 44,
-	EImcmMessageEntryHasMoreThanOneFolder = 45,
-	EImcmUnknownState = 46,
-	EImcmFinalProgressFailed = 47,
-	EImcmNoEikonEnvironment = 48,
-	EImcmSetVersionNotSupported = 49,
-	EImcmSystemDefaultCharsetNotSupported = 50,
- 	EImcmHtmlConverterNotFound = 51,
-	EImcmUnknownMtm = 52,
-	EImEmailOpUnknownAttachmentType = 53,
-	EImcmNonIdleRetrievalState = 54,
-	EImcmIdleRetrievalState = 55,
-	EImcmSyncDownloadRulesInvalidPos1 = 56,
-	EImcmSyncDownloadRulesInvalidPos2 = 57,
-	EImcmSyncDownloadRulesInvalidPos3 = 58,
-	EImcmSyncDownloadRulesInvalidBearerTypes1 = 59,
-	EImcmSyncDownloadRulesInvalidBearerTypes2 = 60,
-	EImcmSyncDownloadRulesInvalidBearerTypes3 = 61,
-	EImcmTransportBufferSizesInvalidPos1 = 62,
-	EImcmTransportBufferSizesInvalidPos2 = 63,
-	EImcmTransportBufferSizesInvalidPos3 = 64,
-	EImcmTransportBufferSizesInvalidBearerTypes1 = 65,
-	EImcmTransportBufferSizesInvalidBearerTypes2 = 66,
-	EImcmTransportBufferSizesInvalidBearerTypes3 = 67,
-	EImcmTransportBufferSizesInvalidFetchRequestSize = 68,
-	EImcmTransportBufferSizesInvalidMaxOutstandingFetchResponses = 69,
-	EImcmMobilityAccountsListInvalidPos1 = 70,
-	EImcmMobilityAccountsListInvalidPos2 = 71,
-	EImcmMobilityAccountsListInvalidPos3 = 72,
-	EImcmMobilityAccountsListInvalidIAPListCount = 73
-	};
-
-/**
-@internalComponent
-*/
-GLREF_C void gPanic(TImcmPanic aPanic);
 
 #endif // __MIUT_ERR_H__