From 2428be488e104b614de3b5ff9b7ec7e7b8bd11fb Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sun, 18 Mar 2018 11:09:46 +0100
Subject: [PATCH] Allow style tags in HTML editor on composed/reply messages
 (#5751)

---
 CHANGELOG            | 1 +
 program/js/editor.js | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 52ed11c43..a371da1df 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -65,6 +65,7 @@ CHANGELOG Roundcube Webmail
 - Localized timezone selector (#4983)
 - Use 7bit encoding for ISO-2022-* charsets in sent mail (#5640)
 - Handle inline images also inside multipart/mixed messages (#5905)
+- Allow style tags in HTML editor on composed/reply messages (#5751)
 - Fix bug where attachment size wasn't visible when the filename was too long (#6033)
 - Fix checking table columns when there's more schemas/databases in postgres/mysql (#6047)
 - Fix css conflicts in user interface and e-mail content (#5891)
diff --git a/program/js/editor.js b/program/js/editor.js
index 6a2808fd5..1144347bf 100644
--- a/program/js/editor.js
+++ b/program/js/editor.js
@@ -48,6 +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]',
       relative_urls: false,
       remove_script_host: false,
       convert_urls: false, // #1486944