summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
authorThomas <tb@woodcrest.local>2013-10-09 12:04:17 +0200
committerThomas Bruederli <thomas@roundcube.net>2014-01-16 11:21:59 +0100
commit628706acdcb973154161b5862c30ce706a08455a (patch)
treedba7b1aa74bae7ff562da785d6ede479a0c1218e /program/steps
parent017c4f19fd91aa1f658131fae272617a14598a12 (diff)
Prepare message list to display IMAP folder
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/mail/func.inc4
1 files changed, 3 insertions, 1 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 0211fabc4..7436544be 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -398,6 +398,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$cont = show_bytes($header->$col);
else if ($col == 'date')
$cont = $RCMAIL->format_date($header->date);
+ else if ($col == 'folder')
+ $cont = rcube::Q(rcube_charset::convert($header->folder, 'UTF7-IMAP'));
else
$cont = rcube::Q($header->$col);
@@ -421,7 +423,7 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE, $a_show_cols=null
$a_msg_flags['prio'] = (int) $header->priority;
$a_msg_flags['ctype'] = rcube::Q($header->ctype);
- $a_msg_flags['mbox'] = $mbox;
+ $a_msg_flags['mbox'] = $header->folder;
// merge with plugin result (Deprecated, use $header->flags)
if (!empty($header->list_flags) && is_array($header->list_flags))