diff --git a/ChangeLog b/ChangeLog
index 04c2e8de8..492f007eb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailMainFrame.m ([UIxMailMainFrame
+	-composeAction]): prefix the INBOX folder with "folder".
+
 	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailBaseObject
 	-relativeImap4Name]): return nameInContainer stripped from its
 	first 6 characters since all folder names are prefixed with
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 4c3e3bf23..95c64ca83 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -236,7 +236,7 @@ static NSString *treeRootClassName = nil;
       if (parameter)
         [urlParams setObject: parameter
                    forKey: @"mailto"];
-      inbox = [NSString stringWithFormat: @"%@/INBOX",
+      inbox = [NSString stringWithFormat: @"%@/folderINBOX",
                         [c objectAtIndex: 0]];
       url = [inbox composeURLWithAction: @"compose"
                    parameters: urlParams
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 276286956..dba1bfe48 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -1042,7 +1042,7 @@ function initMailer(event) {
   if (!document.body.hasClassName("popup")) {
     configureMessageListEvents();
     initDnd();
-    currentMailbox = "/" + accounts[0] + "/INBOX";
+    currentMailbox = "/" + accounts[0] + "/folderINBOX";
     initMailboxTree();
   }
 }