diff --git a/CHANGELOG b/CHANGELOG
index e987cbe2d..f4a913254 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG Roundcube Webmail
 ===========================
 
+- Fix handling of deprecated boolean value of reply_mode option (#1489052)
 - Fix parsing invalid date string (#1489035)
 - Add "with attachment" option to messages list filter (#1485382)
 - Call resize handler in intervals to prevent lags and double onresize calls in Chrome (#1489005)
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index b787ca101..81b598377 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -571,7 +571,7 @@ function rcmail_prepare_message_body()
     rcmail_write_forward_attachments();
   }
   // reply/edit/draft/forward
-  else if ($compose_mode && ($compose_mode != RCUBE_COMPOSE_REPLY || $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();
 
     if (!empty($MESSAGE->parts)) {