diff --git a/app/views/mailer/err_notification.html.haml b/app/views/mailer/err_notification.html.haml
index fe85851..00bbc4a 100644
--- a/app/views/mailer/err_notification.html.haml
+++ b/app/views/mailer/err_notification.html.haml
@@ -23,7 +23,7 @@
           %td.content(valign="top")
             %div
               %p.heading ERROR MESSAGE:
-              %p= raw(@notice.err.message)
+              %p= @notice.err.message
               %p.heading WHERE:
               %p.monospace
                 = @notice.err.where
diff --git a/spec/mailers/mailer_spec.rb b/spec/mailers/mailer_spec.rb
index be7c085..296504b 100644
--- a/spec/mailers/mailer_spec.rb
+++ b/spec/mailers/mailer_spec.rb
@@ -5,10 +5,11 @@ describe Mailer do
     include EmailSpec::Helpers
     include EmailSpec::Matchers
 
-    it "should not html-escape the notice's message" do
+    it "should html-escape the notice's message for the html part" do
       @notice = Factory(:notice, :message => "class < ActionController::Base")
       @email = Mailer.err_notification(@notice)
-      @email.should have_body_text("class < ActionController::Base")
+      @email.should have_body_text("class &lt; ActionController::Base")
     end
   end
 end
+
--
libgit2 0.21.2