diff --git a/src/views/emails/digest.tpl b/src/views/emails/digest.tpl
index e763b53755..2dfd19077f 100644
--- a/src/views/emails/digest.tpl
+++ b/src/views/emails/digest.tpl
@@ -33,10 +33,7 @@
 	<a href="{url}">[[email:digest.cta, {site_title}]]</a>
 </p>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
 
 <hr />
 <p>
diff --git a/src/views/emails/digest_plaintext.tpl b/src/views/emails/digest_plaintext.tpl
index 25e44bac68..d47c3a0166 100644
--- a/src/views/emails/digest_plaintext.tpl
+++ b/src/views/emails/digest_plaintext.tpl
@@ -23,8 +23,7 @@
 [[email:digest.cta, {site_title}]]: {url}
 
 
-[[email:closing]]
-{site_title}
+{footer_plaintext}
 
 ===
 
diff --git a/src/views/emails/invitation.tpl b/src/views/emails/invitation.tpl
index a19543d084..7323a37d01 100644
--- a/src/views/emails/invitation.tpl
+++ b/src/views/emails/invitation.tpl
@@ -8,7 +8,4 @@
 	<a href="{registerLink}">[[email:invitation.ctr]]</a>
 </blockquote>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
\ No newline at end of file
diff --git a/src/views/emails/invitation_plaintext.tpl b/src/views/emails/invitation_plaintext.tpl
index 64bb6c73e1..0ec6501f05 100644
--- a/src/views/emails/invitation_plaintext.tpl
+++ b/src/views/emails/invitation_plaintext.tpl
@@ -6,6 +6,5 @@
 
 	{registerLink}
 
-[[email:closing]]
-{site_title}
+{footer_plaintext}
 
diff --git a/src/views/emails/notif_chat.tpl b/src/views/emails/notif_chat.tpl
index da7d1611d3..13216a43c5 100644
--- a/src/views/emails/notif_chat.tpl
+++ b/src/views/emails/notif_chat.tpl
@@ -5,10 +5,7 @@
 
 <a href="{url}/chats/{fromUserslug}">[[email:notif.chat.cta]]</a>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
 
 <hr />
 <p>
diff --git a/src/views/emails/notif_chat_plaintext.tpl b/src/views/emails/notif_chat_plaintext.tpl
index d548b5643f..59cc5dc3ca 100644
--- a/src/views/emails/notif_chat_plaintext.tpl
+++ b/src/views/emails/notif_chat_plaintext.tpl
@@ -7,8 +7,7 @@
 [[email:notif.chat.cta]]: {url}/chats/{fromUserslug}
 
 
-[[email:closing]]
-{site_title}
+{footer_plaintext}
 
 ===
 
diff --git a/src/views/emails/notif_post.tpl b/src/views/emails/notif_post.tpl
index 78ac8fefb0..db870b1bc0 100644
--- a/src/views/emails/notif_post.tpl
+++ b/src/views/emails/notif_post.tpl
@@ -5,10 +5,7 @@
 
 <a href="{url}">[[email:notif.post.cta]]</a>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
 
 <hr />
 <p>
diff --git a/src/views/emails/notif_post_plaintext.tpl b/src/views/emails/notif_post_plaintext.tpl
index 0a317466a8..a2bf23fe20 100644
--- a/src/views/emails/notif_post_plaintext.tpl
+++ b/src/views/emails/notif_post_plaintext.tpl
@@ -6,8 +6,7 @@
 
 [[email:notif.post.cta]]: {url}
 
-[[email:closing]]
-{site_title}
+{footer_plaintext}
 
 ===
 
diff --git a/src/views/emails/partials/footer.tpl b/src/views/emails/partials/footer.tpl
new file mode 100644
index 0000000000..256a850914
--- /dev/null
+++ b/src/views/emails/partials/footer.tpl
@@ -0,0 +1,4 @@
+<p>
+	[[email:closing]]<br />
+	<strong>{site_title}</strong>
+</p>
\ No newline at end of file
diff --git a/src/views/emails/partials/footer_plaintext.tpl b/src/views/emails/partials/footer_plaintext.tpl
new file mode 100644
index 0000000000..1d2e2860dc
--- /dev/null
+++ b/src/views/emails/partials/footer_plaintext.tpl
@@ -0,0 +1,2 @@
+[[email:closing]]
+{site_title}
diff --git a/src/views/emails/registration_accepted.tpl b/src/views/emails/registration_accepted.tpl
index 5c978aa22a..8975e33631 100644
--- a/src/views/emails/registration_accepted.tpl
+++ b/src/views/emails/registration_accepted.tpl
@@ -6,7 +6,4 @@
 
 <p>[[email:welcome.text3]]</p>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
