diff --git a/ChangeLog b/ChangeLog
index a67078b15..e34bd7431 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-02-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailFolderActions.m (-createFolderAction): we
+	check if the clientObject responds to "aboluteImap4Name",
+	otherwise the subscription is made to the folderName alone.
+
 	* Main/SOGo.m (-run): moved initialization logs from +initialize
 	here, so that they are output to the redirected output stream.
 	Added version number to "starting" line.
diff --git a/UI/MailerUI/UIxMailFolderActions.m b/UI/MailerUI/UIxMailFolderActions.m
index 6e63b3668..60739298f 100644
--- a/UI/MailerUI/UIxMailFolderActions.m
+++ b/UI/MailerUI/UIxMailFolderActions.m
@@ -38,7 +38,7 @@
 #import <Mailer/SOGoMailObject.h>
 #import <SOGo/NSObject+Utilities.h>
 #import <SOGo/SOGoUser.h>
-#import <SOGo/SOGoUserSettings.h>
+#import <SOGo/SOGoUserDefaults.h>
 
 #import <UI/Common/WODirectAction+SOGo.h>
 
@@ -68,8 +68,11 @@
         }
       else
         {
-          path = [NSString stringWithFormat: @"%@%@", 
-			   [co absoluteImap4Name], folderName];
+          if ([co respondsToSelector: @selector (absoluteImap4Name)])
+            path = [NSString stringWithFormat: @"%@%@", 
+                             [co absoluteImap4Name], folderName];
+          else
+            path = folderName;
 	  [[connection client] subscribe: path];
 	  
           response = [self responseWith204];
@@ -133,7 +136,8 @@
       else
 	{
 	  // We unsubscribe to the old one, and subscribe back to the new one
-	  if ([[[context activeUser] userDefaults] mailShowSubscribedFoldersOnly])
+	  if ([[[context activeUser] userDefaults]
+                mailShowSubscribedFoldersOnly])
 	    {	    
 	      [[connection client] subscribe: [destURL path]];
 	      [[connection client] unsubscribe: [srcURL path]];