-***************************************************************************
-* *
-<%= t'notifier.message_notification.banner1' %>
-<%= t'notifier.message_notification.banner2' %>
-* *
-***************************************************************************
+<p><%= t'notifier.message_notification.hi', :to_user => @to_user %></p>
-<%= t'notifier.message_notification.hi', :to_user => @to_user %>
-
-<%= t'notifier.message_notification.header', :from_user => @from_user, :subject => @title %>
+<p><%= raw t'notifier.message_notification.header', :from_user => link_to(@from_user, :host => SERVER_URL, :controller => :user, :action => :view, :display_name => @from_user), :subject => @title %></p>
==
-<%= @body %>
+<%= @text.to_html %>
==
-<%= t'notifier.message_notification.footer1', :readurl => @readurl %>
-<%= t'notifier.message_notification.footer2', :replyurl => @replyurl %>
-
-***************************************************************************
-* *
-<%= t'notifier.message_notification.banner1' %>
-<%= t'notifier.message_notification.banner2' %>
-* *
-***************************************************************************
+<p>
+ <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %>
+ <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %>
+</p>