--- evolution-data-server-1.8.3/servers/exchange/lib/e2k-context.c.isa-support	2007-01-29 04:44:31.000000000 -0500

+++ evolution-data-server-1.8.3/servers/exchange/lib/e2k-context.c	2007-03-09 14:02:16.000000000 -0500

@@ -603,6 +603,7 @@

 		g_free (suri->path);

 		suri->path = g_strdup (value);

 		action = soup_uri_to_string (suri, FALSE);

+		soup_uri_decode (action);

 		soup_uri_free (suri);

 	} else

 		action = g_strdup (value);

--- evolution-data-server-1.8.3/servers/exchange/lib/e2k-autoconfig.c.isa-support	2007-01-29 04:44:31.000000000 -0500

+++ evolution-data-server-1.8.3/servers/exchange/lib/e2k-autoconfig.c	2007-03-09 14:02:16.000000000 -0500

@@ -442,7 +442,9 @@

 	/* A redirection to "logon.asp" means this is Exchange 5.5

 	 * OWA. A redirection to "owalogon.asp" means this is Exchange

-	 * 2003 forms-based authentication. Other redirections most

+	 * 2003 forms-based authentication. A redirection to

+	 * "CookieAuth.dll" means that it's an Exchange 2003 server

+	 * behind an ISA Server 2004 proxy. Other redirections most

 	 * likely indicate that the user's mailbox has been moved to a

 	 * new server.

 	 */

@@ -460,7 +462,8 @@

 		if (strstr (location, "/logon.asp")) {

 			*result = E2K_AUTOCONFIG_EXCHANGE_5_5;

 			goto done;

-		} else if (strstr (location, "/owalogon.asp")) {

+		} else if (strstr (location, "/owalogon.asp") ||

+			   strstr (location, "/CookieAuth.dll")) {

 			if (e2k_context_fba (ctx, msg))

 				goto try_again;

 			*result = E2K_AUTOCONFIG_AUTH_ERROR;