summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc4
-rw-r--r--program/steps/mail/sendmail.inc2
2 files changed, 3 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index d655a3316..9bda8906d 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -513,8 +513,8 @@ function rcmail_js_message_list($a_headers, $insert_top=FALSE)
$a_show_cols = is_array($CONFIG['list_cols']) ? $CONFIG['list_cols'] : array('subject');
// show 'to' instead of from in sent messages
- if (strtolower($IMAP->get_mailbox_name())=='sent' && ($f = array_search('from', $a_show_cols))
- && !array_search('to', $a_show_cols))
+ if (($IMAP->get_mailbox_name()==$CONFIG['sent_mbox'] || $IMAP->get_mailbox_name()==$CONFIG['drafts_mbox'])
+ && ($f = array_search('from', $a_show_cols)) && !array_search('to', $a_show_cols))
$a_show_cols[$f] = 'to';
$commands .= sprintf("this.set_message_coltypes(%s);\n", array2js($a_show_cols));
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index c3e0170fe..41735881c 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -166,7 +166,7 @@ if (empty($identity_arr['string']))
$identity_arr['string'] = $from;
// compose headers array
-$headers = array('Date' => date('D, j M Y G:i:s O'),
+$headers = array('Date' => date('D, j M Y H:i:s O'),
'From' => $identity_arr['string'],
'To' => rcube_charset_convert($mailto, $input_charset, $message_charset));