diff --git a/public/templates/mail/global/footer.tpl b/public/templates/mail/global/footer.tpl
new file mode 100644
index 00000000..308b1d01
--- /dev/null
+++ b/public/templates/mail/global/footer.tpl
@@ -0,0 +1,2 @@
+</body>
+</html>
diff --git a/public/templates/mail/global/header.tpl b/public/templates/mail/global/header.tpl
new file mode 100644
index 00000000..109ed142
--- /dev/null
+++ b/public/templates/mail/global/header.tpl
@@ -0,0 +1,82 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+	<title>{$DATA.subject}</title>
+	<style type="text/css">
+    {literal}
+		#outlook a {padding:0;} /* Force Outlook to provide a "view in browser" menu link. */
+		body{width:100% !important; -webkit-text-size-adjust:100%; -ms-text-size-adjust:100%; margin:0; padding:0;}
+		.ExternalClass {width:100%;} /* Force Hotmail to display emails at full width */
+		.ExternalClass, .ExternalClass p, .ExternalClass span, .ExternalClass font, .ExternalClass td, .ExternalClass div {line-height: 100%;} /* Force Hotmail to display normal line spacing.  More on that: http://www.emailonacid.com/forum/viewthread/43/ */
+		#backgroundTable {margin:0; padding:0; width:100% !important; line-height: 100% !important;}
+		img {outline:none; text-decoration:none; -ms-interpolation-mode: bicubic;}
+		a img {border:none;}
+		.image_fix {display:block;}
+		p {margin: 1em 0;}
+		h1, h2, h3, h4, h5, h6 {color: black !important;}
+		h1 a, h2 a, h3 a, h4 a, h5 a, h6 a {color: blue !important;}
+		h1 a:active, h2 a:active,  h3 a:active, h4 a:active, h5 a:active, h6 a:active {
+			color: red !important; /* Preferably not the same color as the normal header link color.  There is limited support for psuedo classes in email clients, this was added just for good measure. */
+		 }
+		h1 a:visited, h2 a:visited,  h3 a:visited, h4 a:visited, h5 a:visited, h6 a:visited {
+			color: purple !important; /* Preferably not the same color as the normal header link color. There is limited support for psuedo classes in email clients, this was added just for good measure. */
+		}
+		table td {border-collapse: collapse;}
+      table { border-collapse:collapse; mso-table-lspace:0pt; mso-table-rspace:0pt; }
+		a:link { color: orange; }
+		a:visited { color: blue; }
+		a:hover { color: green; }
+		@media only screen and (max-device-width: 480px) {
+			a[href^="tel"], a[href^="sms"] {
+						text-decoration: none;
+						color: black; /* or whatever your want */
+						pointer-events: none;
+						cursor: default;
+					}
+			.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
+						text-decoration: default;
+						color: orange !important; /* or whatever your want */
+						pointer-events: auto;
+						cursor: default;
+					}
+		}
+		@media only screen and (min-device-width: 768px) and (max-device-width: 1024px) {
+			a[href^="tel"], a[href^="sms"] {
+						text-decoration: none;
+						color: blue; /* or whatever your want */
+						pointer-events: none;
+						cursor: default;
+					}
+
+			.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {
+						text-decoration: default;
+						color: orange !important;
+						pointer-events: auto;
+						cursor: default;
+					}
+		}
+		@media only screen and (-webkit-min-device-pixel-ratio: 2) {
+		}
+		@media only screen and (-webkit-device-pixel-ratio:.75){
+		}
+		@media only screen and (-webkit-device-pixel-ratio:1){
+		}
+		@media only screen and (-webkit-device-pixel-ratio:1.5){
+		}
+  {/literal}
+	</style>
+	<!--[if IEMobile 7]>
+	<style type="text/css">
+
+	</style>
+	<![endif]-->
+	<!--[if gte mso 9]>
+	<style>
+		/* Target Outlook 2007 and 2010 */
+	</style>
+	<![endif]-->
+</head>
+<body>
diff --git a/public/templates/mail/notifications/error.tpl b/public/templates/mail/notifications/error.tpl
index 9aab79bf..10951728 100644
--- a/public/templates/mail/notifications/error.tpl
+++ b/public/templates/mail/notifications/error.tpl
@@ -1,10 +1,20 @@
-<html>
-<body>
-<h1>An error occured!</h1>
-<p>This should never happen. Please review the error output below.</p>
-
+  {include file="../global/header.tpl"}
+  <h1>An error occured!</h1>
+  <p>This should never happen. Please review the error output below.</p>
+  <table cellpadding="0" cellspacing="0" border="0" id="backgroundTable">
+  <tr>
+    <td>
+    <table cellpadding="0" cellspacing="1" border="0" align="left" width="800px">
 {foreach from=$DATA key=text item=message}
   {if $text != 'email' && $text != 'subject'}
-    <p>{$text}: {$message}</p>
+      <tr>
+        <th align="left" width="150px">{$text}</th>
+        <td>{$message}</td>
+      </tr>
   {/if}
 {/foreach}
+    </table>
+    </td>
+  </tr>
+  </table>
+  {include file="../global/footer.tpl"}
