Malay

[squirrelmail.git] / functions / mime.php

diff --git a/functions/mime.php b/functions/mime.php
index 3322249a7423b964d1da6aaf3073ede298e0cb0f..f5968d735bd670565c9c949b810cb8742a6ee9d0 100644 (file)
--- a/functions/mime.php
+++ b/functions/mime.php
@@ -441,11 +441,10 @@ function formatAttachments($message, $exclude_id, $mailbox, $id) {
             }
             $from_o = $rfc822_header->from;
             if (is_object($from_o)) {
-                $from_name = $from_o->getAddress(false);
+                $from_name = decodeHeader($from_o->getAddress(false));
             } else {
                 $from_name = _("Unknown sender");
             }
-            $from_name = decodeHeader(($from_name));
             $description = $from_name;
         } else {
             $default_page = SM_PATH . 'src/download.php';
@@ -1117,7 +1116,7 @@ function sq_getnxtag($body, $offset){
          * double quotes. Type 4 we convert into:
          * attrname="yes".
          */
-        $regary = sq_findnxreg($body, $pos, "[^\w\-_]");
+        $regary = sq_findnxreg($body, $pos, "[^:\w\-_]");
         if ($regary == false){
             /**
              * Looks like body ended before the end of tag.