diff --git a/ChangeLog b/ChangeLog
index f3434f485..876e5e7e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2012-03-09  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* SoObjects/Mailer/SOGoMailFolder.m (-renameTo:): reset the
+	imap4URL to nil and change the nameInContainer after a successful
+	operation.
+
 	* OpenChange/MAPIStoreFolder.m
 	(-getTable:andRowCount:tableType:andHandleId:): if the current
 	user is not the owner of the folder, the permissions table cannot
diff --git a/SoObjects/Mailer/SOGoMailFolder.m b/SoObjects/Mailer/SOGoMailFolder.m
index 1ba3109da..7c975e34f 100644
--- a/SoObjects/Mailer/SOGoMailFolder.m
+++ b/SoObjects/Mailer/SOGoMailFolder.m
@@ -298,6 +298,10 @@ static NSString *defaultUserID =  @"anyone";
                                     toURL: destURL];
           if (!error)
             {
+              ASSIGN (imap4URL, nil);
+              ASSIGN (nameInContainer,
+                      ([NSString stringWithFormat: @"folder%@", [newName asCSSIdentifier]]));
+
               // We unsubscribe to the old one, and subscribe back to the new one
               if ([[[context activeUser] userDefaults]
                     mailShowSubscribedFoldersOnly])