From e2b27e46426ed1d32cc521229d920583b647fd7c Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Mon, 30 Jun 2014 21:53:44 +0800
Subject: Bug 1030747: Recent changes to secure bugmail subject lines break
 GMail threading

---
 extensions/SecureMail/Extension.pm | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'extensions/SecureMail')

diff --git a/extensions/SecureMail/Extension.pm b/extensions/SecureMail/Extension.pm
index 5c697e8db..687112955 100644
--- a/extensions/SecureMail/Extension.pm
+++ b/extensions/SecureMail/Extension.pm
@@ -552,6 +552,8 @@ sub _make_secure {
         my $new = $add_new ? ' New:' : '';
         my $product = $email->header('X-Bugzilla-Product');
         my $component = $email->header('X-Bugzilla-Component');
+        # Note: the $bug_id is required within the parentheses in order to keep
+        # gmail's threading algorithm happy.
         $subject =~ s/($bug_id\])\s+(.*)$/$1$new (Secure bug $bug_id in $product :: $component)/;
         $email->header_set('Subject', $subject);
     }
-- 
cgit v1.2.3-24-g4f1b