diff --git a/Main/SOGo.m b/Main/SOGo.m
index 160ec82e5..d61da0e75 100644
--- a/Main/SOGo.m
+++ b/Main/SOGo.m
@@ -97,10 +97,10 @@ static BOOL debugObjectAllocation = NO;
 #endif
   debugRequests = [ud boolForKey: @"SOGoDebugRequests"];
   debugLeaks = [ud boolForKey: @"SOGoDebugLeaks"];
-  /* vMem size check - default is 200MB */
+  /* vMem size check - default is 384MB */
     
   tmp = [ud objectForKey: @"SxVMemLimit"];
-  vMemSizeLimit = ((tmp != nil) ? [tmp intValue] : 200);
+  vMemSizeLimit = ((tmp != nil) ? [tmp intValue] : 384);
   if (vMemSizeLimit > 0)
     NSLog(@"Note: vmem size check enabled: shutting down app when "
 	  @"vmem > %d MB", vMemSizeLimit);
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index a4ae4d28c..a483aad4a 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1876,7 +1876,9 @@ function onLoadMailboxesCallback(http) {
 }
 
 function buildMailboxes(accountKeys, encoded) {
-    var account = new Mailbox("account", accountKeys[0], null, accountKeys[1]);
+    var account = new Mailbox("account", accountKeys[0], 
+                              undefined, //necessary, null will cause issues
+                              accountKeys[1]);
     var data = encoded.evalJSON(true);
     var mailboxes = data.mailboxes;
     var unseen = (data.status? data.status.unseen : 0);