diff --git a/CHANGELOG b/CHANGELOG
index 84c0726ae..fd969be40 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
 CHANGELOG RoundCube Webmail
 ===========================
 
+- Fix html editor mode setting when reopening draft message (#1485834)
 - Added quick search box menu (#1484304)
 - Fix wrong column sort order icons (#1485823)
 - Updated TinyMCE to 3.2.3 version
diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc
index d122a9232..b31d73775 100644
--- a/program/steps/mail/compose.inc
+++ b/program/steps/mail/compose.inc
@@ -363,7 +363,7 @@ function rcmail_compose_body($attrib)
   }
   else if ($compose_mode)
   {
-    if ($isHtml && $MESSAGE->has_html_part())
+    if (($isHtml || $compose_mode == RCUBE_COMPOSE_DRAFT) && $MESSAGE->has_html_part())
     {
       $body = $MESSAGE->first_html_part();
       $isHtml = true;