diff --git a/ChangeLog b/ChangeLog
index 90d070e0e..f0d00d77f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-06-15      ludovic@inverse.ca
+
+        * It's now possible to set the default
+	  domain using for email using the
+	  SOGoDefaultMailDomain preference key.
+
 2006-06-15	ludovic@inverse.ca
 	
 	* Initial import of SOGo from trunk.
diff --git a/SoObjects/SOGo/AgenorUserManager.m b/SoObjects/SOGo/AgenorUserManager.m
index b4cd12943..63960991e 100644
--- a/SoObjects/SOGo/AgenorUserManager.m
+++ b/SoObjects/SOGo/AgenorUserManager.m
@@ -108,6 +108,11 @@ static unsigned PoolScanInterval = 5 * 60 /* every five minutes */;
     NSLog(@"ERROR: could not parse AgenorProfileURL: '%@'", tmp);
   else
     NSLog(@"Note: using profile at: %@", [AgenorProfileURL absoluteString]);
+
+  if ((tmp = [ud stringForKey: @"SOGoDefaultMailDomain"]))
+    {
+      defaultMailDomain = [tmp copy];
+    }
   
   PoolScanInterval = [[ud objectForKey:@"AgenorCacheCheckInterval"] intValue];
   if (PoolScanInterval == 0)