3 files changed, 24 insertions, 17 deletions
diff --git a/lib/mauve/notifiers/email.rb b/lib/mauve/notifiers/email.rb
index 168a9d6..75588f4 100644
--- a/lib/mauve/notifiers/email.rb
+++ b/lib/mauve/notifiers/email.rb
@@ -67,8 +67,21 @@ module Mauve
           end
           
           m = RMail::Message.new
-          
-          m.header.subject = "Arse"
+         
+          #
+          # Use a template for:
+          #
+          #   * The subject
+          #   * The text part
+          #   * The HTML part.
+          #
+          subject_template = File.join(File.dirname(__FILE__), "templates", "email_subject.txt.erb")
+          if File.exists?(subject_template)
+            m.header.subject = ERB.new(File.read(subject_template)).result(binding).chomp
+          else
+            m.header.subject = "Arse"
+          end
+
           m.header.to = destination
           m.header.from = @from
           m.header.date = MauveTime.now
diff --git a/lib/mauve/notifiers/templates/email.html.erb b/lib/mauve/notifiers/templates/email.html.erb
index fcf0620..c568d77 100644
--- a/lib/mauve/notifiers/templates/email.html.erb
+++ b/lib/mauve/notifiers/templates/email.html.erb
@@ -1,4 +1,7 @@
-<p><strong><%= alert.update_type.upcase %></strong> <% 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"><head><title></title></head><body>
+<p><strong><%= alert.update_type.upcase %>:</strong> <% 
 case alert.update_type 
 when :cleared 
 %><%= MauveTime.now.to_s_relative(alert.cleared_at.to_time) %><% 
@@ -11,18 +14,9 @@ end
 if alert.source != alert.subject 
 %> -- <em>from <%= alert.source %></em><%
 end 
-%>.
-
+%>.</p>
 <hr />
-
-<div>
-<%=alert.detail %>
-</div>
-
+<h2>Detail</h2>
+<div><%=alert.detail %></div>
 <hr />
-
-<address>
---<br />
-Love mauve<br />
-xxx.
-</address>
+<address>--<br />Love mauve<br />xxx.</address></body></html>
diff --git a/lib/mauve/notifiers/templates/email.txt.erb b/lib/mauve/notifiers/templates/email.txt.erb
index 8f7e9a4..eb49da9 100644
--- a/lib/mauve/notifiers/templates/email.txt.erb
+++ b/lib/mauve/notifiers/templates/email.txt.erb
@@ -13,7 +13,7 @@ if alert.source != alert.subject
 end 
 %>.
 
--- Details ------------------------------------------------------------
+-- Detail ------------------------------------------------------------
 
 <%= Sanitize.clean(alert.detail) %>