diff --git a/emails/templates/alert_notification.html b/emails/templates/alert_notification.html
index e66eefa6b07..2c9f78ce6fb 100644
--- a/emails/templates/alert_notification.html
+++ b/emails/templates/alert_notification.html
@@ -1,106 +1,106 @@
 [[Subject .Subject "[[.Title]]"]]
 
 <table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-						<h3 style="/*text-align:center*/;color: [[.SeverityColor]]; font-weight: bold; font-style: italic;">[[.Title]]</h3>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
+  <tr>
+    <td class="wrapper last">
+      <table class="twelve columns">
+        <tr>
+          <td class="center">
+            <h3 style="/*text-align:center*/;color: [[.SeverityColor]]; font-weight: bold; font-style: italic;">[[.Title]]</h3>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
 
 <table class="row" >
-	<tr>
-        <td class="last">
-			<table class="twelve columns">
-				<tr>
-                    <td class="center">
-                        <p style="/*text-align:center*/">[[.Message]]</p>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
+  <tr>
+    <td class="last">
+      <table class="twelve columns">
+        <tr>
+          <td class="center">
+            <p style="/*text-align:center*/">[[.Message]]</p>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
 
 [[if ne .State "ok" ]]
 <table class="row" >
-	<tr>
-        <td class="last">
-			<center>
-			<table class="twelve columns" >
-				<tr>
-					<td class="six">
-						<h5 style="font-weight: bold;">Metric name</h5>
-					</td>
-					<td class="six last" style="text-align: right; width:100px;">
-						<h5 style="font-weight: bold;text-align: right;">Value</h5>
-					</td>
-				</tr>
-				[[range .EvalMatches]]
-				<tr>
-					<td class="six">
-						<h5 class="data">[[.Metric]]</h5>
-					</td>
-					<td class="six last" style="text-align: right; width:100px;">
-						<h5 class="data" style="text-align: right;">[[.Value]]</h5>
-					</td>
-				</tr>
-				[[end]]
-			</table>
-			</center>
-		</td>
-	</tr>
+  <tr>
+    <td class="last">
+      <center>
+      <table class="twelve columns" >
+        <tr>
+          <td class="six">
+            <h5 style="font-weight: bold;">Metric name</h5>
+          </td>
+          <td class="six last" style="text-align: right; width:100px;">
+            <h5 style="font-weight: bold;text-align: right;">Value</h5>
+          </td>
+        </tr>
+        [[range .EvalMatches]]
+        <tr>
+          <td class="six">
+            <h5 class="data">[[.Metric]]</h5>
+          </td>
+          <td class="six last" style="text-align: right; width:100px;">
+            <h5 class="data" style="text-align: right;">[[.Value]]</h5>
+          </td>
+        </tr>
+        [[end]]
+      </table>
+      </center>
+    </td>
+  </tr>
 </table>
 [[end]]
 
 <table class="row" >
     <tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center">
-	                    <img src="[[.ImageLink]]" />
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
+    <td class="wrapper last">
+      <table class="twelve columns">
+        <tr>
+          <td class="center">
+              <img src="[[.ImageLink]]" />
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
 
 
 <table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center six">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button" bgcolor="#ff8f2b">
-									<a href="[[.RuleUrl]]"  target="_blank">View your Alert rule</a>
-								</td>
-							</tr>
-						</table>
-						</td>
-						<td class="center six">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button-alt" bgcolor="#efefef">
-									<a href="[[.AlertPageUrl]]"  target="_blank"> Go to the Alerts page</a>
-								</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
+  <tr>
+    <td class="wrapper last">
+      <table class="twelve columns">
+        <tr>
+          <td class="center six">
+            <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td align="center" class="better-button" bgcolor="#ff8f2b">
+                  <a href="[[.RuleUrl]]"  target="_blank">View your Alert rule</a>
+                </td>
+              </tr>
+            </table>
+            </td>
+            <td class="center six">
+            <table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
+              <tr>
+                <td align="center" class="better-button-alt" bgcolor="#efefef">
+                  <a href="[[.AlertPageUrl]]"  target="_blank"> Go to the Alerts page</a>
+                </td>
+              </tr>
+            </table>
+          </td>
+        </tr>
+      </table>
+    </td>
+  </tr>
 </table>
 
 
