diff --git a/ChangeLog b/ChangeLog
index 206765292..001304afe 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-02-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -mailAccounts]): if the
+	loginname for the default mail account contains an "@", it should
+	be url-escaped to avoid confusing NSURL.
+
 	* SoObjects/SOGo/SOGoUserFolder.m ([-login]): removed useless
 	method.
 	([SOGoUserFolder -ownerInContext:_ctx]): compute the owner name
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 81187c6d1..a9ec7d78a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -454,14 +454,16 @@ NSString *SOGoWeekStartFirstFullWeek = @"FirstFullWeek";
 {
   NSMutableDictionary *mailAccount, *identity;
   NSMutableArray *identities;
-  NSString *name, *fullName;
+  NSString *name, *fullName, *userName;
   NSArray *mails;
   unsigned int count, max;
 
   mailAccount = [NSMutableDictionary dictionary];
+  userName = [[login stringByReplacingString: @"@" withString: @"%40"]
+	       stringByEscapingURL];
   name = [NSString stringWithFormat: @"%@@%@",
-		   login, fallbackIMAP4Server];
-  [mailAccount setObject: login forKey: @"userName"];
+		   userName, fallbackIMAP4Server];
+  [mailAccount setObject: userName forKey: @"userName"];
   [mailAccount setObject: fallbackIMAP4Server forKey: @"serverName"];
   [mailAccount setObject: name forKey: @"name"];