--- a/email/imum/Utils/Src/ImumMboxManager.cpp	Thu Dec 17 08:44:11 2009 +0200
+++ b/email/imum/Utils/Src/ImumMboxManager.cpp	Thu Jan 07 12:45:05 2010 +0200
@@ -365,7 +365,10 @@
     {
     IMUM_CONTEXT( CImumMboxManager::LoadAccountFillIapL, 0, KLogData );
     IMUM_IN();
-
+	
+	//check IAP number 
+    if ( aSettings.iIncomingIapPref->NumberOfIAPs() > 0 )
+    	{
     // Set internet access point (incoming IAP)
     TImIAPChoice incomingIapChoice =
         aSettings.iIncomingIapPref->IAPPreference( 0 );
@@ -375,7 +378,20 @@
     TImIAPChoice outgoingIapChoice =
         aSettings.iOutgoingIapPref->IAPPreference( 0 );
     aSettings.iOutgoingIap = outgoingIapChoice.iIAP;
-
+    	}
+		
+	//check SNAP define	
+    else if( aSettings.iIncomingIapPref->SNAPDefined() )
+    	{
+    	aSettings.iIncomingIap = aSettings.iIncomingIapPref->SNAPPreference();
+    	aSettings.iOutgoingIap = aSettings.iOutgoingIapPref->SNAPPreference();
+    	}	
+    else 
+    	{
+    	aSettings.iIncomingIap = 0;
+    	aSettings.iOutgoingIap = 0;
+    	}
+    	
     IMUM_OUT();
     }