diff --git a/templates/zerver/emails/digest.html b/templates/zerver/emails/digest.html
index efc15c6000..0e8030313c 100644
--- a/templates/zerver/emails/digest.html
+++ b/templates/zerver/emails/digest.html
@@ -1,7 +1,9 @@
+{% extends "zerver/emails/email_base_messages.html" %}
 {#
 Mail sent to a user who hasn't logged in for 24 hours.
 #}
 
+{% block content %}
 Hello {{ name }},
 
 <p>A lot has happened on Zulip while you've been away! <a href="{{ realm_uri }}">Visit Zulip</a> to catch up.</p>
@@ -92,8 +94,11 @@ Hello {{ name }},
 
 <p>Cheers,<br />
 The Zulip Team</p>
+{% endblock %}
 
+{% block manage_preferences %}
 <p>
     <a href="{{ realm_uri }}/#settings">Manage email preferences</a> |
     <a href="{{ unsubscribe_link }}">Unsubscribe from digest emails</a>
 </p>
+{% endblock %}
diff --git a/templates/zerver/emails/email_base_messages.html b/templates/zerver/emails/email_base_messages.html
new file mode 100644
index 0000000000..268a8d70ab
--- /dev/null
+++ b/templates/zerver/emails/email_base_messages.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html lang="en">
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+        <title>Zulip</title>
+    </head>
+    <body>
+        <span style="display:none !important;
+            visibility:hidden;
+            color:transparent;
+            mso-hide:all;
+            font-size:1px;
+            color:#ffffff;
+            line-height:1px;
+            max-height:0px;
+            height:0px;
+            max-width:0px;
+            width:0px;
+            opacity:0;
+            overflow:hidden;">
+            {% block preheader %}{% endblock %}
+        </span>
+        {% block content %}{% endblock %}
+        {% block manage_preferences %}{% endblock %}
+    </body>
+</html>
diff --git a/templates/zerver/emails/missed_message.html b/templates/zerver/emails/missed_message.html
index 8124112aa2..8e043159e8 100644
--- a/templates/zerver/emails/missed_message.html
+++ b/templates/zerver/emails/missed_message.html
@@ -1,7 +1,9 @@
+{% extends "zerver/emails/email_base_messages.html" %}
 {#
 Mail sent to user when they were not logged in and received a PM or @-mention
 #}
 
+{% block content %}
 Hello {{ name }},
 
 <p>
@@ -43,5 +45,8 @@ Hello {{ name }},
     <br></br>
     The Zulip Team
 </p>
+{% endblock %}
 
+{% block manage_preferences %}
 <p><a href="{{ realm_uri }}/#settings">Manage email preferences</a> | <a href="{{ unsubscribe_link }}">Unsubscribe from missed message emails</a></p>
+{% endblock %}
diff --git a/tools/check-templates b/tools/check-templates
index 25b4a49fea..54febb0852 100755
--- a/tools/check-templates
+++ b/tools/check-templates
@@ -127,6 +127,8 @@ def check_html_templates(templates, all_dups):
         'templates/zerver/api.html',
         'templates/zerver/apps.html',
         'templates/zerver/compose.html',
+        'templates/zerver/emails/digest.html',
+        'templates/zerver/emails/missed_message.html',
         'templates/zerver/hello.html',
         'templates/zerver/home.html',
         'templates/zerver/index.html',
