diff --git a/CHANGELOG b/CHANGELOG
index 9f2f24e81..c81e5cbfc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,7 @@ CHANGELOG Roundcube Webmail
 - Fix issue caused by non-default session.cookie_lifetime setting (#5961)
 - Fix Edge encoding bug when pasting text into the HTML editor, update to TinyMCE 4.5.8 (#5885)
 - Fix handling of unknown Content-Disposition type (#6002)
+- Fix truncated folder name on messages list in multi-folder mode, for folders with non-ascii characters (#6004)
 
 RELEASE 1.3.1
 -------------
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 6275b5da4..fbdc9165f 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -524,8 +524,7 @@ function rcmail_js_message_list($a_headers, $insert_top=false, $a_show_cols=null
             else if ($col == 'folder') {
                 if ($last_folder !== $header->folder) {
                     $last_folder      = $header->folder;
-                    $last_folder_name = rcube_charset::convert($last_folder, 'UTF7-IMAP');
-                    $last_folder_name = $RCMAIL->localize_foldername($last_folder_name, true);
+                    $last_folder_name = $RCMAIL->localize_foldername($last_folder, true);
                     $last_folder_name = str_replace($delimiter, " \xC2\xBB ", $last_folder_name);
                 }