From 838f1035739dc2440aba541bb452f02184d7f76c Mon Sep 17 00:00:00 2001
From: Jan Schneider <jan@horde.org>
Date: Fri, 28 Aug 2009 11:27:44 +0200
Subject: [PATCH] Fix sending illegal multiple headers when re-sending
 messages.

---
 framework/Mime/lib/Horde/Mime/Mail.php | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/framework/Mime/lib/Horde/Mime/Mail.php b/framework/Mime/lib/Horde/Mime/Mail.php
index aecac7391..3253c3296 100644
--- a/framework/Mime/lib/Horde/Mime/Mail.php
+++ b/framework/Mime/lib/Horde/Mime/Mail.php
@@ -419,13 +419,21 @@ class Horde_Mime_Mail
     public function send($config, $resend = false, $flowed = true)
     {
         /* Add mandatory headers if missing. */
-        if (!$resend || !$this->_headers->getValue('Message-ID')) {
+        $has_header = $this->_headers->getValue('Message-ID');
+        if (!$resend || !$has_header) {
+            if ($has_header) {
+                $this->_headers->removeHeader('Message-ID');
+            }
             $this->_headers->addMessageIdHeader();
         }
         if (!$this->_headers->getValue('User-Agent')) {
             $this->_headers->addUserAgentHeader();
         }
-        if (!$resend || !$this->_headers->getValue('Date')) {
+        $has_header = $this->_headers->getValue('Date');
+        if (!$resend || !$has_header) {
+            if ($has_header) {
+                $this->_headers->removeHeader('Date');
+            }
             $this->_headers->addHeader('Date', date('r'));
         }
 
-- 
2.11.0