1 files changed, 30 insertions, 14 deletions
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 1a92844c0..ccb8978be 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -414,9 +414,6 @@ if (!empty($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
 if (!empty($COMPOSE['reply_uid']) && $savedraft) {
@@ -426,6 +423,9 @@ else if (!empty($COMPOSE['forward_uid']) && $savedraft) {
   $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,12 +473,19 @@ $isHtml = (bool) get_input_value('_is_html', RCUBE_INPUT_POST);
 $message_body = get_input_value('_message', RCUBE_INPUT_POST, TRUE, $message_charset);
 
 if ($isHtml) {
-  $font   = rcube_fontdefs($RCMAIL->config->get('default_font'));
-  $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) {
@@ -752,7 +759,7 @@ if ($store_target) {
 
     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 {
@@ -823,15 +830,24 @@ if ($savedraft) {
 
   // 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');