From db1a87cd6c506f2afbd1a37c64cb56ae11120b49 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Fri, 17 Dec 2010 15:07:04 +0000
Subject: Update branch for 0.5-rc release

---
 program/steps/utils/html2text.inc | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'program/steps/utils/html2text.inc')

diff --git a/program/steps/utils/html2text.inc b/program/steps/utils/html2text.inc
index ef74ec49e..15c6a52a4 100644
--- a/program/steps/utils/html2text.inc
+++ b/program/steps/utils/html2text.inc
@@ -19,7 +19,12 @@
 
 */
 
-$converter = new html2text($HTTP_RAW_POST_DATA);
+$html = $HTTP_RAW_POST_DATA;
+
+// Replace emoticon images with its text representation
+$html = rcmail_replace_emoticons($html);
+
+$converter = new html2text($html);
 
 header('Content-Type: text/plain; charset=UTF-8');
 print rtrim($converter->get_text());
-- 
cgit v1.2.3