diff --git a/templates/index.html.tera b/templates/index.html.tera
index e6d9ee2..cf358a6 100644
--- a/templates/index.html.tera
+++ b/templates/index.html.tera
@@ -11,7 +11,7 @@
         {% for post in posts %}
             <div>
                 <a name="{{ post.id }}"></a>
-                <p>{{ post.message }}</p>
+                <p>{{ post.message | linebreaksbr | safe }}</p>
                 <div>
                     <ul>
                         <li><a href="{{ post.href.post }}" title="Created">{{ post.time }}</a></li>
diff --git a/templates/post.html.tera b/templates/post.html.tera
index ae1145d..52075f0 100644
--- a/templates/post.html.tera
+++ b/templates/post.html.tera
@@ -2,7 +2,7 @@
 {% block content %}
 <div>
     <a name="{{ post.id }}"></a>
-    <p>{{ post.message }}</p>
+    <p>{{ post.message | linebreaksbr | safe }}</p>
     <div>
         <ul>
             <li><a href="{{ post.href.post }}" title="Created">{{ post.time }}</a></li>