Dont utf7_decode translated INBOX name, which is html encoded

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@6672 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/display_messages.php b/functions/display_messages.php
index 8b062421e9b9d80c945d0fb68a83b9a383ab43d5..6a279599ed2ba2afa9a9c8284a1565fdf8944e92 100644 (file)
--- a/functions/display_messages.php
+++ b/functions/display_messages.php
@@ -37,14 +37,12 @@ function sqm_baseuri(){
 
 function error_message($message, $mailbox, $sort, $startMessage, $color) {
     $urlMailbox = urlencode($mailbox);
-    if (strtoupper($mailbox) == 'INBOX')
-                   $mailbox = _("INBOX");
     $string = '<tr><td ALIGN="center">' . $message . '</td></tr>'."\n".
                '<tr><td ALIGN="center">'.
                   '<A HREF="' . sqm_baseuri() 
                   . "src/right_main.php?sort=$sort&amp;startMessage=$startMessage"
                   . "&amp;mailbox=$urlMailbox\">" .
-    sprintf (_("Click here to return to %s"), imap_utf7_decode_local($mailbox)) .
+    sprintf (_("Click here to return to %s"), strtoupper($mailbox) == 'INBOX' ? _("INBOX") : imap_utf7_decode_local($mailbox)) .
            '</A></td></tr>';
     error_box($string, $color);
 }