diff --git a/SoObjects/SOGo/SOGoSystemDefaults.m b/SoObjects/SOGo/SOGoSystemDefaults.m
index 7e2908d41..fd23009c7 100644
--- a/SoObjects/SOGo/SOGoSystemDefaults.m
+++ b/SoObjects/SOGo/SOGoSystemDefaults.m
@@ -591,12 +591,26 @@ _injectConfigurationFromFile (NSMutableDictionary *defaultsDict,
 //
 - (int) maximumMessageSubmissionCount
 {
-  return [self integerForKey: @"SOGoMaximumMessageSubmissionCount"];
+  NSUInteger v;
+
+  v = [self integerForKey: @"SOGoMaximumMessageSubmissionCount"];
+
+  if (!v)
+    return NSUIntegerMax;
+
+  return v;
 }
 
 - (int) maximumRecipientCount
 {
-  return [self integerForKey: @"SOGoMaximumRecipientCount"];
+  NSUInteger v;
+
+  v = [self integerForKey: @"SOGoMaximumRecipientCount"];
+
+  if (!v)
+    return NSUIntegerMax;
+
+  return v;
 }
 
 - (int) maximumSubmissionInterval
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 1fa264bfe..59f2b38e2 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -816,7 +816,7 @@ static NSArray *infoKeys = nil;
   SOGoSystemDefaults *dd;
   id <WOActionResults> response;
 
-  int messages_count, recipients_count;
+  NSUInteger messages_count, recipients_count;
 
   messageSubmissions = [[SOGoCache sharedCache] messageSubmissionsCountForLogin: [[context activeUser] login]];
   dd = [SOGoSystemDefaults sharedSystemDefaults];