Merge branch 'master' of github.com:roundcube/roundcubemail

Thomas Bruederli

2012-09-09 99d9f50a0000447d0a752e6c43716237dc0da176

 program/lib/html2text.php

@@ -515,7 +515,7 @@
        $text = preg_replace($this->ent_search, $this->ent_replace, $text);

        // Replace known html entities
        $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
        $text = html_entity_decode($text, ENT_QUOTES, 'UTF-8');

        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
        $text = preg_replace('/&([a-zA-Z0-9]{2,6}|#[0-9]{2,4});/', '', $text);