diff --git a/ChangeLog b/ChangeLog
index 7ab9aab3b..c07d16e30 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-06-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoUser.m ([SOGoUser +initialize]): declare
+	"UTC" as fallback timezone instead of "Canada/Eastern".
+	([-hasEmail:email]): make use of the new NSArray's
+	containsCaseInsensitiveString: method.
+
 	* SoObjects/Mailer/SOGoMailObject.m ([SOGoMailObject
 	-davContentType]): declare "message/rfc822" as content type.
 
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index e345602a7..d60b5dc2c 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -30,8 +30,10 @@
 #import "AgenorUserDefaults.h"
 #import "LDAPUserManager.h"
 #import "SOGoContentObject.h"
-#import "SOGoUser.h"
 #import "SOGoPermissions.h"
+#import "NSArray+Utilities.h"
+
+#import "SOGoUser.h"
 
 static NSTimeZone *serverTimeZone = nil;
 static NSString *fallbackIMAP4Server = nil;
@@ -57,7 +59,7 @@ static NSURL *AgenorProfileURL = nil;
     {
       tzName = [ud stringForKey: @"SOGoServerTimeZone"];
       if (!tzName)
-        tzName = @"Canada/Eastern";
+        tzName = @"UTC";
       serverTimeZone = [NSTimeZone timeZoneWithName: tzName];
       [serverTimeZone retain];
     }
@@ -186,23 +188,10 @@ static NSURL *AgenorProfileURL = nil;
 
 - (BOOL) hasEmail: (NSString *) email
 {
-  BOOL hasEmail;
-  NSString *currentEmail, *cmpEmail;
-  NSEnumerator *emails;
-
-  hasEmail = NO;
   if (!allEmails)
     [self _fetchAllEmails];
-  cmpEmail = [email lowercaseString];
-  emails = [allEmails objectEnumerator];
-  currentEmail = [emails nextObject];
-  while (currentEmail && !hasEmail)
-    if ([[currentEmail lowercaseString] isEqualToString: cmpEmail])
-      hasEmail = YES;
-    else
-      currentEmail = [emails nextObject];
-
-  return hasEmail;
+  
+  return [allEmails containsCaseInsensitiveString: email];
 }
 
 - (NSString *) cn