summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-06-20 12:05:42 +0000
committerthomascube <thomas@roundcube.net>2008-06-20 12:05:42 +0000
commit4dae735feb47918008e289f19d7d5d17462a0682 (patch)
treeabf777f2cff253f5d31f771e0288955ace19dfa0 /program/steps/mail
parentfde466c58c004e8f7eff7b59c78f62eef250cde9 (diff)
Flag original message as Forwarded when sending mail
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/compose.inc4
-rw-r--r--program/steps/mail/sendmail.inc6
2 files changed, 4 insertions, 6 deletions
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 800a9de85..5d23c1533 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -105,10 +105,6 @@ if (!empty($msg_uid))
{
$_SESSION['compose']['forward_uid'] = $msg_uid;
}
- else if ($compose_mode == RCUBE_COMPOSE_DRAFT)
- {
- $_SESSION['compose']['draft_uid'] = $msg_uid;
- }
}
/****** compose mode functions ********/
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 44f2bdf6c..babde48b9 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -348,11 +348,13 @@ if (!$savedraft)
return;
}
- // set repliead flag
+ // set replied/forwarded flag
if ($_SESSION['compose']['reply_uid'])
$IMAP->set_flag($_SESSION['compose']['reply_uid'], 'ANSWERED');
+ else if ($_SESSION['compose']['forward_uid'])
+ $IMAP->set_flag($_SESSION['compose']['forward_uid'], 'FORWARDED');
- } // End of SMTP Delivery Block
+} // End of SMTP Delivery Block