From 70f35565e1245b5ab91837930dc118e6a7c05a59 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Sun, 8 Mar 2020 08:26:21 +0100
Subject: [PATCH 1/2] Fix & align mail text ... again

---
 view/templates/email/html.tpl        |  8 ++--
 view/templates/email/notify/html.tpl | 56 +++++++++++++++++++++-------
 view/templates/email/system/html.tpl | 29 ++++++++++++--
 3 files changed, 73 insertions(+), 20 deletions(-)

diff --git a/view/templates/email/html.tpl b/view/templates/email/html.tpl
index 103572eaed..08de50a54f 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 f7c3f7d8f9..1be8c9eafa 100644
--- a/view/templates/email/notify/html.tpl
+++ b/view/templates/email/notify/html.tpl
@@ -1,20 +1,48 @@
 <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>
+				{{$thanks}}
+			</td>
+		</tr>
+		<tr>
+			<td>
+				{{$site_admin}}
+			</td>
+		</tr>
+	</tfoot>
 </table>
diff --git a/view/templates/email/system/html.tpl b/view/templates/email/system/html.tpl
index f32825d3ee..8f4e1573f3 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>

From 06b0df8e462508b73c48542416402ddcd4e1ccd5 Mon Sep 17 00:00:00 2001
From: nupplaPhil <admin+github@philipp.info>
Date: Sun, 8 Mar 2020 20:24:17 +0100
Subject: [PATCH 2/2] Fix mail text ... again

---
 view/templates/email/notify/html.tpl | 2 ++
 view/templates/email/system/html.tpl | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/view/templates/email/notify/html.tpl b/view/templates/email/notify/html.tpl
index 1be8c9eafa..7237fad832 100644
--- a/view/templates/email/notify/html.tpl
+++ b/view/templates/email/notify/html.tpl
@@ -35,11 +35,13 @@
 			</td>
 		</tr>
 		<tr>
+			<td></td>
 			<td>
 				{{$thanks}}
 			</td>
 		</tr>
 		<tr>
+			<td></td>
 			<td>
 				{{$site_admin}}
 			</td>
diff --git a/view/templates/email/system/html.tpl b/view/templates/email/system/html.tpl
index 8f4e1573f3..313a066273 100644
--- a/view/templates/email/system/html.tpl
+++ b/view/templates/email/system/html.tpl
@@ -18,7 +18,7 @@
 			<td>
 				{{$thanks}}
 			</td>
-	</tr>
+		</tr>
 	<tr>
 		<td>
 			{{$site_admin}}