--- a/ipsservices/ipssossettings/src/ipssetuidialog.cpp	Mon Jan 18 20:08:26 2010 +0200
+++ b/ipsservices/ipssossettings/src/ipssetuidialog.cpp	Tue Jan 26 11:45:42 2010 +0200
@@ -29,6 +29,8 @@
 #include <AknQueryDialog.h>
 #include <layoutmetadata.cdl.h>
 
+#include <miut_err.h>
+
 #include <featmgr.h>
 //</cmail>
 
@@ -894,7 +896,14 @@
     	CleanupStack::PushL(op);
 
     	wait->StartAndShowWaitDialogL();
+        TInt status = wait->iStatus.Int();
     	CleanupStack::PopAndDestroy(3, mySelection); // op, wait, myselection
+
+        // Don't open the folder subscription list if we couldn't log on.
+        if ( status == KErrImapBadLogon )
+            {
+            return EIpsSetUiPageEventResultCancel;
+            }
     	}
     iDialog.SetIgnoreOneBackKey(EFalse); //<cmail>
     // </cmail>