From 1414e3b6f855095af46d2a61e7fa8dcd23e728a5 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 20 Jun 2015 14:27:44 +0200
Subject: [PATCH] Small refactoring to make some code testable

---
 program/steps/mail/compose.inc | 358 +++++++++++++++++----------------
 1 file changed, 186 insertions(+), 172 deletions(-)

diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index 752540dbe..6bb8e5b61 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -273,150 +273,10 @@ else if (!empty($COMPOSE['param']['from'])) {
 else if (count($MESSAGE->identities)) {
     $ident = rcmail_identity_select($MESSAGE, $MESSAGE->identities, $compose_mode);
 
-    $MESSAGE->compose['from_email'] = $ident['email'];
-    $MESSAGE->compose['from']       = $ident['identity_id'];
+    $MESSAGE->compose['from']  = $ident['identity_id'];
+    $MESSAGE->compose['ident'] = $ident;
 }
 
-// Set other headers
-$a_recipients = array();
-$parts        = array('to', 'cc', 'bcc', 'replyto', 'followupto');
-$separator    = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
-$from_email   = @mb_strtolower($MESSAGE->compose['from_email']);
-
-foreach ($parts as $header) {
-    $fvalue        = '';
-    $decode_header = true;
-    $charset       = $MESSAGE->headers->charset;
-
-    // we have a set of recipients stored is session
-    if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
-        && $_SESSION['mailto'][$mailto_id]
-    ) {
-        $fvalue        = urldecode($_SESSION['mailto'][$mailto_id]);
-        $decode_header = false;
-        $charset       = $RCMAIL->output->charset;
-
-        // make session to not grow up too much
-        unset($_SESSION['mailto'][$mailto_id]);
-        $COMPOSE['param']['to'] = $fvalue;
-    }
-    else if (!empty($_POST['_'.$header])) {
-        $fvalue  = rcube_utils::get_input_value('_'.$header, rcube_utils::INPUT_POST, TRUE);
-        $charset = $RCMAIL->output->charset;
-    }
-    else if (!empty($COMPOSE['param'][$header])) {
-        $fvalue  = $COMPOSE['param'][$header];
-        $charset = $RCMAIL->output->charset;
-    }
-    else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
-        // get recipent address(es) out of the message headers
-        if ($header == 'to') {
-            $mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
-            $mailreplyto  = $MESSAGE->headers->others['mail-reply-to'];
-
-            // Reply to mailing list...
-            if ($MESSAGE->reply_all == 'list' && $mailfollowup)
-                $fvalue = $mailfollowup;
-            else if ($MESSAGE->reply_all == 'list'
-                && preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m))
-                $fvalue = $m[1];
-            // Reply to...
-            else if ($MESSAGE->reply_all && $mailfollowup)
-                $fvalue = $mailfollowup;
-            else if ($mailreplyto)
-                $fvalue = $mailreplyto;
-            else if (!empty($MESSAGE->headers->replyto)) {
-                $fvalue  = $MESSAGE->headers->replyto;
-                $replyto = true;
-            }
-            else if (!empty($MESSAGE->headers->from))
-                $fvalue = $MESSAGE->headers->from;
-
-            // Reply to message sent by yourself (#1487074, #1489230, #1490439)
-            // Reply-To address need to be unset (#1490233)
-            if (!empty($ident) && empty($replyto)) {
-                foreach (array($fvalue, $MESSAGE->headers->from) as $sender) {
-                    $senders = rcube_mime::decode_address_list($sender, null, false, $charset, true);
-
-                    if (in_array($ident['email_ascii'], $senders)) {
-                        $fvalue = $MESSAGE->headers->to;
-                        break;
-                    }
-                }
-            }
-        }
-        // add recipient of original message if reply to all
-        else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
-            if ($v = $MESSAGE->headers->to)
-                $fvalue .= $v;
-            if ($v = $MESSAGE->headers->cc)
-                $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
-            // Use Sender header (#1489011)
-            if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false)
-                $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
-
-            // When To: and Reply-To: are the same we add From: address to the list (#1489037)
-            if ($v = $MESSAGE->headers->from) {
-                $from    = rcube_mime::decode_address_list($v, null, false, $charset, true);
-                $to      = rcube_mime::decode_address_list($MESSAGE->headers->to, null, false, $charset, true);
-                $replyto = rcube_mime::decode_address_list($MESSAGE->headers->replyto, null, false, $charset, true);
-
-                if (count($replyto) && !count(array_diff($to, $replyto)) && count(array_diff($from, $to))) {
-                    $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
-                }
-            }
-        }
-    }
-    else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
-        // get drafted headers
-        if ($header=='to' && !empty($MESSAGE->headers->to))
-            $fvalue = $MESSAGE->get_header('to', true);
-        else if ($header=='cc' && !empty($MESSAGE->headers->cc))
-            $fvalue = $MESSAGE->get_header('cc', true);
-        else if ($header=='bcc' && !empty($MESSAGE->headers->bcc))
-            $fvalue = $MESSAGE->get_header('bcc', true);
-        else if ($header=='replyto' && !empty($MESSAGE->headers->others['mail-reply-to']))
-            $fvalue = $MESSAGE->get_header('mail-reply-to');
-        else if ($header=='replyto' && !empty($MESSAGE->headers->replyto))
-            $fvalue = $MESSAGE->get_header('reply-to');
-        else if ($header=='followupto' && !empty($MESSAGE->headers->others['mail-followup-to']))
-            $fvalue = $MESSAGE->get_header('mail-followup-to');
-    }
-
-    // split recipients and put them back together in a unique way
-    if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
-        $to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $charset);
-        $fvalue       = array();
-
-        foreach ($to_addresses as $addr_part) {
-            if (empty($addr_part['mailto'])) {
-                continue;
-            }
-
-            // According to RFC5321 local part of email address is case-sensitive
-            // however, here it is better to compare addresses in case-insensitive manner
-            $mailto    = format_email(rcube_utils::idn_to_utf8($addr_part['mailto']));
-            $mailto_lc = mb_strtolower($addr_part['mailto']);
-
-            if (($header == 'to' || $compose_mode != RCUBE_COMPOSE_REPLY || $mailto_lc != $from_email)
-                && !in_array($mailto_lc, $a_recipients)
-            ) {
-                if ($addr_part['name'] && $mailto != $addr_part['name']) {
-                    $mailto = format_email_recipient($mailto, $addr_part['name']);
-                }
-
-                $fvalue[]       = $mailto;
-                $a_recipients[] = $mailto_lc;
-            }
-        }
-
-        $fvalue = implode($separator, $fvalue);
-    }
-
-    $MESSAGE->compose[$header] = $fvalue;
-}
-unset($a_recipients);
-
 // process $MESSAGE body/attachments, set $MESSAGE_BODY/$HTML_MODE vars and some session data
 $MESSAGE_BODY = rcmail_prepare_message_body();
 
