From 10141cd6fd94105c757a0b91f11897cc5ae2c808 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Mon, 3 Sep 2012 19:00:34 +0200
Subject: Fix displaying all headers when they contain malformed characters
 (#1488666)

---
 program/steps/mail/headers.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'program/steps/mail/headers.inc')

diff --git a/program/steps/mail/headers.inc b/program/steps/mail/headers.inc
index 4d6627393..cad113f68 100644
--- a/program/steps/mail/headers.inc
+++ b/program/steps/mail/headers.inc
@@ -24,7 +24,8 @@ if ($uid = get_input_value('_uid', RCUBE_INPUT_POST))
     $source = $RCMAIL->storage->get_raw_headers($uid);
 
     if ($source !== false) {
-        $source = htmlspecialchars(trim($source));
+        $source = trim(rcube_charset::clean($source));
+        $source = htmlspecialchars($source);
         $source = preg_replace(
             array(
                 '/\n[\t\s]+/',
-- 
cgit v1.2.3