From d5b6cf264d403f9d6d8f8c8b43b403fad8719cc1 Mon Sep 17 00:00:00 2001
From: Gianluca Sforna <giallu@gmail.com>
Date: Sun, 11 Jan 2009 00:23:40 +0100
Subject: [PATCH] Fix 10040: Email notification from new bug report submission
 Message-ID headers not RFC 822 compliant

---
 core/email_api.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/core/email_api.php b/core/email_api.php
index 148254b29d..b01286eb85 100644
--- a/core/email_api.php
+++ b/core/email_api.php
@@ -833,7 +833,12 @@ function email_send( $p_email_data ) {
 		foreach( $t_email_data->metadata['headers'] as $t_key => $t_value ) {
 			switch( $t_key ) {
 				case 'Message-ID':
-					$mail->set( 'MessageID', $t_value );
+					/* Note: hostname can never be blank here as we set metadata['hostname']
+					   in email_store() where mail gets queued. */
+						if ( !strchr( $t_value, '@' ) && !is_blank( $mail->Hostname ) ) {
+							$t_value = $t_value . '@' . $mail->Hostname;
+						}
+					$mail->set( 'MessageID', "<$t_value>" );
 					break;
 				case 'In-Reply-To':
 					$mail->AddCustomHeader( "$t_key: <{$t_value}@{$mail->Hostname}>" );