diff --git a/templates/zerver/integrations/email.html b/templates/zerver/integrations/email.html
deleted file mode 100644
index 9b8c35a278..0000000000
--- a/templates/zerver/integrations/email.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<p>You can send emails to Zulip! This is useful:</p>
-
-<ul>
-    <li>If you use a service that can send emails but does not easily lend
-        itself to more direct integration
-    </li>
-    <li>If you have an email that you want to discuss on Zulip</li>
-    <li>As a structured, searchable, commentable archive for mailing list
-        traffic
-    </li>
-</ul>
-
-<p>To send an email to a Zulip stream:</p>
-
-<ol>
-    <li>Visit your {{ subscriptions_html|safe }} and click on the stream row to expand it.</li>
-    <li>Copy the stream email address
-        (e.g. <code>{{ email_gateway_example }}</code>). If the stream
-        name contains special characters, we've transformed the name so it is a
-        safe email recipient.
-    </li>
-    <li>Send an email (To, CC, and BCC all work) to the stream email
-        address. The email subject will become the stream topic, and the email
-        body will become the Zulip message content.
-    </li>
-</ol>
-
-<p>
-    Please note that it may take up to one minute for the message to show up
-    in Zulip.
-</p>
diff --git a/templates/zerver/integrations/email.md b/templates/zerver/integrations/email.md
new file mode 100644
index 0000000000..55fcc8049a
--- /dev/null
+++ b/templates/zerver/integrations/email.md
@@ -0,0 +1,23 @@
+You can send emails to Zulip! This is useful:
+
+* If you use a service that can send emails but does not easily lend
+  itself to more direct integration
+* If you have an email that you want to discuss on Zulip
+* As a structured, searchable, commentable archive for mailing list
+  traffic
+
+To send an email to a Zulip stream:
+
+1. Visit your {{ subscriptions_html|safe }} and click on the stream
+   row to expand it.
+
+2. Copy the stream email address(e.g. `{{ email_gateway_example }}`).
+   If the stream name contains special characters, we've transformed
+   the name so it is a safe email recipient.
+
+3. Send an email (To, CC, and BCC all work) to the stream email address.
+   The email subject will become the stream topic, and the email
+   body will become the Zulip message content.
+
+Please note that it may take up to one minute for the message to show
+up in Zulip.
diff --git a/zerver/lib/integrations.py b/zerver/lib/integrations.py
index 3520453d96..d5aa6cade2 100644
--- a/zerver/lib/integrations.py
+++ b/zerver/lib/integrations.py
@@ -252,7 +252,7 @@ INTEGRATIONS = {
     'asana': Integration('asana', 'asana', doc='zerver/integrations/asana.md'),
     'capistrano': Integration('capistrano', 'capistrano', display_name='Capistrano', doc='zerver/integrations/capistrano.md'),
     'codebase': Integration('codebase', 'codebase', doc='zerver/integrations/codebase.md'),
-    'email': EmailIntegration('email', 'email', doc='zerver/integrations/email.html'),
+    'email': EmailIntegration('email', 'email', doc='zerver/integrations/email.md'),
     'git': Integration('git', 'git', doc='zerver/integrations/git.md'),
     'google-calendar': Integration(
         'google-calendar',