diff --git a/ChangeLog b/ChangeLog
index 8465b3861..be72af166 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-30  Ludovic Marcotte  <lmarcotte@inverse.ca> 
+
+	* SoObjects/SOGo/SOGoDomainDefaults.{h,m} - added
+	-hideSystemEMail that honors SOGoHideSystemEMail.
+	Right now, this variable is limited only to
+	the calendar-user-address-set response but can/will be
+	extended later.
+
+	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
+	(-davCalendarUserAddressSet): Modified to honor
+	SOGoHideSystemEMail domain default.
+
+
 2012-04-25  Jean Raby  <jraby@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m
diff --git a/SoObjects/Appointments/SOGoUserFolder+Appointments.m b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
index c9c440b10..65038f553 100644
--- a/SoObjects/Appointments/SOGoUserFolder+Appointments.m
+++ b/SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -68,7 +68,20 @@
 
   doneEmails = [NSMutableDictionary dictionary];
   ownerUser = [SOGoUser userWithLogin: owner];
-  emails = [[ownerUser allEmails] objectEnumerator];
+  emails = nil;
+
+  if ([[ownerUser domainDefaults] hideSystemEMail])
+    {
+      int count;
+
+      count = [[ownerUser allEmails] count];
+      if (count > 1)
+	emails = [[[ownerUser allEmails] subarrayWithRange: NSMakeRange(0, count-1)] objectEnumerator];
+    }
+
+  if (!emails)
+    emails = [[ownerUser allEmails] objectEnumerator];
+
   while ((currentEmail = [emails nextObject]))
     {
       if (![doneEmails objectForKey: currentEmail])
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.h b/SoObjects/SOGo/SOGoDomainDefaults.h
index dd48e1b88..2c0c86b94 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.h
+++ b/SoObjects/SOGo/SOGoDomainDefaults.h
@@ -1,6 +1,6 @@
 /* SOGoDomainDefaults.h - this file is part of SOGo
  *
- * Copyright (C) 2009-2010 Inverse inc.
+ * Copyright (C) 2009-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -75,6 +75,8 @@
 
 - (NSArray *) additionalJSFiles;
 
+- (BOOL) hideSystemEMail;
+
 @end
 
 #endif /* SOGODOMAINDEFAULTS_H */
diff --git a/SoObjects/SOGo/SOGoDomainDefaults.m b/SoObjects/SOGo/SOGoDomainDefaults.m
index a6c2520fb..bb06640fe 100644
--- a/SoObjects/SOGo/SOGoDomainDefaults.m
+++ b/SoObjects/SOGo/SOGoDomainDefaults.m
@@ -1,6 +1,6 @@
 /* SOGoDomainDefaults.m - this file is part of SOGo
  *
- * Copyright (C) 2009-2010 Inverse inc.
+ * Copyright (C) 2009-2012 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *
@@ -314,4 +314,9 @@
   return [self stringArrayForKey: @"SOGoUIAdditionalJSFiles"];
 }
 
+- (BOOL) hideSystemEMail
+{
+  return [self boolForKey: @"SOGoHideSystemEMail"];
+}
+
 @end