-<% if @owner %>
-<%= t 'notifier.note_plain.your_note', :commenter => @commenter, :place => @place %>
-<% else %>
-<%= t 'notifier.note_plain.commented_note', :commenter => @commenter, :place => @place %>
-<% end %>
-
-==
-<%= @comment %>
-==
-
-<%= t 'notifier.note_plain.details', :URL => @noteurl %>
+ <% if @owner %>
+ <p><%= raw t "notifier.note_comment_notification.#{@event}.your_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+ <% else %>
+ <p><%= raw t "notifier.note_comment_notification.#{@event}.commented_note", :commenter => link_to_user(@commenter), :place => @place %></p>
+ <% end %>