diff --git a/SoObjects/SOGo/SOGoGCSFolder.m b/SoObjects/SOGo/SOGoGCSFolder.m
index 9afed6a5d..a4036ec50 100644
--- a/SoObjects/SOGo/SOGoGCSFolder.m
+++ b/SoObjects/SOGo/SOGoGCSFolder.m
@@ -1831,6 +1831,10 @@ static NSArray *childRecordFields = nil;
   SOGoGroup *group;
 
   objectPath = [objectPathArray componentsJoinedByString: @"/"];
+
+  // We make sure we don't get unescaped uid - like foo%40bar.com
+  // or for groups - like %40team
+  uid = [uid stringByUnescapingURL];
   aUID = uid;
   if (![uid hasPrefix: @"@"])
     {