Index: servers/exchange/lib/e2k-uri.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/servers/exchange/lib/e2k-uri.c,v
retrieving revision 1.5
diff -u -p -r1.5 e2k-uri.c
--- servers/exchange/lib/e2k-uri.c	27 Jan 2006 14:16:06 -0000	1.5
+++ servers/exchange/lib/e2k-uri.c	17 Apr 2006 04:12:52 -0000
@@ -74,7 +74,7 @@ e2k_uri_new (const char *uri_string)
 		slash = uri_string + strcspn (uri_string, "/#");
 		at = strchr (uri_string, '@');
 		if (at && at < slash) {
-			char *backslash, *user_at;
+			char *backslash;
 
 			colon = strchr (uri_string, ':');
 			if (colon && colon < at) {
@@ -108,14 +108,6 @@ e2k_uri_new (const char *uri_string)
 				uri->domain = uri->user;
 				*backslash = '\0';
 				uri->user = g_strdup (backslash + 1);
-			}
-			else {
-				/* if backslash is not there check for @ */
-				user_at = strchr (uri->user, '@');
-				if (user_at) {
-					*user_at = '\0';
-					uri->domain = g_strdup (user_at + 1);
-				}
 			}
 		} else
 			uri->user = uri->passwd = uri->domain = NULL;