@@ -589,7 +449,7 @@ function rcmail_compose_headers($attrib)
 
         // create teaxtarea object
         $input = new $field_type($field_attrib);
-        $out   = $input->show($MESSAGE->compose[$param]);
+        $out   = $input->show(rcmail_compose_header_value($param));
     }
 
     if ($form_start) {
@@ -605,7 +465,7 @@ function rcmail_compose_headers($attrib)
 
 function rcmail_compose_header_from($attrib)
 {
-    global $MESSAGE, $OUTPUT, $RCMAIL, $COMPOSE, $compose_mode;
+    global $MESSAGE, $OUTPUT, $RCMAIL, $COMPOSE;
 
     // pass the following attributes to the form class
     $field_attrib = array('name' => '_from');
@@ -620,7 +480,7 @@ function rcmail_compose_header_from($attrib)
         $identities   = array();
         $top_posting  = intval($RCMAIL->config->get('reply_mode')) > 0
             && !$RCMAIL->config->get('sig_below')
-            && ($compose_mode == RCUBE_COMPOSE_REPLY || $compose_mode == RCUBE_COMPOSE_FORWARD);
+            && ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY || $COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD);
         $separator = $top_posting ? '---' : '-- ';
 
         $field_attrib['onchange'] = rcmail_output::JS_OBJECT_NAME.".change_identity(this)";
@@ -662,7 +522,7 @@ function rcmail_compose_header_from($attrib)
             }
         }
 
-        $out = $select_from->show($MESSAGE->compose['from']);
+        $out = $select_from->show(rcmail_compose_header_value('from'));
 
         // add signatures to client
         $OUTPUT->set_env('signatures', $a_signatures);