diff --git a/src/views/emails/registration_accepted_plaintext.tpl b/src/views/emails/registration_accepted_plaintext.tpl
index a1bacf0f9f..404afd083f 100644
--- a/src/views/emails/registration_accepted_plaintext.tpl
+++ b/src/views/emails/registration_accepted_plaintext.tpl
@@ -5,5 +5,4 @@
 [[email:welcome.text3]]
 
 
-[[email:closing]]
-{site_title}
\ No newline at end of file
+{footer_plaintext}
\ No newline at end of file
diff --git a/src/views/emails/reset.tpl b/src/views/emails/reset.tpl
index 1f53dd08ad..dc861a7d70 100644
--- a/src/views/emails/reset.tpl
+++ b/src/views/emails/reset.tpl
@@ -8,7 +8,4 @@
 	<a href="{reset_link}">[[email:reset.cta]]</a>
 </blockquote>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
\ No newline at end of file
+{footer}
\ No newline at end of file
diff --git a/src/views/emails/reset_notify.tpl b/src/views/emails/reset_notify.tpl
index 34c26aa481..0f9da5beb1 100644
--- a/src/views/emails/reset_notify.tpl
+++ b/src/views/emails/reset_notify.tpl
@@ -4,7 +4,4 @@
 
 <p>[[email:reset.notify.text2]]</p>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
\ No newline at end of file
+{footer}
\ No newline at end of file
diff --git a/src/views/emails/reset_notify_plaintext.tpl b/src/views/emails/reset_notify_plaintext.tpl
index 788618f9d5..a2239ec13c 100644
--- a/src/views/emails/reset_notify_plaintext.tpl
+++ b/src/views/emails/reset_notify_plaintext.tpl
@@ -4,5 +4,4 @@
 
 [[email:reset.notify.text2]]
 
-[[email:closing]]
-{site_title}
\ No newline at end of file
+{footer_plaintext}
\ No newline at end of file
diff --git a/src/views/emails/reset_plaintext.tpl b/src/views/emails/reset_plaintext.tpl
index f7722c9f60..7114b967a7 100644
--- a/src/views/emails/reset_plaintext.tpl
+++ b/src/views/emails/reset_plaintext.tpl
@@ -6,5 +6,4 @@
 
     {reset_link}
 
-[[email:closing]]
-{site_title}
\ No newline at end of file
+{footer_plaintext}
\ No newline at end of file
diff --git a/src/views/emails/test.tpl b/src/views/emails/test.tpl
index b814dc9cae..f46069fe20 100644
--- a/src/views/emails/test.tpl
+++ b/src/views/emails/test.tpl
@@ -2,7 +2,4 @@
 
 <p>[[email:test.text1]]</p>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
\ No newline at end of file
+{footer}
\ No newline at end of file
diff --git a/src/views/emails/test_plaintext.tpl b/src/views/emails/test_plaintext.tpl
index e4555f5ae8..b7036533f4 100644
--- a/src/views/emails/test_plaintext.tpl
+++ b/src/views/emails/test_plaintext.tpl
@@ -2,5 +2,4 @@
 
 [[email:test.text1]]
 
-[[email:closing]]
-{site_title}
\ No newline at end of file
+{footer_plaintext}
\ No newline at end of file
diff --git a/src/views/emails/welcome.tpl b/src/views/emails/welcome.tpl
index 1ed7ed650b..ed19359d08 100644
--- a/src/views/emails/welcome.tpl
+++ b/src/views/emails/welcome.tpl
@@ -10,7 +10,4 @@
 	<a href="{confirm_link}">[[email:welcome.cta]]</a>
 </blockquote>
 
-<p>
-	[[email:closing]]<br />
-	<strong>{site_title}</strong>
-</p>
+{footer}
diff --git a/src/views/emails/welcome_plaintext.tpl b/src/views/emails/welcome_plaintext.tpl
index a52b67c072..53d9543a0e 100644
--- a/src/views/emails/welcome_plaintext.tpl
+++ b/src/views/emails/welcome_plaintext.tpl
@@ -7,5 +7,4 @@
     {confirm_link}
 
 
-[[email:closing]]
-{site_title}
\ No newline at end of file
+{footer_plaintext}
\ No newline at end of file