diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index d97026853..db3222d6d 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -96,8 +96,8 @@
 
 - (int) maximumMessageSizeLimit;
 
-- (int) maximumMessageSubmissionCount;
-- (int) maximumRecipientCount;
+- (NSUInteger) maximumMessageSubmissionCount;
+- (NSUInteger) maximumRecipientCount;
 - (int) maximumSubmissionInterval;
 - (int) messageSubmissionBlockInterval;
 
diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index fd23009c7..ea619ed45 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -44,6 +44,10 @@ typedef void (*NSUserDefaultsInitFunction) ();
 
 #define DIR_SEP "/"
 
+#ifndef NSUIntegerMax
+#define NSUIntegerMax UINTPTR_MAX
+#endif
+
 static void
 BootstrapNSUserDefaults ()
 {
@@ -589,7 +593,7 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
 //
 //
 //
-- (int) maximumMessageSubmissionCount
+- (NSUInteger) maximumMessageSubmissionCount
 {
   NSUInteger v;
 
@@ -601,7 +605,7 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return v;
 }
 
-- (int) maximumRecipientCount
+- (NSUInteger) maximumRecipientCount
 {
   NSUInteger v;