diff --git a/ChangeLog b/ChangeLog
index 1d2532981..3d095d57e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-07-02  Cyril Robert <crobert@inverse.ca>
+
+	* UI/MailerUI/UIxMailFolderActions.m: Added auto-subscribe on imap folder
+	creation.
+
 2009-07-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 05a50745e..7320dd1e4 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -52,7 +52,7 @@
   WOResponse *response;
   NGImap4Connection *connection;
   NSException *error;
-  NSString *folderName;
+  NSString *folderName, *path;
 
   co = [self clientObject];
 
@@ -67,7 +67,12 @@
           [response appendContentString: @"Unable to create folder."];
         }
       else
-        response = [self responseWith204];
+        {
+          path = [NSString stringWithFormat: @"%@%@", 
+                  [[co imap4URL] path], folderName];
+          [[connection client] subscribe: path];
+          response = [self responseWith204];
+        }
     }
   else
     {