githubFork/roundcubemail.git

			@@ -391,10 +391,6 @@
			if (!empty($mailbcc)) {
			$headers['Bcc'] = $mailbcc;
			}
			if (!empty($identity_arr['bcc']) && stripos($headers['Bcc'], $identity_arr['bcc']) === false) {
			$headers['Bcc'] = ($headers['Bcc'] ? $headers['Bcc'].', ' : '') . $identity_arr['bcc'];
			$RECIPIENT_COUNT ++;
			}

			if (($max_recipients = (int) $RCMAIL->config->get('max_recipients')) > 0) {
			if ($RECIPIENT_COUNT > $max_recipients) {
			@@ -412,17 +408,11 @@
			if (!empty($_POST['_replyto'])) {
			$headers['Reply-To'] = rcmail_email_input_format(get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
			}
			else if (!empty($identity_arr['reply-to'])) {
			$headers['Reply-To'] = rcmail_email_input_format($identity_arr['reply-to'], false, true);
			}
			if (!empty($headers['Reply-To'])) {
			$headers['Mail-Reply-To'] = $headers['Reply-To'];
			}
			if (!empty($_POST['_followupto'])) {
			$headers['Mail-Followup-To'] = rcmail_email_input_format(get_input_value('_followupto', RCUBE_INPUT_POST, TRUE, $message_charset));
			}
			if (!empty($COMPOSE['reply_msgid'])) {
			$headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
			}

			// remember reply/forward UIDs in special headers
			@@ -433,6 +423,9 @@
			$headers['X-Draft-Info'] = array('type' => 'forward', 'uid' => $COMPOSE['forward_uid']);
			}

			if (!empty($COMPOSE['reply_msgid'])) {
			$headers['In-Reply-To'] = $COMPOSE['reply_msgid'];
			}
			if (!empty($COMPOSE['references'])) {
			$headers['References'] = $COMPOSE['references'];
			}
			@@ -462,6 +455,7 @@
			}

			// exec hook for header checking and manipulation
			// Depracated: use message_before_send hook instead
			$data = $RCMAIL->plugins->exec_hook('message_outgoing_headers', array('headers' => $headers));

			// sending aborted by plugin
			@@ -479,12 +473,19 @@
			$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);

			if ($isHtml) {
			$font = rcube_fontdefs($RCMAIL->config->get('default_font', 'Verdana'));
			$bstyle = $font && is_string($font) ? " style='font-family: $font'" : '';
			$bstyle = array();

			if ($font_size = $RCMAIL->config->get('default_font_size')) {
			$bstyle[] = 'font-size: ' . $font_size;
			}
			if ($font_family = $RCMAIL->config->get('default_font')) {
			$bstyle[] = 'font-family: ' . rcmail::font_defs($font_family);
			}

			// append doctype and html/body wrappers
			$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">' .
			"\r\n<html><body$bstyle>\r\n" . $message_body;
			$message_body = '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN">'
			. "\r\n<html><body" . (!empty($bstyle) ? " style='" . implode($bstyle, '; ') . "'" : '') . ">\r\n"
			. $message_body;
			}

			if (!$savedraft) {
			@@ -758,7 +759,7 @@

			if (PEAR::isError($msg))
			raise_error(array('code' => 650, 'type' => 'php',
			'file' => __FILE__, 'line' => __LINE__,
			'file' => __FILE__, 'line' => __LINE__,
			'message' => "Could not create message: ".$msg->getMessage()),
			TRUE, FALSE);
			else {
			@@ -829,15 +830,24 @@

			// start the auto-save timer again
			$OUTPUT->command('auto_save_start');

			$OUTPUT->send('iframe');
			}
			else {
			$folders = array();

			if ($COMPOSE['mode'] == 'reply' \|\| $COMPOSE['mode'] == 'forward')
			$folders[] = $COMPOSE['mailbox'];

			rcmail_compose_cleanup($COMPOSE_ID);

			if ($store_folder && !$saved)
			$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'));
			else
			$OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'), $store_target);
			$OUTPUT->send('iframe');
			$OUTPUT->command('sent_successfully', 'error', rcube_label('errorsavingsent'), $folders);
			else {
			if ($store_folder) {
			$folders[] = $store_target;
			}

			$OUTPUT->command('sent_successfully', 'confirmation', rcube_label('messagesent'), $folders);
			}
			}

			$OUTPUT->send('iframe');