diff --git a/ChangeLog b/ChangeLog
index 8aac17655..b82665af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/SOGo/SOGoPermissions.m: added the new role
+	"SOGoMailRole_MessageEraser".
+
 	* UI/Common/UIxAclEditor.m ([UIxAclEditor -defaultUserID]) 
 	([UIxAclEditor -_prepareUsers]): take the new SOGoObject's
 	"defaultUserID" method into account.
diff --git a/SoObjects/SOGo/SOGoPermissions.h b/SoObjects/SOGo/SOGoPermissions.h
index aaa31af54..2b4e60cf5 100644
--- a/SoObjects/SOGo/SOGoPermissions.h
+++ b/SoObjects/SOGo/SOGoPermissions.h
@@ -32,9 +32,8 @@ 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;
@@ -47,6 +46,7 @@ extern NSString *SOGoMailRole_Poster;
 extern NSString *SOGoMailRole_Expunger;
 extern NSString *SOGoMailRole_Creator;
 extern NSString *SOGoMailRole_Administrator;
+extern NSString *SOGoMailRole_MessageEraser;
 
 extern NSString *SOGoCalendarRole_Organizer;
 extern NSString *SOGoCalendarRole_Participant;
diff --git a/SoObjects/SOGo/SOGoPermissions.m b/SoObjects/SOGo/SOGoPermissions.m
index a20e68168..f5cb1f172 100644
--- a/SoObjects/SOGo/SOGoPermissions.m
+++ b/SoObjects/SOGo/SOGoPermissions.m
@@ -28,7 +28,7 @@ NSString *SOGoRole_ObjectEraser = @"ObjectEraser";
 NSString *SOGoRole_ObjectViewer = @"ObjectViewer";
 NSString *SOGoRole_ObjectReader = @"ObjectReader";
 NSString *SOGoRole_ObjectEditor = @"ObjectEditor";
-NSString *SOGoRole_FolderCreator = @"FolderCreate";
+NSString *SOGoRole_FolderCreator = @"FolderCreator";
 NSString *SOGoRole_FolderEraser = @"FolderEraser";
 NSString *SOGoRole_FolderViewer = @"FolderViewer";
 NSString *SOGoRole_FolderReader = @"FolderReader";
@@ -65,11 +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";
+NSString *SOGoMailRole_SeenKeeper = @"MailSeenKeeper";
+NSString *SOGoMailRole_Writer = @"MailWriter";
+NSString *SOGoMailRole_Poster = @"MailPoster";
+NSString *SOGoMailRole_Expunger = @"MailExpunger";
+NSString *SOGoMailRole_Administrator = @"MailAdministrator";
+NSString *SOGoMailRole_MessageEraser = @"MailMessageEraser";
 
 /* permissions */
 NSString *SOGoPerm_ReadAcls = @"ReadAcls"; /* the equivalent of "read-acl" in