diff --git a/ChangeLog b/ChangeLog
index 168248ebb..6fd8773bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-05-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -systemEmail]): new method
+	forwared to [AgenorUserManager getSystemEmailForUID:].
+
 	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
 	-toolbar]): method replacing the one with the same name in the
 	task and appointment editor classes. This method makes also use of
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index e6c5a498e..736b238f7 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -102,7 +102,7 @@ static NSTimeZone *serverTimeZone = nil;
 
 - (NSString *) email
 {
-  if (email == nil)
+  if (!email)
     {
       email = [[self userManager] getEmailForUID: [self login]];
       [email retain];
@@ -111,6 +111,17 @@ static NSTimeZone *serverTimeZone = nil;
   return email;
 }
 
+- (NSString *) systemEmail
+{
+  if (!systemEmail)
+    {
+      systemEmail = [[self userManager] getSystemEmailForUID: [self login]];
+      [systemEmail retain];
+    }
+
+  return systemEmail;
+}
+
 - (NSString *) cn
 {
   if (cn == nil)