summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc2
-rw-r--r--program/steps/mail/show.inc7
2 files changed, 6 insertions, 3 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 02419bea8..6ba3d1664 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1069,7 +1069,7 @@ function rcmail_send_mdn($uid)
$message = new rcube_message($uid);
- if ($message->headers->mdn_to && !$message->headers->mdn_sent)
+ if ($message->headers->mdn_to && !$message->headers->mdn_sent && $IMAP->check_permflag('MDNSENT'))
{
$identity = $RCMAIL->user->get_identity();
$sender = format_email_recipient($identity['email'], $identity['name']);
diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc
index bff4e6861..ef88c7baf 100644
--- a/program/steps/mail/show.inc
+++ b/program/steps/mail/show.inc
@@ -82,8 +82,11 @@ if ($_GET['_uid']) {
$OUTPUT->set_env('sender', $MESSAGE->sender['string']);
// check for unset disposition notification
- if ($MESSAGE->headers->mdn_to && !$MESSAGE->headers->mdn_sent &&
- $mbox_name != $CONFIG['drafts_mbox'] && $mbox_name != $CONFIG['sent_mbox'])
+ if ($MESSAGE->headers->mdn_to &&
+ !$MESSAGE->headers->mdn_sent &&
+ $IMAP->check_permflag('MDNSENT') &&
+ $mbox_name != $CONFIG['drafts_mbox'] &&
+ $mbox_name != $CONFIG['sent_mbox'])
{
if (intval($CONFIG['mdn_requests']) === 1)
{