Merge remote-tracking branch 'upstream/pull/2997' into master

diff --git a/app/views/user_mailer/message_notification.html.erb b/app/views/user_mailer/message_notification.html.erb
index fd49c6723c410da3bae56a249eabe3261e8882a5..4095b5e59426f13c1a991a2ad5215d7805a00530 100644 (file)
--- a/app/views/user_mailer/message_notification.html.erb
+++ b/app/views/user_mailer/message_notification.html.erb
@@ -2,7 +2,7 @@
   <%= t ".hi", :to_user => @to_user %>
 </p>
 <p>
-  <%= t ".header",
+  <%= t ".header_html",
         :from_user => link_to_user(@from_user),
         :subject => tag.em(@title) %>
 </p>