diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 88e77b548..5c78c4d25 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -403,16 +403,18 @@
 - (WOResponse *) saveFoldersStateAction
 {
   WORequest *request;
-  NSString *expandedFolders;
+  NSArray *expandedFolders;
+  NSString *json;
   
   [self _setupContext];
   request = [context request];
-  expandedFolders = [request formValueForKey: @"expandedFolders"];
-
-  [moduleSettings setObject: [expandedFolders componentsSeparatedByString: @","]
-		  forKey: @"ExpandedFolders"];
-
-  [us synchronize];
+  json = [request formValueForKey: @"expandedFolders"];
+  if ([json length])
+    {
+      expandedFolders = [json objectFromJSONString];
+      [moduleSettings setObject: expandedFolders forKey: @"ExpandedFolders"];
+      [us synchronize];
+    }
 
   return [self responseWithStatus: 204];
 }