From 2ae678dc87ed141cc3487378703d7482edfe4303 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Thu, 20 Nov 2008 10:29:34 +0000
Subject: - Better HTML entities conversion in html2text (#1485519)

git-svn-id: https://svn.roundcube.net/trunk@2070 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/steps/mail/compose.inc  | 3 +--
 roundcubemail/program/steps/mail/sendmail.inc | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/steps')

diff --git a/roundcubemail/program/steps/mail/compose.inc b/roundcubemail/program/steps/mail/compose.inc
index d1d913b68..d4348f287 100644
--- a/roundcubemail/program/steps/mail/compose.inc
+++ b/roundcubemail/program/steps/mail/compose.inc
@@ -323,8 +323,7 @@ function rcmail_compose_header_from($attrib)
         if ($a_signatures[$identity_id]['is_html'])
         {
             $h2t = new html2text($a_signatures[$identity_id]['text'], false, false);
-            $plainTextPart = $h2t->get_text();
-            $a_signatures[$identity_id]['plain_text'] = trim(html_entity_decode($plainTextPart, ENT_NOQUOTES, 'UTF-8'));
+            $a_signatures[$identity_id]['plain_text'] = trim($h2t->get_text());
         }
       }
 
diff --git a/roundcubemail/program/steps/mail/sendmail.inc b/roundcubemail/program/steps/mail/sendmail.inc
index 784d46a8f..7ee6dd4cc 100644
--- a/roundcubemail/program/steps/mail/sendmail.inc
+++ b/roundcubemail/program/steps/mail/sendmail.inc
@@ -265,7 +265,7 @@ if ($isHtml)
     // empty message body breaks attachment handling in drafts 
     $plainTextPart = "\r\n"; 
     }
-  $MAIL_MIME->setTXTBody(html_entity_decode($plainTextPart, ENT_COMPAT, 'utf-8'));
+  $MAIL_MIME->setTXTBody($plainTextPart);
 
   // look for "emoticon" images from TinyMCE and copy into message as attachments
   rcmail_attach_emoticons($MAIL_MIME);
-- 
cgit v1.2.3