diff --git a/app/src/main/kotlin/net/h34t/filemure/TemplateModifiers.kt b/app/src/main/kotlin/net/h34t/filemure/TemplateModifiers.kt
index 9901b46..b2bcda2 100644
--- a/app/src/main/kotlin/net/h34t/filemure/TemplateModifiers.kt
+++ b/app/src/main/kotlin/net/h34t/filemure/TemplateModifiers.kt
@@ -8,12 +8,20 @@ class TemplateModifiers : Frame.Modifiers, Limbo.Modifiers, DocumentCreateForm.M
     FilePreview.Modifiers, DocumentEditForm.Modifiers, FileList.Modifiers,
     net.h34t.filemure.tpl.Document.Modifiers, OverviewDocuments.Modifiers, Search.Modifiers, Tags.Modifiers {
 
+    private val linebreaks = Regex("\\v+")
+
     fun hashPrefix(arg: String): String {
         return URLEncoder.encode(arg, Charsets.UTF_8)
     }
 
-    override fun starPrefix(arg: String): String {
+    override fun starPrefix(arg: String) = html(arg)
+
+    override fun html(arg: String): String {
         return StringEscapeUtils.escapeHtml4(arg)
     }
 
+
+//    override fun nl2br(arg: String): String {
+//        return arg.replace(linebreaks, "<br/>\n")
+//    }
 }
diff --git a/app/src/main/tpl/net.h34t.filemure.tpl/Document.tpl.html b/app/src/main/tpl/net.h34t.filemure.tpl/Document.tpl.html
index 2c95545..a46a405 100644
--- a/app/src/main/tpl/net.h34t.filemure.tpl/Document.tpl.html
+++ b/app/src/main/tpl/net.h34t.filemure.tpl/Document.tpl.html
@@ -12,7 +12,7 @@
     <div class="space"></div>
 
     <b>Description</b>
-    <div>{*$description}</div>
+    <pre>{$description|html}</pre>
 
 </fieldset>