Index: camel/providers/imap/camel-imap-store.c
===================================================================
--- camel/providers/imap/camel-imap-store.c	(revision 9558)
+++ camel/providers/imap/camel-imap-store.c	(working copy)
@@ -1378,7 +1378,8 @@ imap_auth_loop (CamelService *service, C
 			}
 		}
 		if (!authenticated) {
-			if (camel_exception_get_id(ex) == CAMEL_EXCEPTION_USER_CANCEL)
+			if (camel_exception_get_id (ex) == CAMEL_EXCEPTION_USER_CANCEL ||
+			    camel_exception_get_id (ex) == CAMEL_EXCEPTION_SERVICE_UNAVAILABLE)
 				return FALSE;
 
 			errbuf = g_markup_printf_escaped (
Index: camel/providers/imap/ChangeLog
===================================================================
--- camel/providers/imap/ChangeLog	(revision 9558)
+++ camel/providers/imap/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-09-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #552631
+
+	* camel-imap-store.c: (imap_auth_loop): Do not forget password
+	on 'resource temporarily unavailable' exception.
+
 2008-09-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	* camel-imap-folder.c (imap_update_summary):
