diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index 16464f291..c719fb069 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -797,8 +797,9 @@ static NSString *inboxFolderName = @"INBOX";
           // * LIST (\NonExistent \HasChildren) "/" shared
           // * LIST (\NonExistent \HasChildren) "/" shared/jdoe@example.com
           // * LIST (\HasNoChildren) "/" shared/jdoe@example.com/INBOX
-          else if (([[[result objectForKey: @"list"] objectForKey: currentFolder] indexOfObject: @"nonexistent"] != NSNotFound &&
-               [[[result objectForKey: @"list"] objectForKey: currentFolder] indexOfObject: @"haschildren"] != NSNotFound))
+          else if (!hasAnnotatemore &&
+		   ([[[result objectForKey: @"list"] objectForKey: currentFolder] indexOfObject: @"nonexistent"] != NSNotFound &&
+		    [[[result objectForKey: @"list"] objectForKey: currentFolder] indexOfObject: @"haschildren"] != NSNotFound))
             guid = [NSString stringWithFormat: @"%@", currentFolder];
           else
             {