-<p><%= t'notifier.message_notification.hi', :to_user => @to_user %></p>
-
-<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>
-
-==
-<%= @text.to_html %>
-==
-
<p>
- <%= raw t'notifier.message_notification.footer1', :readurl => link_to(@readurl, @readurl) %>
- <%= raw t'notifier.message_notification.footer2', :replyurl => link_to(@replyurl, @replyurl) %>
+ <%= t ".hi", :to_user => @to_user %>
</p>
+<p>
+ <%= raw t ".header",
+ :from_user => link_to_user(@from_user),
+ :subject => content_tag("em", @title) %>
+</p>
+
+<%= message_body do %>
+ <%= @text.to_html %>
+<% end %>
+
+<% content_for :footer do %>
+ <p>
+ <%= t ".footer_html",
+ :readurl => link_to(@readurl, @readurl) + tag(:br),
+ :replyurl => link_to(@replyurl, @replyurl) %>
+ </p>
+<% end %>