diff --git a/ChangeLog b/ChangeLog
index a01f640b2..1a5076095 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-08-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/AgenorUserManager.m ([AgenorUserManager
+	+initialize]): init defaultMailDomain with the user default
+	"SOGoDefaultMailDomain".
+
 2006-08-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Contacts/UIxContactEditorBase.m ([UIxContactEditorBase
diff --git a/SoObjects/SOGo/AgenorUserManager.m b/SoObjects/SOGo/AgenorUserManager.m
index 63960991e..57bd8651a 100644
--- a/SoObjects/SOGo/AgenorUserManager.m
+++ b/SoObjects/SOGo/AgenorUserManager.m
@@ -57,7 +57,7 @@ static NSString *ldapHost   = nil;
 static NSString *ldapBaseDN = nil;
 static NSNull   *sharedNull = nil;
 static NSString *fallbackIMAP4Server          = nil;
-static NSString *defaultMailDomain            = @"equipement.gouv.fr";
+static NSString *defaultMailDomain            = nil;
 static NSString *shareLDAPClass               = @"mineqMelBoite";
 static NSString *shareLoginSeparator          = @".-.";
 static NSString *mailEmissionAttrName         = @"mineqMelmailEmission";
@@ -69,7 +69,8 @@ static NSArray *fromEMailAttrs = nil;
 
 static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
 
-+ (void)initialize {
++ (void) initialize 
+{
   static BOOL didInit = NO;
   NSUserDefaults *ud;
   NSString *tmp;
@@ -93,7 +94,21 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
   if ([fallbackIMAP4Server length] > 0)
     NSLog(@"Note: using fallback IMAP4 server: '%@'", fallbackIMAP4Server);
   else
-    fallbackIMAP4Server = nil;
+    {
+      if (fallbackIMAP4Server)
+        [fallbackIMAP4Server release];
+      fallbackIMAP4Server = nil;
+    }
+
+  defaultMailDomain = [[ud stringForKey:@"SOGoDefaultMailDomain"] copy];
+  if ([defaultMailDomain length] == 0)
+    {
+      if (defaultMailDomain)
+        [defaultMailDomain release];
+      defaultMailDomain = nil;
+      NSLog(@"WARNING: no default mail domain (please specify"
+            " 'SOGoDefaultMailDomain' in the user default db)");
+    }
 
   fromEMailAttrs = 
     [[NSArray alloc] initWithObjects:mailEmissionAttrName, nil];