diff --git a/CHANGELOG b/CHANGELOG
index 5fddd131a..f54a41be1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,11 @@
CHANGELOG RoundCube Webmail
---------------------------
+2008/05/16 (alec)
+----------
+- In Preferences added possibility to configure 'read_when_deleted',
+ 'mdn_requests', 'message_sort_col' and 'message_sort_order' options
+
2008/05/15 (thomasb)
----------
- Make IMAP auth type configurable (#1483825)
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 669da5aba..35115f016 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -254,6 +254,15 @@ $labels['logoutclear'] = 'Clear Trash on logout';
$labels['logoutcompact'] = 'Compact Inbox on logout';
$labels['uisettings'] = 'User Interface';
$labels['serversettings'] = 'Server Settings';
+$labels['mailboxview'] = 'Mailbox View';
+$labels['mdnrequests'] = 'Sender notifications';
+$labels['descending'] = 'descending';
+$labels['ascending'] = 'ascending';
+$labels['askuser'] = 'ask the user';
+$labels['autosend'] = 'send automatically';
+$labels['ignore'] = 'ignore';
+$labels['readwhendeleted'] = 'Mark the message as read on delete';
+$labels['messagesorder'] = 'Messages order';
$labels['autosavedraft'] = 'Automatically save draft';
$labels['everynminutes'] = 'every $n minutes';
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index d0bd182bb..32e863e72 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -171,6 +171,48 @@ function rcmail_user_prefs_form($attrib)
$input_htmleditor->show($config['htmleditor']?1:0));
}
+
+ if (!isset($no_override['mdn_requests']))
+ {
+ $field_id = 'rcmfd_mdn_requests';
+ $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
+ $select_mdn_requests->add(rcube_label('askuser'), 0);
+ $select_mdn_requests->add(rcube_label('autosend'), 1);
+ $select_mdn_requests->add(rcube_label('ignore'), 2);
+
+ $out .= sprintf("
| %s |
\n",
+ $field_id,
+ Q(rcube_label('mdnrequests')),
+ $select_mdn_requests->show($config['mdn_requests']));
+ }
+
+ $out .= "\n