diff --git a/webapp/templates/kaehmy_message.html b/webapp/templates/kaehmy_message.html
index 44230e4..be9c260 100644
--- a/webapp/templates/kaehmy_message.html
+++ b/webapp/templates/kaehmy_message.html
@@ -3,7 +3,7 @@
 <div class="card" style="margin-top: 0.5rem; margin-bottom: 0">
     <div class="card-block">
         <h4>{{ message.name }}</h4>
-        <p>{{ message.message }}</p>
+        <p>{{ message.message|linebreaks }}</p>
 
         <h6 class="card-subtitle mb-2 text-muted">{{ message.timestamp }}</h6>
         <div>
diff --git a/webapp/views.py b/webapp/views.py
index dc1752b..39e6bb3 100644
--- a/webapp/views.py
+++ b/webapp/views.py
@@ -240,6 +240,7 @@ def kaehmy_list_view(request, *args, **kwargs):
     filter_options_custom_list = [(r.id, r.name, r.form_count) for r in filter_options_custom]
 
     filter_options = filter_options_preset_list + filter_options_custom_list
+    filter_options.sort(key=lambda f: f[1])
 
     context = {
         'applications': applications,