diff --git a/ChangeLog b/ChangeLog
index d4eaf63c2..9e181cd45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-10-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m (-_appendSystemMailAccount): check
+	that -[url scheme] and -[url query] are not null before the
+	comparison, since nil == 0 == NSOrderedSame....
+
 	* OpenChange/MAPIStoreContext.m:
 	(-getMessageTableChildproperty:atURL:withTag:inFolder:withFID:)
 	added response for PR_ROW_TYPE (always 1) and PR_DEPTH (always 0).
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 24547532d..965749b52 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -502,7 +502,7 @@
 - (void) _appendSystemMailAccount
 {
   NSString *fullName, *imapLogin, *imapServer, *signature, *encryption,
-    *scheme, *action;
+    *scheme, *action, *query;
   NSMutableDictionary *mailAccount, *identity, *mailboxes, *receipts;
   NSNumber *port;
   NSMutableArray *identities;
@@ -540,14 +540,16 @@
 
   // 3. port & encryption
   scheme = [url scheme];
-  if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame)
+  if (scheme
+      && [scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame)
     {
       encryption = @"ssl";
       defaultPort = 993;
     }
   else
     {
-      if ([[url query] caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
+      query = [url query];
+      if (query && [query caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
         encryption = @"tls";
       else
         encryption = @"none";