diff --git a/manager/application/views/scripts/mail/full.phtml b/manager/application/views/scripts/mail/full.phtml
index 01d8ff2..892215f 100644
--- a/manager/application/views/scripts/mail/full.phtml
+++ b/manager/application/views/scripts/mail/full.phtml
@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-        print "        <td>" . htmlspecialchars(quoted_printable_decode($header->subject), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";
diff --git a/manager/application/views/scripts/mail/index.phtml b/manager/application/views/scripts/mail/index.phtml
index 9e625e7..a37f092 100644
--- a/manager/application/views/scripts/mail/index.phtml
+++ b/manager/application/views/scripts/mail/index.phtml
@@ -26,7 +26,7 @@ else {
         print "    <tr>\n";
         print "        <td><a href=\"" . $header->detailslink . "\">" . $header->fromaddress . "</a></td>";
         print "        <td>" . $header->toaddress . "</td>";
-        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
+        print "        <td>" . htmlspecialchars(iconv_mime_decode($header->subject, ICONV_MIME_DECODE_CONTINUE_ON_ERROR, 'UTF-8'), ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8') . "</td>";
         print "        <td>" . $header->date . "</td>";
         print "        <td>" . $header->Size . "</td>";
         print "        <td><a class=\"delete\" href=\"" . $header->deletelink . "\"><img src=\"/img/delete_icon.jpg\"></a></td>";