diff --git a/ChangeLog b/ChangeLog
index 9df048988..d6499d9c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-05-18  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoPermissions.[hm]: added the
+	SOGoRole_ObjectReader, SOGoRole_Folder*, and SOGoMailRole_*
+	symbols.
+
 	* UI/MailerUI/UIxMailUserRightsEditor.[hm]: new class module that
 	provides a view to the IMAP acls.
 
diff --git a/SoObjects/SOGo/SOGoPermissions.h b/SoObjects/SOGo/SOGoPermissions.h
index 67ee64bee..aaa31af54 100644
--- a/SoObjects/SOGo/SOGoPermissions.h
+++ b/SoObjects/SOGo/SOGoPermissions.h
@@ -28,17 +28,25 @@
 #import <NGObjWeb/SoPermissions.h>
 
 extern NSString *SOGoRole_ObjectCreator;
+extern NSString *SOGoRole_ObjectReader;
 extern NSString *SOGoRole_ObjectEraser;
 extern NSString *SOGoRole_ObjectViewer;
 extern NSString *SOGoRole_ObjectEditor;
+extern NSString *SOGoRole_FolderCreator;
+extern NSString *SOGoRole_FolderEraser;
+extern NSString *SOGoRole_FolderViewer;
+extern NSString *SOGoRole_FolderReader;
 extern NSString *SOGoRole_AuthorizedSubscriber;
 extern NSString *SOGoRole_None;
-
 extern NSString *SOGoRole_FreeBusy;
 extern NSString *SOGoRole_FreeBusyLookup;
 
-extern NSString *SOGoPerm_ReadAcls;
-extern NSString *SOGoPerm_FreeBusyLookup;
+extern NSString *SOGoMailRole_SeenKeeper;
+extern NSString *SOGoMailRole_Writer;
+extern NSString *SOGoMailRole_Poster;
+extern NSString *SOGoMailRole_Expunger;
+extern NSString *SOGoMailRole_Creator;
+extern NSString *SOGoMailRole_Administrator;
 
 extern NSString *SOGoCalendarRole_Organizer;
 extern NSString *SOGoCalendarRole_Participant;
@@ -61,6 +69,9 @@ extern NSString *SOGoCalendarRole_ComponentDAndTViewer;
 extern NSString *SOGoCalendarRole_ComponentModifier;
 extern NSString *SOGoCalendarRole_ComponentResponder;
 
+extern NSString *SOGoPerm_ReadAcls;
+extern NSString *SOGoPerm_FreeBusyLookup;
+
 extern NSString *SOGoCalendarPerm_ViewWholePublicRecords;
 extern NSString *SOGoCalendarPerm_ViewDAndTOfPublicRecords;
 extern NSString *SOGoCalendarPerm_ModifyPublicRecords;
diff --git a/SoObjects/SOGo/SOGoPermissions.m b/SoObjects/SOGo/SOGoPermissions.m
index e750ef31b..a20e68168 100644
--- a/SoObjects/SOGo/SOGoPermissions.m
+++ b/SoObjects/SOGo/SOGoPermissions.m
@@ -26,7 +26,12 @@
 NSString *SOGoRole_ObjectCreator = @"ObjectCreator";
 NSString *SOGoRole_ObjectEraser = @"ObjectEraser";
 NSString *SOGoRole_ObjectViewer = @"ObjectViewer";
+NSString *SOGoRole_ObjectReader = @"ObjectReader";
 NSString *SOGoRole_ObjectEditor = @"ObjectEditor";
+NSString *SOGoRole_FolderCreator = @"FolderCreate";
+NSString *SOGoRole_FolderEraser = @"FolderEraser";
+NSString *SOGoRole_FolderViewer = @"FolderViewer";
+NSString *SOGoRole_FolderReader = @"FolderReader";
 NSString *SOGoRole_AuthorizedSubscriber = @"AuthorizedSubscriber";
 NSString *SOGoRole_None = @"None";
 
@@ -60,6 +65,12 @@ NSString *SOGoCalendarRole_ComponentDAndTViewer = @"ComponentDAndTViewer";
 NSString *SOGoCalendarRole_ComponentModifier = @"ComponentModifier";
 NSString *SOGoCalendarRole_ComponentResponder = @"ComponentResponder";
 
+NSString *SOGoMailRole_SeenKeeper = @"SeenKeeper";
+NSString *SOGoMailRole_Writer = @"Writer";
+NSString *SOGoMailRole_Poster = @"Poster";
+NSString *SOGoMailRole_Expunger = @"Expunger";
+NSString *SOGoMailRole_Administrator = @"Administrator";
+
 /* permissions */
 NSString *SOGoPerm_ReadAcls = @"ReadAcls"; /* the equivalent of "read-acl" in
                                               the WebDAV acls spec, which is
@@ -83,3 +94,4 @@ NSString *SOGoCalendarPerm_ViewAllComponent = @"ViewAllComponent";
 NSString *SOGoCalendarPerm_ViewDAndT = @"ViewDAndT";
 NSString *SOGoCalendarPerm_ModifyComponent = @"ModifyComponent";
 NSString *SOGoCalendarPerm_RespondToComponent = @"RespondToComponent";
+