diff --git a/requirements.txt b/requirements.txt
index 93656bf..e0720cd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,3 +8,4 @@ google-api-python-client==1.7.7
 django-ratelimit==2.0.0
 boto3==1.9.86
 premailer==3.2.0
+markdown-urlize==0.2.0
diff --git a/selfserv/jinja2.py b/selfserv/jinja2.py
index a9bbc88..0567d70 100644
--- a/selfserv/jinja2.py
+++ b/selfserv/jinja2.py
@@ -42,6 +42,6 @@ def environment(**options):
 		'MEDIA_URL': settings.MEDIA_URL,
 	})
 	env.filters.update({
-		'markdown': lambda x: Markup(markdown.markdown(x))
+		'markdown': lambda x: Markup(markdown.markdown(x, extensions=['nl2br', 'mdx_urlize']))
 	})
 	return env