3 files changed, 11 insertions, 1 deletions
diff --git a/program/localization/de_CH/labels.inc b/program/localization/de_CH/labels.inc
index d5e088eda..f30097846 100644
--- a/program/localization/de_CH/labels.inc
+++ b/program/localization/de_CH/labels.inc
@@ -157,6 +157,10 @@ $labels['showimages'] = 'Bilder anzeigen';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Klartext';
 
+$labels['addcc'] = 'Cc hinzufügen';
+$labels['addbcc'] = 'Bcc hinzufügen';
+$labels['addreplyto'] = 'Antwortadresse hinzufügen';
+
 
 // address book // Adressbuch
 $labels['name']      = 'Anzeigename';
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index c4b71416c..4c5e80a97 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -156,6 +156,10 @@ $labels['showimages'] = 'Display images';
 $labels['htmltoggle'] = 'HTML';
 $labels['plaintoggle'] = 'Plain text';
 
+$labels['addcc'] = 'Add Cc';
+$labels['addbcc'] = 'Add Bcc';
+$labels['addreplyto'] = 'Add Reply-To';
+
 
 // address boook
 $labels['name']      = 'Display name';
diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc
index 7a87d2e91..f1fd090d9 100644
--- a/program/steps/mail/sendmail.inc
+++ b/program/steps/mail/sendmail.inc
@@ -186,7 +186,9 @@ $headers['Subject'] = trim(get_input_value('_subject', RCUBE_INPUT_POST, FALSE,
 if (!empty($identity_arr['organization']))
   $headers['Organization'] = $identity_arr['organization'];
 
-if (!empty($identity_arr['reply-to']))
+if (!empty($_POST['_replyto']))
+  $headers['Reply-To'] = preg_replace($mailto_regexp, $mailto_replace, get_input_value('_replyto', RCUBE_INPUT_POST, TRUE, $message_charset));
+else if (!empty($identity_arr['reply-to']))
   $headers['Reply-To'] = $identity_arr['reply-to'];
 
 if (!empty($_SESSION['compose']['reply_msgid']))