diff --git a/view/templates/email/html.tpl b/view/templates/email/html.tpl
index 103572eae..08de50a54 100644
--- a/view/templates/email/html.tpl
+++ b/view/templates/email/html.tpl
@@ -14,10 +14,12 @@
 				<div style="clear: both;"></div>
 			</td>
 		</tr>
+		<tr>
+			<td>
+				{{$htmlversion nofilter}}
+			</td>
+		</tr>
 	</tbody>
 	</table>
-	<p>
-	{{$htmlversion nofilter}}
-	</p>
 </body>
 </html>
diff --git a/view/templates/email/notify/html.tpl b/view/templates/email/notify/html.tpl
index f7c3f7d8f..7237fad83 100644
--- a/view/templates/email/notify/html.tpl
+++ b/view/templates/email/notify/html.tpl
@@ -1,20 +1,50 @@
 <table>
-<tbody>
-	<tr><td colspan="2" style="padding-top:22px;">{{$preamble nofilter}}</td></tr>
-
+	<thead>
+		<tr>
+			<td colspan="2" style="padding-top:22px;">
+				{{$preamble nofilter}}
+			</td>
+		</tr>
+	</thead>
 {{if $content_allowed}}
+	<tbody>
 	{{if $source_photo}}
-	<tr>
-		<td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
-		<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
-	</tr>
+		<tr>
+			<td style="padding-left:22px;padding-top:22px;width:60px;" valign="top" rowspan=3><a href="{{$source_link}}"><img style="border:0px;width:48px;height:48px;" src="{{$source_photo}}"></a></td>
+			<td style="padding-top:22px;"><a href="{{$source_link}}">{{$source_name}}</a></td>
+		</tr>
 	{{/if}}
-	<tr><td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td></tr>
-	<tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
+		<tr>
+			<td style="font-weight:bold;padding-bottom:5px;">{{$title}}</td>
+		</tr>
+		<tr>
+			<td style="padding-right:22px;">{{$htmlversion nofilter}}
+		</td>
+		</tr>
 {{/if}}
-	<tr><td colspan="2" style="padding-top:11px;">{{$hsitelink nofilter}}</td></tr>
-	<tr><td colspan="2" style="padding-bottom:11px;">{{$hitemlink nofilter}}</td></tr>
-	<tr><td></td><td>{{$thanks}}</td></tr>
-	<tr><td></td><td>{{$site_admin}}</td></tr>
-</tbody>
+	</tbody>
+	<tfoot>
+		<tr>
+			<td colspan="2" style="padding-top:11px;">
+				{{$hsitelink nofilter}}
+			</td>
+		</tr>
+		<tr>
+			<td colspan="2" style="padding-bottom:11px;">
+				{{$hitemlink nofilter}}
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+				{{$thanks}}
+			</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td>
+				{{$site_admin}}
+			</td>
+		</tr>
+	</tfoot>
 </table>
diff --git a/view/templates/email/system/html.tpl b/view/templates/email/system/html.tpl
index f32825d3e..313a06627 100644
--- a/view/templates/email/system/html.tpl
+++ b/view/templates/email/system/html.tpl
@@ -1,5 +1,28 @@
 <table>
-<tr><td style="padding-right:22px;">{{$htmlversion nofilter}}</td></tr>
-<tr><td>{{$thanks}}</td></tr>
-<tr><td>{{$site_admin}}</td></tr>
+	<thead>
+	<tr>
+		<td>
+			{{$preamble nofilter}}
+		</td>
+	</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td style="padding-right:22px;">
+				{{$htmlversion nofilter}}
+			</td>
+		</tr>
+	</tbody>
+	<tfoot>
+		<tr>
+			<td>
+				{{$thanks}}
+			</td>
+		</tr>
+	<tr>
+		<td>
+			{{$site_admin}}
+		</td>
+	</tr>
+	</tfoot>
 </table>