summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--program/js/app.js5
-rw-r--r--program/steps/mail/getunread.inc3
2 files changed, 5 insertions, 3 deletions
diff --git a/program/js/app.js b/program/js/app.js
index ef9d1c51c..7a8b5e907 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -2112,7 +2112,7 @@ function rcube_webmail()
if (this.env.signatures[id])
{
- newsig = this.env.signatures[id]['text'];
+ newsig = String(this.env.signatures[id]['text']).replace("\n", "\r\n");
htmlsig = this.env.signatures[id]['is_html'];
}
@@ -3828,13 +3828,14 @@ function rcube_webmail()
case 'getunread':
case 'list':
if (this.task == 'mail') {
- if (this.message_list)
+ if (this.message_list && request_obj.__action == 'list')
this.msglist_select(this.message_list);
this.enable_command('show', 'expunge', 'select-all', 'select-none', 'sort', (this.env.messagecount > 0));
this.enable_command('purge', this.purge_mailbox_test());
}
else if (this.task == 'addressbook')
this.enable_command('export', (this.contact_list && this.contact_list.rowcount > 0));
+
break;
}
diff --git a/program/steps/mail/getunread.inc b/program/steps/mail/getunread.inc
index b94a66b57..145930c49 100644
--- a/program/steps/mail/getunread.inc
+++ b/program/steps/mail/getunread.inc
@@ -23,8 +23,9 @@ $a_folders = $IMAP->list_mailboxes();
if (!empty($a_folders))
{
+ $inbox = ($IMAP->get_mailbox_name() == 'INBOX');
foreach ($a_folders as $mbox_row)
- $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), ($IMAP->get_mailbox_name() == 'INBOX' && $mbox_row == 'INBOX'));
+ $OUTPUT->command('set_unread_count', $mbox_row, $IMAP->messagecount($mbox_row, 'UNSEEN'), $inbox && $mbox_row == 'INBOX');
}
$OUTPUT->send();