diff --git a/freepost/__init__.py b/freepost/__init__.py
index 215c4e3..c23627d 100755
--- a/freepost/__init__.py
+++ b/freepost/__init__.py
@@ -38,11 +38,11 @@ template = functools.partial (
             'md2txt': lambda text: bleach.clean (markdown.markdown (text),
                                                  tags=[], attributes={}, styles=[], strip=True),
             # Convert markdown to html
-            'md2html': lambda text: bleach.clean (markdown.markdown (
+            'md2html': lambda text: bleach.clean (bleach.linkify (markdown.markdown (
                                         text,
                                         # https://python-markdown.github.io/extensions/
                                         extensions=[ 'extra', 'admonition', 'nl2br', 'smarty' ],
-                                        output_format='html5')),
+                                        output_format='html5'))),
             # Get the domain part of a URL
             'netloc': lambda url: urlparse (url).netloc
         },