From 613e77099b334526dd0d4e73383231e8332f3816 Mon Sep 17 00:00:00 2001
From: Byron Jones <glob@mozilla.com>
Date: Fri, 7 Nov 2014 14:11:49 +0800
Subject: Bug 1094902: needinfo canceled or requested email end with
 @@body-headers@@

---
 extensions/BMO/Extension.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'extensions/BMO')

diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm
index 94796ec72..1e24141b4 100644
--- a/extensions/BMO/Extension.pm
+++ b/extensions/BMO/Extension.pm
@@ -1127,7 +1127,9 @@ sub _inject_headers_into_body {
         # as_string() doesn't return the updated body for multi-part sub-parts.
         $email->parts_set([ $email->subparts ]);
     }
-    elsif ($email->content_type =~ /^text\/(?:html|plain)/) {
+    elsif (!$email->content_type
+           || $email->content_type =~ /^text\/(?:html|plain)/)
+    {
         # text-only email
         _replace_placeholder_in_part($email, $replacement);
     }
-- 
cgit v1.2.3-24-g4f1b