diff --git a/ChangeLog b/ChangeLog
index ad982956b..20f93e2b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/LDAPUserManager.m (_fillContactMailRecords:): if
+	the user uid contains a "@", we set it directly as system email
+	rather than suffixing it with the default mail domain.
+
 2009-07-02  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
diff --git a/SoObjects/SOGo/LDAPUserManager.m b/SoObjects/SOGo/LDAPUserManager.m
index bca7e18c3..77c0883c6 100644
--- a/SoObjects/SOGo/LDAPUserManager.m
+++ b/SoObjects/SOGo/LDAPUserManager.m
@@ -330,7 +330,11 @@ static NSLock *lock = nil;
 
   emails = [contact objectForKey: @"emails"];
   uid = [contact objectForKey: @"c_uid"];
-  systemEmail = [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
+  if ([uid rangeOfString: @"@"].location == NSNotFound)
+    systemEmail
+      = [NSString stringWithFormat: @"%@@%@", uid, defaultMailDomain];
+  else
+    systemEmail = uid;
   [emails addObjectUniquely: systemEmail];
   [contact setObject: [emails objectAtIndex: 0] forKey: @"c_email"];
 }