merging master into html-mail-fixes

[rails.git] / app / views / notifier / message_notification.text.erb

diff --git a/app/views/notifier/message_notification.text.erb b/app/views/notifier/message_notification.text.erb
index 10a9ff361ea7d7d449d63b2858ca422a4ec3abcf..c006941d9ff63149b0379c7da05e77fe5b776cea 100644 (file)
--- a/app/views/notifier/message_notification.text.erb
+++ b/app/views/notifier/message_notification.text.erb
@@ -6,5 +6,4 @@
 <%= raw @text.to_text %>
 ==
 
-<%= raw t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= raw t'notifier.message_notification.footer2', :replyurl => @replyurl %>
+<%= word_wrap(t'notifier.message_notification.footer_html', :readurl => @readurl, :replyurl => @replyurl) %>