githubFork/roundcubemail.git

			@@ -414,9 +414,6 @@
			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
			if (!empty($COMPOSE['reply_uid']) && $savedraft) {
			@@ -426,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'];
			}
			@@ -473,13 +473,19 @@
			$message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);

			if ($isHtml) {
			$font_family = rcube_fontdefs($RCMAIL->config->get('default_font', 'Arial'));
			$font_size = $RCMAIL->config->get('default_font_size');
			$bstyle = ' style="font:' . $font_size . ' ' . $font_family . ';"';
			$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) {
			@@ -753,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 {