diff --git a/ChangeLog b/ChangeLog
index 83ecce731..61a7c8dc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/SOGoSystemDefaults.m (-enableEMailAlarms): new
+	method for the "SOGoEnableEMailAlarms" user default.
+
 2010-08-19  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/generic.js (showPromptDialog): new
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index cd8e3a834..a543cdfba 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -42,6 +42,8 @@
 - (BOOL) isCalendarDAVAccessEnabled;
 - (BOOL) isAddressBookDAVAccessEnabled;
 
+- (BOOL) enableEMailAlarms;
+
 - (NSString *) faviconRelativeURL;
 - (NSString *) zipPath;
 - (int) port;
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 659aff14f..8b20b5838 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -221,6 +221,11 @@ BootstrapNSUserDefaults ()
   return [self boolForKey: @"SOGoAddressBookDAVAccessEnabled"];
 }
 
+- (BOOL) enableEMailAlarms
+{
+  return [self boolForKey: @"SOGoEnableEMailAlarms"];
+}
+
 - (NSString *) faviconRelativeURL
 {
   return [self stringForKey: @"SOGoFaviconRelativeURL"];