diff --git a/ChangeLog b/ChangeLog
index df53d5294..d9fd6e16e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-05-22  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions
+	-renameFolderAction]): select the INBOX folder before renaming the
+	target folder.
+
 	* UI/MainUI/SOGoRootPage.m ([SOGoRootPage -loginSuffix]): new
 	method that returns the login suffix configured in the user
 	defaults.
diff --git a/NEWS b/NEWS
index 88e8fd542..1e64ec2ff 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+0.9.0-2008XXXX (1.0)
+--------------------
+- work around the situation where Courier IMAP would refuse to rename the current mailbox or move it into the trash
+
 0.9.0-20080520 (1.0 rc6)
 ------------------------
 - retrieving the freebusy DAV object was causing SOGo to crash
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 86ccd74f5..764e2e62c 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -98,7 +98,7 @@
 
 - (WOResponse *) renameFolderAction
 {
-  SOGoMailFolder *co;
+  SOGoMailFolder *co, *inbox;
   WOResponse *response;
   NGImap4Connection *connection;
   NSException *error;
@@ -113,6 +113,8 @@
       srcURL = [co imap4URL];
       destURL = [self _urlOfFolder: srcURL renamedTo: folderName];
       connection = [co imap4Connection];
+      inbox = [[co mailAccountFolder] inboxFolderInContext: context];
+      [[connection client] select: [inbox absoluteImap4Name]];
       error = [connection moveMailboxAtURL: srcURL
 			  toURL: destURL];
       if (error)