diff --git a/emails/templates/alert_notification_example.html b/emails/templates/alert_notification_example.html
deleted file mode 100644
index 5061b8579ac..00000000000
--- a/emails/templates/alert_notification_example.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%">
-	<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-		<td class="wrapper last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 10px 0px 0px; position: relative; text-align: left; vertical-align: top; word-break: break-word" align="left" valign="top">
-			<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px">
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-					<td class="center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; text-align: center; vertical-align: top; word-break: break-word" align="center" valign="top">
-						<h3 style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #D63232; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 22px; font-weight: bold; font-style: italic; line-height: 1.3; margin: 20px 0 0; padding: 0; text-align: left; word-break: normal" align="left"><img src="http://play.grafana.org/img/critical.svg" style="width: 40px; margin-right: 10px;"/> [CRITICAL] Imaginary timeserie alert</h3>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-<table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%">
-	<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-        <td class="wrapper last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 10px 0px 0px; position: relative; text-align: left; vertical-align: top; word-break: break-word" align="left" valign="top">
-			<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px">
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-                    <td class="center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; text-align: center; vertical-align: top; word-break: break-word" align="center" valign="top">
-                        <p style="-webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; /*text-align: center*/; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; line-height: 19px; margin: 0 0 10px; padding: 0; text-align: left" align="left">Alert message that will support markdown in some distant future.</p>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
-<table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%">
-	<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-        <td class="column last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 10px 0px 0px; position: relative; text-align: left; vertical-align: top; word-break: break-word" align="left" valign="top">
-			<center style="min-width: 580px; width: 100%">
-			
-			<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px">
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-					<td class="six" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: bold; line-height: 1.3; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						Metric name
-					</td>
-					<td class="six last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: bold; line-height: 1.3; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						Value
-					</td>
-				</tr>
-				
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-					<td class="six" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.5; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						desktop
-					</td>
-					<td class="six last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.5; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						40
-					</td>
-				</tr>
-				
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-					<td class="six" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.5; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						mobile
-					</td>
-					<td class="six last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 16px; font-weight: normal; line-height: 1.5; margin: 0; padding: 0; word-break: normal;" align="left" valign="top">
-						20
-					</td>
-				</tr>
-				
-			</table>
-			</center>
-		</td>
-	</tr>
-</table>
-
-
-<table class="row" style="border-collapse: collapse; border-spacing: 0; display: block; padding: 0px; position: relative; text-align: left; vertical-align: top; width: 100%">
-    <tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-		<td class="wrapper last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 10px 0px 0px; position: relative; text-align: left; vertical-align: top; word-break: break-word" align="left" valign="top">
-			<table class="twelve columns" style="border-collapse: collapse; border-spacing: 0; margin: 0 auto; padding: 0; text-align: left; vertical-align: top; width: 580px">
-				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
-					<td class="center" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; text-align: center; vertical-align: top; word-break: break-word" align="center" valign="top">
-	                    <img src="http://play.grafana.org/render/dashboard-solo/db/graphite-carbon-metrics?panelId=2&amp;from=1472149131057&amp;to=1472159931058&amp;width=1000&amp;height=500" style="-ms-interpolation-mode: bicubic; clear: both; display: block; float: left; max-width: 100%; outline: none; text-decoration: none; width: auto" align="left" />
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
-<table class="row">
-	<tr>
-		<td class="wrapper last">
-			<table class="twelve columns">
-				<tr>
-					<td class="center six">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button" bgcolor="#ff8f2b">
-									<a href="[[.RuleUrl]]"  target="_blank">View your Alert rule</a>
-								</td>
-							</tr>
-						</table>
-						</td>
-						<td class="center six">
-						<table class="better-button" align="center" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td align="center" class="better-button-alt" bgcolor="#efefef">
-									<a href="[[.AlertPageUrl]]"  target="_blank"> Go to the Alerts page</a>
-								</td>
-							</tr>
-						</table>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
-
-
-							
\ No newline at end of file