diff --git a/CHANGELOG b/CHANGELOG
index c3aec3872..d17f1280c 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -19,6 +19,7 @@ CHANGELOG Roundcube Webmail
 - Fix so use of Ctrl+A does not scroll the list (#7020)
 - Fix/remove useless keyup event handler on username input in logon form (#6970)
 - Fix bug where cancelling switching from HTML to plain text didn't set the flag properly (#7077)
+- Fix bug where HTML reply could add an empty line with extra indentation above the original message (#7088)
 
 RELEASE 1.4.1
 -------------
diff --git a/program/js/editor.js b/program/js/editor.js
index d70833fd9..947210c26 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -48,7 +48,7 @@ function rcube_text_editor(config, id)
       toolbar_items_size: 'small',
       extended_valid_elements: 'font[face|size|color|style],span[id|class|align|style]',
       fontsize_formats: '8pt 9pt 10pt 11pt 12pt 14pt 18pt 24pt 36pt',
-      valid_children: '+body[style]',
+      valid_children: '+body[style],+blockquote[style]',
       relative_urls: false,
       remove_script_host: false,
       convert_urls: false, // #1486944