diff --git a/SoObjects/SOGo/SOGoSystemDefaults.h b/SoObjects/SOGo/SOGoSystemDefaults.h
index 5a9c8dff3..9c00010c0 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.h
+++ b/SoObjects/SOGo/SOGoSystemDefaults.h
@@ -94,8 +94,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 a508fe0b5..9cb032e9c 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -48,6 +48,10 @@ typedef void (*NSUserDefaultsInitFunction) ();
 
 #define DIR_SEP "/"
 
+#ifndef NSUIntegerMax
+#define NSUIntegerMax UINTPTR_MAX
+#endif
+
 static void
 BootstrapNSUserDefaults ()
 {
@@ -576,7 +580,7 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
 //
 //
 //
-- (int) maximumMessageSubmissionCount
+- (NSUInteger) maximumMessageSubmissionCount
 {
   NSUInteger v;
 
@@ -588,7 +592,7 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
   return v;
 }
 
-- (int) maximumRecipientCount
+- (NSUInteger) maximumRecipientCount
 {
   NSUInteger v;