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 25b3c0498d3c4090e1d2b4f6308fea8460c29d37..c006941d9ff63149b0379c7da05e77fe5b776cea 100644 (file)
--- a/app/views/notifier/message_notification.text.erb
+++ b/app/views/notifier/message_notification.text.erb
@@ -3,8 +3,7 @@
 <%= raw t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
 
 ==
-<%= raw @text %>
+<%= 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) %>