diff options
| author | Aleksander Machniak <alec@alec.pl> | 2014-07-28 11:14:23 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2014-07-28 11:14:23 +0200 |
| commit | 85f14674316387d08fa11221de340c71835c4fa3 (patch) | |
| tree | 96bb6881e370994ca1bee8a5883cf1767b693987 /program/steps/mail | |
| parent | 4d52ee03a19864e537e3aa384ffbff2e33d6beef (diff) | |
| parent | d4783319a086b09eb50ac6ad5da93eb1eeb771ca (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/steps/mail')
| -rw-r--r-- | program/steps/mail/func.inc | 2 | ||||
| -rw-r--r-- | program/steps/mail/show.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 77f11725f..8774c08fe 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -110,7 +110,7 @@ if (empty($RCMAIL->action) || $RCMAIL->action == 'list') { // set configuration $RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted', - 'skip_deleted', 'display_next', 'message_extwin', 'compose_extwin', 'forward_attachment')); + 'skip_deleted', 'display_next', 'message_extwin', 'forward_attachment')); if (!$OUTPUT->ajax_call) { $OUTPUT->add_label('checkingmail', 'deletemessage', 'movemessagetotrash', diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index e6ab4891b..4b2d78d31 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.inc @@ -80,7 +80,7 @@ if ($uid) { // set configuration $RCMAIL->set_env_config(array('delete_junk', 'flag_for_deletion', 'read_when_deleted', - 'skip_deleted', 'display_next', 'compose_extwin', 'forward_attachment')); + 'skip_deleted', 'display_next', 'forward_attachment')); // set special folders foreach (array('drafts', 'trash', 'junk') as $mbox) { |