Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 36356)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,10 @@
+2008-09-17  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #552583 (Suggested by Sebastian Keller)
+
+	* mail-session.c: (get_password):
+	Do not hide auth_mech from the URL.
+
 2008-09-17  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	* default/hu/Makefile.am: Add this too
Index: mail/mail-session.c
===================================================================
--- mail/mail-session.c	(revision 36356)
+++ mail/mail-session.c	(working copy)
@@ -171,7 +171,7 @@ get_password (CamelSession *session, Cam
 	char *ret = NULL;
 	EAccount *account = NULL;
 
-	url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL):NULL;
+	url = service?camel_url_to_string(service->url, CAMEL_URL_HIDE_ALL & (~CAMEL_URL_HIDE_AUTH)):NULL;
 
 	if (!strcmp(item, "popb4smtp_uri")) {
 		/* not 100% mt safe, but should be ok */
