diff --git a/ChangeLog b/ChangeLog
index f1576d508..9cb1cbd9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailBaseObject.m (-_createIMAP4Connection):
+	we need to initialize newConnection to nil when the return
+	password is nil.
+
 2010-10-28  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Mailer/SOGoDraftObject.m
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index 875e9a9b7..d0b7bfbb2 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -140,6 +140,9 @@ static BOOL debugOn = YES;
                                              password: password];
         }
     }
+  else
+    newConnection = nil;
+
   if (!newConnection)
     {
       newConnection = (NGImap4Connection *) [NSNull null];