From 164f013e5866aca1e8bd8220206ff9f9697695d4 Mon Sep 17 00:00:00 2001
From: "mkanat%bugzilla.org"
 <mkanat%bugzilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 24 Oct 2010 22:31:48 +0000
Subject: [PATCH] Bug 600230 - Add a unique Message-ID to all outgoing e-mails.
 [r=LpSolit a=LpSolit]

git-svn-id: svn://10.0.0.236/trunk@261458 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/bugzilla/.bzrrev            | 2 +-
 mozilla/webtools/bugzilla/Bugzilla/Mailer.pm | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev
index 55c4f4e1b6c..1fd1d142a6f 100644
--- a/mozilla/webtools/bugzilla/.bzrrev
+++ b/mozilla/webtools/bugzilla/.bzrrev
@@ -1 +1 @@
-7568
\ No newline at end of file
+7569
\ No newline at end of file
diff --git a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
index d4a41b7638d..5ee6fd2eb85 100644
--- a/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
+++ b/mozilla/webtools/bugzilla/Bugzilla/Mailer.pm
@@ -208,7 +208,9 @@ sub build_thread_marker {
         $threadingmarker = "Message-ID: <bug-$bug_id-$user_id$sitespec>";
     }
     else {
-        $threadingmarker = "In-Reply-To: <bug-$bug_id-$user_id$sitespec>" .
+        my $rand_bits = generate_random_password(10);
+        $threadingmarker = "Message-ID: <bug-$bug_id-$user_id-$rand_bits$sitespec>" .
+                           "\nIn-Reply-To: <bug-$bug_id-$user_id$sitespec>" .
                            "\nReferences: <bug-$bug_id-$user_id$sitespec>";
     }