@@ -672,23 +532,177 @@ function rcmail_compose_header_from($attrib)
     else {
         $field_attrib['class'] = 'from_address';
         $input_from = new html_inputfield($field_attrib);
-        $out = $input_from->show($MESSAGE->compose['from']);
+        $out = $input_from->show(rcmail_compose_header_value('from'));
     }
 
     return $out;
 }
 
+function rcmail_compose_header_value($header)
+{
+    global $COMPOSE, $MESSAGE;
+
+    $RCMAIL        = rcube::get_instance();
+    $fvalue        = '';
+    $decode_header = true;
+    $charset       = $MESSAGE->headers->charset;
+    $separator     = trim($RCMAIL->config->get('recipients_separator', ',')) . ' ';
+
+    // we have a set of recipients stored is session
+    if ($header == 'to' && ($mailto_id = $COMPOSE['param']['mailto'])
+        && $_SESSION['mailto'][$mailto_id]
+    ) {
+        $fvalue        = urldecode($_SESSION['mailto'][$mailto_id]);
+        $decode_header = false;
+        $charset       = $RCMAIL->output->charset;
+
+        // make session to not grow up too much
+        unset($_SESSION['mailto'][$mailto_id]);
+        $COMPOSE['param']['to'] = $fvalue;
+    }
+    else if (!empty($_POST['_' . $header])) {
+        $fvalue  = rcube_utils::get_input_value('_' . $header, rcube_utils::INPUT_POST, true);
+        $charset = $RCMAIL->output->charset;
+    }
+    else if (!empty($COMPOSE['param'][$header])) {
+        $fvalue  = $COMPOSE['param'][$header];
+        $charset = $RCMAIL->output->charset;
+    }
+    else if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY) {
+        // get recipent address(es) out of the message headers
+        if ($header == 'to') {
+            $mailfollowup = $MESSAGE->headers->others['mail-followup-to'];
+            $mailreplyto  = $MESSAGE->headers->others['mail-reply-to'];
+
+            // Reply to mailing list...
+            if ($MESSAGE->reply_all == 'list' && $mailfollowup) {
+                $fvalue = $mailfollowup;
+            }
+            else if ($MESSAGE->reply_all == 'list'
+                && preg_match('/<mailto:([^>]+)>/i', $MESSAGE->headers->others['list-post'], $m)
+            ) {
+                $fvalue = $m[1];
+            }
+            // Reply to...
+            else if ($MESSAGE->reply_all && $mailfollowup) {
+                $fvalue = $mailfollowup;
+            }
+            else if ($mailreplyto) {
+                $fvalue = $mailreplyto;
+            }
+            else if (!empty($MESSAGE->headers->replyto)) {
+                $fvalue  = $MESSAGE->headers->replyto;
+                $replyto = true;
+            }
+            else if (!empty($MESSAGE->headers->from)) {
+                $fvalue = $MESSAGE->headers->from;
+            }
+
+            // Reply to message sent by yourself (#1487074, #1489230, #1490439)
+            // Reply-To address need to be unset (#1490233)
+            if (!empty($MESSAGE->compose['ident']) && empty($replyto)) {
+                foreach (array($fvalue, $MESSAGE->headers->from) as $sender) {
+                    $senders = rcube_mime::decode_address_list($sender, null, false, $charset, true);
+
+                    if (in_array($MESSAGE->compose['ident']['email_ascii'], $senders)) {
+                        $fvalue = $MESSAGE->headers->to;
+                        break;
+                    }
+                }
+            }
+        }
+        // add recipient of original message if reply to all
+        else if ($header == 'cc' && !empty($MESSAGE->reply_all) && $MESSAGE->reply_all != 'list') {
+            if ($v = $MESSAGE->headers->to) {
+                $fvalue .= $v;
+            }
+            if ($v = $MESSAGE->headers->cc) {
+                $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+            }
+            // Use Sender header (#1489011)
+            if (($v = $MESSAGE->headers->get('Sender', false)) && strpos($v, '-bounces@') === false) {
+                $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+            }
+
+            // When To: and Reply-To: are the same we add From: address to the list (#1489037)
+            if ($v = $MESSAGE->headers->from) {
+                $from    = rcube_mime::decode_address_list($v, null, false, $charset, true);
+                $to      = rcube_mime::decode_address_list($MESSAGE->headers->to, null, false, $charset, true);
+                $replyto = rcube_mime::decode_address_list($MESSAGE->headers->replyto, null, false, $charset, true);
+
+                if (count($replyto) && !count(array_diff($to, $replyto)) && count(array_diff($from, $to))) {
+                    $fvalue .= (!empty($fvalue) ? $separator : '') . $v;
+                }
+            }
+        }
+    }
+    else if (in_array($COMPOSE['mode'], array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT))) {
+        // get drafted headers
+        if ($header == 'to' && !empty($MESSAGE->headers->to)) {
+            $fvalue = $MESSAGE->get_header('to', true);
+        }
+        else if ($header == 'cc' && !empty($MESSAGE->headers->cc)) {
+            $fvalue = $MESSAGE->get_header('cc', true);
+        }
+        else if ($header == 'bcc' && !empty($MESSAGE->headers->bcc)) {
+            $fvalue = $MESSAGE->get_header('bcc', true);
+        }
+        else if ($header == 'replyto' && !empty($MESSAGE->headers->others['mail-reply-to'])) {
+            $fvalue = $MESSAGE->get_header('mail-reply-to');
+        }
+        else if ($header == 'replyto' && !empty($MESSAGE->headers->replyto)) {
+            $fvalue = $MESSAGE->get_header('reply-to');
+        }
+        else if ($header == 'followupto' && !empty($MESSAGE->headers->others['mail-followup-to'])) {
+            $fvalue = $MESSAGE->get_header('mail-followup-to');
+        }
+    }
+
+    // split recipients and put them back together in a unique way
+    if (!empty($fvalue) && in_array($header, array('to', 'cc', 'bcc'))) {
+        $from_email   = @mb_strtolower($MESSAGE->compose['ident']['email']);
+        $to_addresses = rcube_mime::decode_address_list($fvalue, null, $decode_header, $charset);
+        $fvalue       = array();
+
+        foreach ($to_addresses as $addr_part) {
+            if (empty($addr_part['mailto'])) {
+                continue;
+            }
+
+            // According to RFC5321 local part of email address is case-sensitive
+            // however, here it is better to compare addresses in case-insensitive manner
+            $mailto    = format_email(rcube_utils::idn_to_utf8($addr_part['mailto']));
+            $mailto_lc = mb_strtolower($addr_part['mailto']);
+
+            if (($header == 'to' || $COMPOSE['mode'] != RCUBE_COMPOSE_REPLY || $mailto_lc != $from_email)
+                && !in_array($mailto_lc, (array) $MESSAGE->recipients)
+            ) {
+                if ($addr_part['name'] && $mailto != $addr_part['name']) {
+                    $mailto = format_email_recipient($mailto, $addr_part['name']);
+                }
+
+                $fvalue[]              = $mailto;
+                $MESSAGE->recipients[] = $mailto_lc;
+            }
+        }
+
+        $fvalue = implode($separator, $fvalue);
+    }
+
+    return $fvalue;
+}
 
 function rcmail_compose_editor_mode()
 {
-    global $RCMAIL, $compose_mode;
+    global $RCMAIL;
     static $useHtml;
 
     if ($useHtml !== null) {
         return $useHtml;
     }
 
-    $html_editor = intval($RCMAIL->config->get('htmleditor'));
+    $html_editor  = intval($RCMAIL->config->get('htmleditor'));
+    $compose_mode = $COMPOSE['mode'];
 
     if (isset($_POST['_is_html'])) {
         $useHtml = !empty($_POST['_is_html']);
@@ -718,7 +732,7 @@ function rcmail_message_is_html()
 
 function rcmail_prepare_message_body()
 {
-    global $RCMAIL, $MESSAGE, $COMPOSE, $compose_mode, $HTML_MODE;
+    global $RCMAIL, $MESSAGE, $COMPOSE, $HTML_MODE;
 
     // use posted message body
     if (!empty($_POST['_message'])) {
@@ -730,20 +744,20 @@ function rcmail_prepare_message_body()
         $isHtml = (bool) $COMPOSE['param']['html'];
     }
     // forward as attachment
-    else if ($compose_mode == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
+    else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD && $COMPOSE['as_attachment']) {
         $isHtml = rcmail_compose_editor_mode();
         $body   = '';
 
         rcmail_write_forward_attachments();
     }
     // reply/edit/draft/forward
-    else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || intval($RCMAIL->config->get('reply_mode')) != -1)) {
+    else if ($COMPOSE['mode'] && ($COMPOSE['mode'] != RCUBE_COMPOSE_REPLY || intval($RCMAIL->config->get('reply_mode')) != -1)) {
         $isHtml   = rcmail_compose_editor_mode();
         $messages = array();
 
         if (!empty($MESSAGE->parts)) {
             // collect IDs of message/rfc822 parts
-            if ($compose_mode == RCUBE_COMPOSE_EDIT || $compose_mode == RCUBE_COMPOSE_DRAFT) {
+            if ($COMPOSE['mode'] == RCUBE_COMPOSE_EDIT || $COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT) {
                 foreach ($MESSAGE->attachments as $part) {
                     if ($part->mimetype == 'message/rfc822') {
                         $messages[] = $part->mime_id;
@@ -774,13 +788,13 @@ function rcmail_prepare_message_body()
         }
 
         // compose reply-body
-        if ($compose_mode == RCUBE_COMPOSE_REPLY)
+        if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY)
             $body = rcmail_create_reply_body($body, $isHtml);
         // forward message body inline
-        else if ($compose_mode == RCUBE_COMPOSE_FORWARD)
+        else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD)
             $body = rcmail_create_forward_body($body, $isHtml);
         // load draft message body
-        else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT)
+        else if ($COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT || $COMPOSE['mode'] == RCUBE_COMPOSE_EDIT)
             $body = rcmail_create_draft_body($body, $isHtml);
     }
     else { // new message
@@ -788,7 +802,7 @@ function rcmail_prepare_message_body()
     }
 
     $plugin = $RCMAIL->plugins->exec_hook('message_compose_body',
-        array('body' => $body, 'html' => $isHtml, 'mode' => $compose_mode));
+        array('body' => $body, 'html' => $isHtml, 'mode' => $COMPOSE['mode']));
 
     $body = $plugin['body'];
     unset($plugin);
@@ -811,7 +825,7 @@ function rcmail_prepare_message_body()
 
 function rcmail_compose_part_body($part, $isHtml = false)
 {
-    global $RCMAIL, $MESSAGE, $LINE_LENGTH, $compose_mode;
+    global $RCMAIL, $MESSAGE, $LINE_LENGTH;
 
     // Check if we have enough memory to handle the message in it
     // #1487424: we need up to 10x more memory than the body
@@ -835,7 +849,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
         }
         else {
             // try to remove the signature
-            if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
+            if ($COMPOSE['mode'] != RCUBE_COMPOSE_DRAFT && $COMPOSE['mode'] != RCUBE_COMPOSE_EDIT) {
                 if ($RCMAIL->config->get('strip_existing_sig', true)) {
                     $body = rcmail_remove_signature($body);
                 }
@@ -854,7 +868,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
         if ($part->ctype_secondary == 'html') {
             // use html part if it has been used for message (pre)viewing
             // decrease line length for quoting
-            $len = $compose_mode == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
+            $len = $COMPOSE['mode'] == RCUBE_COMPOSE_REPLY ? $LINE_LENGTH-2 : $LINE_LENGTH;
             $txt = new rcube_html2text($body, false, true, $len);
             $body = $txt->get_text();
         }
@@ -864,7 +878,7 @@ function rcmail_compose_part_body($part, $isHtml = false)
             }
 
             // try to remove the signature
-            if ($compose_mode != RCUBE_COMPOSE_DRAFT && $compose_mode != RCUBE_COMPOSE_EDIT) {
+            if ($COMPOSE['mode'] != RCUBE_COMPOSE_DRAFT && $COMPOSE['mode'] != RCUBE_COMPOSE_EDIT) {
                 if ($RCMAIL->config->get('strip_existing_sig', true)) {
                     $body = rcmail_remove_signature($body);
                 }
@@ -1163,7 +1177,7 @@ function rcmail_remove_signature($body)
 
 function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
 {
-    global $RCMAIL, $COMPOSE, $compose_mode;
+    global $RCMAIL, $COMPOSE;
 
     $loaded_attachments = array();
     foreach ((array)$COMPOSE['attachments'] as $attachment) {
@@ -1181,12 +1195,12 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
             }
 
             // skip message attachments in reply mode
-            if ($part->ctype_primary == 'message' && $compose_mode == RCUBE_COMPOSE_REPLY) {
+            if ($part->ctype_primary == 'message' && $COMPOSE['mode'] == RCUBE_COMPOSE_REPLY) {
                 continue;
             }
 
             // skip inline images when forwarding in text mode
-            if ($part->content_id && $part->disposition == 'inline' && !$bodyIsHtml && $compose_mode == RCUBE_COMPOSE_FORWARD) {
+            if ($part->content_id && $part->disposition == 'inline' && !$bodyIsHtml && $COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
                 continue;
             }
 
@@ -1196,12 +1210,12 @@ function rcmail_write_compose_attachments(&$message, $bodyIsHtml)
             // skipped e.g. images used in HTML body or other attachments. So,
             // better to skip .eml attachments but not their content (included files).
             if ($part->mimetype == 'message/rfc822') {
-                if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
+                if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
                     continue;
                 }
                 $messages[] = $part->mime_id;
             }
-            else if ($compose_mode != RCUBE_COMPOSE_FORWARD) {
+            else if ($COMPOSE['mode'] != RCUBE_COMPOSE_FORWARD) {
                 // skip attachments included in message/rfc822 attachment (#1486487)
                 foreach ($messages as $mimeid) {
                     if (strpos($part->mime_id, $mimeid . '.') === 0) {
@@ -1466,7 +1480,7 @@ function rcmail_basename($filename)
 
 function rcmail_compose_subject($attrib)
 {
-    global $MESSAGE, $COMPOSE, $compose_mode;
+    global $MESSAGE, $COMPOSE;
 
     list($form_start, $form_end) = get_form_tags($attrib);
     unset($attrib['form']);
@@ -1485,7 +1499,7 @@ function rcmail_compose_subject($attrib)
         $subject = $COMPOSE['param']['subject'];
     }
     // create a reply-subject
-    else if ($compose_mode == RCUBE_COMPOSE_REPLY) {
+    else if ($COMPOSE['mode'] == RCUBE_COMPOSE_REPLY) {
         if (preg_match('/^re:/i', $MESSAGE->subject))
             $subject = $MESSAGE->subject;
         else
@@ -1495,14 +1509,14 @@ function rcmail_compose_subject($attrib)
         $subject = preg_replace('/\s*\([wW]as:[^\)]+\)\s*$/', '', $subject);
     }
     // create a forward-subject
-    else if ($compose_mode == RCUBE_COMPOSE_FORWARD) {
+    else if ($COMPOSE['mode'] == RCUBE_COMPOSE_FORWARD) {
         if (preg_match('/^fwd:/i', $MESSAGE->subject))
             $subject = $MESSAGE->subject;
         else
             $subject = 'Fwd: '.$MESSAGE->subject;
     }
     // creeate a draft-subject
-    else if ($compose_mode == RCUBE_COMPOSE_DRAFT || $compose_mode == RCUBE_COMPOSE_EDIT) {
+    else if ($COMPOSE['mode'] == RCUBE_COMPOSE_DRAFT || $COMPOSE['mode'] == RCUBE_COMPOSE_EDIT) {
         $subject = $MESSAGE->subject;
     }
 
@@ -1672,7 +1686,7 @@ function rcmail_priority_selector($attrib)
 
 function rcmail_mdn_checkbox($attrib)
 {
-    global $RCMAIL, $MESSAGE, $compose_mode;
+    global $RCMAIL, $MESSAGE;
 
     list($form_start, $form_end) = get_form_tags($attrib);
     unset($attrib['form']);
@@ -1687,7 +1701,7 @@ function rcmail_mdn_checkbox($attrib)
 
     if (isset($_POST['_mdn']))
         $mdn_default = $_POST['_mdn'];
-    else if (in_array($compose_mode, array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
+    else if (in_array($COMPOSE['mode'], array(RCUBE_COMPOSE_DRAFT, RCUBE_COMPOSE_EDIT)))
         $mdn_default = (bool) $MESSAGE->headers->mdn_to;
     else
         $mdn_default = $RCMAIL->config->get('mdn_default');