From d7a411f099596cbc8e749e1f0802ac2bb2c6289e Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Tue, 15 Apr 2008 18:34:52 +0000
Subject: [PATCH] #1484391, #1484403

---
 CHANGELOG                   | 4 +++-
 program/steps/mail/func.inc | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index fdb7685f3..65648e4c0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -6,7 +6,9 @@ CHANGELOG RoundCube Webmail
 - Fix remove signature when replying (#1333167)
 - Fix problem with line with a space at the end (#1484916)
 - Don't send set_env() in ajax response when env array is empty
-
+- Fix <!DOCTYPE> tag filtering (#1484391)
+- Fix <?xml> tag filtering (#1484403)
+ 
 2008/04/14 (alec)
 ----------
 - Added sections (fieldset+label) in Settings interface
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 205db2f91..b75b1150c 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -1139,7 +1139,8 @@ function rcmail_sanitize_html($body, $container_id)
 
   // add comments arround html and other tags
   $out = preg_replace(array(
-      '/(<!DOCTYPE.+)/i',
+      '/(<!DOCTYPE[^>]*>)/i',
+      '/(<\?xml[^>]*>)/i',
       '/(<\/?html[^>]*>)/i',
       '/(<\/?head[^>]*>)/i',
       '/(<title[^>]*>.*<\/title>)/Ui',