diff --git a/ChangeLog b/ChangeLog
index 526682f53..6c1d3cd39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-05-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions
+	-deleteFolderAction]): select the INBOX folder before removing the
+	target folder, so that Courier does not complain about the current
+	mailbox being in use.
+
 2008-05-16  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/SOGo/SOGoGCSFolder.m ([SOGoGCSFolder
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index f17e85617..f1e259d31 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -636,7 +636,7 @@ function onAddressBookRemove(event) {
       onFolderSelectionChange();
     }
     else {
-      var folderId = nodes[0].getAttribute("id");
+      var folderId = nodes[0].getAttribute("id").substr("1");
       unsubscribeFromFolder(folderId, owner, onFolderUnsubscribeCB, folderId);
     }
   }