From f53aa2370945516652cf766df7305d7edec8c9ad Mon Sep 17 00:00:00 2001
From: stekkel <stekkel@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Wed, 14 Aug 2002 16:47:54 +0000
Subject: [PATCH] quick fix for incorrect reference headers

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@3304 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/smtp.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/functions/smtp.php b/functions/smtp.php
index 892c785c..eeaa28eb 100644
--- a/functions/smtp.php
+++ b/functions/smtp.php
@@ -749,13 +749,22 @@ function calculate_references($refs, $inreplyto, $old_reply_to) {
     $refer = "";
     for ($i=1;$i<count($refs[0]);$i++) {
         if (!empty($refs[0][$i])) {
-            if (preg_match("/^References:(.+)$/", $refs[0][$i], $regs)) {
+            if (preg_match("/^References:(.+)$/UA", $refs[0][$i], $regs)) {
                 $refer = trim($regs[1]);
             }
-            else {   
-                $refer .= ' ' . trim($refs[0][$i]);
-            }
-        }
+            else {
+               $refer .= ' ' . trim($regs[1]);
+	    }
+            
+        }
+    }
+    $refer_a = explode(' ', $refer);
+    $refer = '';
+    foreach ($refer_a as $ref) {
+       $ref = trim($ref);
+       if ($ref{0} == '<' && $ref{(strlen($ref)-1)} == '>') {
+          $refer .= $ref . ' ';
+       }
     }
     $refer = trim($refer);
     if (strlen($refer) > 2) {
-- 
2.25.1