diff --git a/ChangeLog b/ChangeLog
index 729a3e9e6..8cd7fe1ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailAccount.m ([SOGoMailAccount
+	-_urlHostString]): replace "@" with %40 AFTER invoking
+	stringByEscapingURL.
+
 	* SoObjects/Mailer/SOGoMailBaseObject.m ([SOGoMailBaseObject
 	-isBodyPartKey:key]): hacked a little bit to test for the length
 	of the key trimmed from its bordering digits. So if the key
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 7270874e5..976f3f98d 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -256,8 +256,8 @@ static NSString *otherUsersFolderName = @""; // TODO: add English default
     {
       username = [mailAccount objectForKey: @"userName"];
       escUsername
-	= [[username stringByReplacingString: @"@" withString: @"%40"]
-	    stringByEscapingURL];
+	= [[username stringByEscapingURL] stringByReplacingString: @"@"
+					  withString: @"%40"];
       hostString = [NSString stringWithFormat: @"%@@%@", escUsername,
 			     [mailAccount objectForKey: @"serverName"]];
     }