Fixed minor bugs

git-svn-id: https://svn.roundcube.net/trunk@85 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 9 insertions, 3 deletions

diff --git a/roundcubemail/program/include/rcube_imap.inc b/roundcubemail/program/include/rcube_imap.inc
index 44ef24830..2237b38f3 100644
--- a/roundcubemail/program/include/rcube_imap.inc
+++ b/roundcubemail/program/include/rcube_imap.inc
@@ -988,6 +988,12 @@ class rcube_imap
 
   function decode_header($input)
     {
+    return $this->decode_mime_string($input);
+    }
+    
+    
+  function decode_mime_string($input)
+    {
     $out = '';
 
     $pos = strpos($input, '=?');
@@ -1002,8 +1008,8 @@ class rcube_imap
       $encstr = substr($input, $pos+2, ($end_pos-$pos-2));
       $rest = substr($input, $end_pos+2);
 
-      $out .= $this->decode_mime_string($encstr);
-      $out .= $this->decode_header($rest);
+      $out .= rcube_imap::_decode_mime_string_part($encstr);
+      $out .= rcube_imap::decode_mime_string($rest);
 
       return $out;
       }
@@ -1012,7 +1018,7 @@ class rcube_imap
     }
 
 
-  function decode_mime_string($str)
+  function _decode_mime_string_part($str)
     {
     $a = explode('?', $str);
     $count = count($a);