diff --git a/ChangeLog b/ChangeLog
index 2b5cfc959..a3db79d53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-08  Ludovic Marcotte <ludovic@inverse.ca>
+
+        * SoObjects/Mailer/SOGoMailFolder.m
+	  Priorize the look of folders before doing
+	  the one on messages. 
+
 2007-02-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/NSArray+Utilities.m: added an implementation of
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index d6bf24cd3..cf537404a 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -294,15 +294,15 @@ static BOOL useAltNamespace = NO;
     */
     return [self lookupImap4Message:_key inContext:_ctx];
   }
+
+  obj = [self lookupImap4Folder:_key  inContext:_ctx];
+  if (obj != nil)
+    return obj;
   
   /* check attributes directly bound to the app */
   if ((obj = [super lookupName:_key inContext:_ctx acquire:NO]))
     return obj;
   
-  obj = [self lookupImap4Folder:_key  inContext:_ctx];
-  if (obj != nil)
-    return obj;
-  
   /* return 404 to stop acquisition */
   return _acquire
     ? [NSException exceptionWithHTTPStatus:404 /* Not Found */]