Do not parse Message-ID as emailaddress.

[squirrelmail.git] / src / view_header.php

diff --git a/src/view_header.php b/src/view_header.php
index 2cf9d1faf8ed8e29a369f09986a97f27920f7683..c7aa7e0e35d8ef67edf46ea946fccaee03e4b00e 100644 (file)
--- a/src/view_header.php
+++ b/src/view_header.php
@@ -10,10 +10,15 @@
  *
  * $Id$
  */
-require_once('../src/validate.php');
-require_once('../functions/imap.php');
-require_once('../functions/html.php');
-require_once('../functions/url_parser.php');
+
+/* Path for SquirrelMail required files. */
+define('SM_PATH','../');
+
+/* SquirrelMail required files. */
+require_once(SM_PATH . 'include/validate.php');
+require_once(SM_PATH . 'functions/imap.php');
+require_once(SM_PATH . 'functions/html.php');
+require_once(SM_PATH . 'functions/url_parser.php');
 
 function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
    global $uid_support;
@@ -58,7 +63,10 @@ function  parse_viewheader($imapConnection,$id, $passed_ent_id) {
             $s .= '    ' . nl2br($second[$j]);
             $j++;
         }
-        parseEmail($s);
+        if(strtolower($f) != 'message-id:')
+       {
+               parseEmail($s);
+       }
         if (isset($f)) {
             $header_output[] = array($f,$s);
         }