diff --git a/NEWS b/NEWS
index 221d7c4c9..27edab5b0 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ Bug fixes
  - [web] fixed search results in Calendar module when targeting all events
  - [core] honor IMAPLoginFieldName also when setting IMAP ACLs
  - [core] honor groups when setting IMAP ACLs
+ - [core] honor "any authenticated user" when setting IMAP ACLs
 
 4.0.8 (2019-07-19)
 ------------------
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index f6fb77bfb..62a0bdb56 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -1428,6 +1428,9 @@ _compareFetchResultsByMODSEQ (id entry1, id entry2, void *data)
   SOGoGroup *group;
   SOGoUser *user;
 
+  if ([uid isEqualToString: defaultUserID])
+    return uid;
+
   group = [SOGoGroup groupWithIdentifier: uid
                                 inDomain: [[context activeUser] domain]];
   if (group)