if NIL is description, doesn't display it

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

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index f8aa4db0bd366a053263ad9f6369c922c92564b0..f6959b5414837d6dcf78335e6a001b81958e66e2 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -54,7 +54,7 @@
       if ($msg["FLAG_ANSWERED"] == true) echo "   <td bgcolor=$hlt_color width=1%><b><small>A</small></b></td>\n";
       elseif (ereg("(1|2)",substr($msg["PRIORITY"],0,1))) echo "   <td bgcolor=$hlt_color width=1%><b><small><font color=$color[1]>!</font></small></b></td>\n";
       else    echo "   <td bgcolor=$hlt_color width=1%>&nbsp;</td>\n";
-      echo "   <td bgcolor=$hlt_color>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0\">$flag$subject$flag_end</a>$bold_end</td>\n";
+      echo "   <td bgcolor=$hlt_color>$bold<a href=\"read_body.php?mailbox=$urlMailbox&passed_id=".$msg["ID"]."&startMessage=$startMessage&show_more=0$search_stuff\">$flag$subject$flag_end</a>$bold_end</td>\n";
 
       echo "</tr>\n";
    }

diff --git a/functions/mime.php b/functions/mime.php
index 18e2dd7bb7df92519469b237949aeb730aefecc4..3bc9b5640a5d4c184cbda952dceb10d26d7ac79f 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -161,7 +161,7 @@
          $structure = trim($structure);
          $char = substr($structure, 0, 1);
 
-         if (substr($structure, 0, 3) == "nil") {
+         if (strtolower(substr($structure, 0, 3)) == "nil") {
             $text = "";
             $structure = substr($structure, 3);
          } else if ($char == "\"") {