diff --git a/ChangeLog b/ChangeLog
index 3cb834313..4ac13008c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-08-08  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailAccountActions.m ([UIxMailAccountActions
+	-listMailboxesAction]): declare the output as text/plain in UTF-8.
+
 	* UI/MailerUI/UIxMailFolderActions.m ([UIxMailFolderActions
 	-deleteFolderAction]): fixed the url of the destination folder.
 
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index 56b9a0d87..6342e92f3 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -103,6 +103,9 @@
   folders = [self _jsonFolders: [rawFolders objectEnumerator]];
 
   response = [context response];
+  [response setStatus: 200];
+  [response setHeader: @"text/plain; charset=utf-8"
+	    forKey: @"content-type"];
   [response appendContentString: [folders jsonRepresentation]];
 
   return response;