diff --git a/ChangeLog b/ChangeLog
index 6fd8773bd..522476ad3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Appointments/SOGoCalendarComponent.m
+	([SOGoCalendarComponent -rolesOfUser:login]): removed method that
+	was previously commented out.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser -systemEmail]): new method
 	forwared to [AgenorUserManager getSystemEmailForUID:].
 
diff --git a/SoObjects/SOGo/SOGoUser.h b/SoObjects/SOGo/SOGoUser.h
index bba019df9..99a5de28c 100644
--- a/SoObjects/SOGo/SOGoUser.h
+++ b/SoObjects/SOGo/SOGoUser.h
@@ -46,7 +46,7 @@
 {
   NSString *cn;
   NSString *email;
-  NSString *systemEmail;
+  NSString *systemEMail;
   NSUserDefaults *userDefaults;
   NSUserDefaults *userSettings;
   NSTimeZone *userTimeZone;
@@ -58,7 +58,7 @@
 /* properties */
 
 - (NSString *) email;
-- (NSString *) systemEmail;
+- (NSString *) systemEMail;
 - (NSString *) cn;
 - (NSURL *) freeBusyURL;
 
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 736b238f7..f7890b17d 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -111,15 +111,15 @@ static NSTimeZone *serverTimeZone = nil;
   return email;
 }
 
-- (NSString *) systemEmail
+- (NSString *) systemEMail
 {
-  if (!systemEmail)
+  if (!systemEMail)
     {
-      systemEmail = [[self userManager] getSystemEmailForUID: [self login]];
-      [systemEmail retain];
+      systemEMail = [[self userManager] getSystemEmailForUID: [self login]];
+      [systemEMail retain];
     }
 
-  return systemEmail;
+  return systemEMail;
 }
 
 - (NSString *) cn