diff --git a/conversations/templates/conversations/_message_detail.html b/conversations/templates/conversations/_message_detail.html
index 090db4f..143407c 100644
--- a/conversations/templates/conversations/_message_detail.html
+++ b/conversations/templates/conversations/_message_detail.html
@@ -1,8 +1,10 @@
+{% load proposals_tags %}
+
- {{ message.content|linebreaksbr }}
+ {% markdown message.content %}
diff --git a/conversations/templates/conversations/emails/message.html b/conversations/templates/conversations/emails/message.html
index af1a03d..142d995 100644
--- a/conversations/templates/conversations/emails/message.html
+++ b/conversations/templates/conversations/emails/message.html
@@ -1,4 +1,4 @@
-{{ content|linebreaksbr }}
+{% load proposals_tags %}{% markdown content %}
{% if answering %}
diff --git a/conversations/templates/conversations/emails/talk_notification.html b/conversations/templates/conversations/emails/talk_notification.html
index 1db0dae..a8056ae 100644
--- a/conversations/templates/conversations/emails/talk_notification.html
+++ b/conversations/templates/conversations/emails/talk_notification.html
@@ -1,11 +1,11 @@
-Hi!
+{% load proposals_tags %}Hi!
A new {{ talk.event }} has been proposed by {{ proposer.profile }}!
Title: {{ talk.title }}
Description:
-{{ talk.description|linebreaksbr }}
+{% markdown talk.description %}
{% if answering %}
Reply to this email directly to comment this talk.{% endif %}