diff --git a/TODO.txt b/TODO.txt
index 539ce58..1865a9d 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,4 @@
 - verschiedene published einträge (facebook, webseite)
-- email im anmeldedisclamer in html
 - Save as Draft
 - Draft-Status
 - Done-Status
diff --git a/dav_events/templates/dav_events/emails/event_to_publish.txt b/dav_events/templates/dav_events/emails/event_to_publish.txt
index 1ec82eb..9c06881 100644
--- a/dav_events/templates/dav_events/emails/event_to_publish.txt
+++ b/dav_events/templates/dav_events/emails/event_to_publish.txt
@@ -20,28 +20,28 @@ Bearbeitungshinweis:
 <h6>{{ normalized_long_date }}{% if alt_normalized_long_date %}<br />
 ({% trans 'Ersatztermin' %}: {{ alt_normalized_long_date }})
 {% endif %}</h6>
-<p>{{ description|linebreaksbr }}</p>
+<p>{{ description|urlize|linebreaksbr }}</p>
 {% if mode == 'training' %}
 <p><strong>{% trans 'Kursinhalte' %}:</strong></p>
 {% if course_topic_2 %}<ul>
-  <li>{{ course_topic_1 }}</li>
-  <li>{{ course_topic_2 }}</li>
-{% if course_topic_3 %}  <li>{{ course_topic_3 }}</li>
-{% endif %}{% if course_topic_4 %}  <li>{{ course_topic_4 }}</li>
-{% endif %}{% if course_topic_5 %}  <li>{{ course_topic_5 }}</li>
-{% endif %}{% if course_topic_6 %}  <li>{{ course_topic_6 }}</li>
+  <li>{{ course_topic_1|urlize }}</li>
+  <li>{{ course_topic_2|urlize }}</li>
+{% if course_topic_3 %}  <li>{{ course_topic_3|urlize }}</li>
+{% endif %}{% if course_topic_4 %}  <li>{{ course_topic_4|urlize }}</li>
+{% endif %}{% if course_topic_5 %}  <li>{{ course_topic_5|urlize }}</li>
+{% endif %}{% if course_topic_6 %}  <li>{{ course_topic_6|urlize }}</li>
 {% endif %}</ul>
-{% else %}<p>{{ course_topic_1|linebreaksbr }}</p>{% endif %}
+{% else %}<p>{{ course_topic_1|urlize|linebreaksbr }}</p>{% endif %}
 <p><strong>{% trans 'Kursziele' %}:</strong></p>
 {% if course_goal_2 %}<ul>
-  <li>{{ course_goal_1 }}</li>
-  <li>{{ course_goal_2 }}</li>
-{% if course_goal_3 %}  <li>{{ course_goal_3 }}</li>
-{% endif %}{% if course_goal_4 %}  <li>{{ course_goal_4 }}</li>
-{% endif %}{% if course_goal_5 %}  <li>{{ course_goal_5 }}</li>
-{% endif %}{% if course_goal_6 %}  <li>{{ course_goal_6 }}</li>
+  <li>{{ course_goal_1|urlize }}</li>
+  <li>{{ course_goal_2|urlize }}</li>
+{% if course_goal_3 %}  <li>{{ course_goal_3|urlize }}</li>
+{% endif %}{% if course_goal_4 %}  <li>{{ course_goal_4|urlize }}</li>
+{% endif %}{% if course_goal_5 %}  <li>{{ course_goal_5|urlize }}</li>
+{% endif %}{% if course_goal_6 %}  <li>{{ course_goal_6|urlize }}</li>
 {% endif %}</ul>
-{% else %}<p>{{ course_goal_1|linebreaksbr }}</p>{% endif %}
+{% else %}<p>{{ course_goal_1|urlize|linebreaksbr }}</p>{% endif %}
 {% endif %}<hr id="system-readmore" />
 
 <p>
@@ -64,7 +64,7 @@ Bearbeitungshinweis:
 {% endif %}{% if trainer_2_fullname %}{% if mode == 'training' %}<strong>{% trans 'Ausbildungsteam' %}:</strong>{% else %}<strong>{% trans 'Team' %}:</strong>{% endif %} {{ trainer_firstname }} {{ trainer_familyname }}, {{ trainer_2_fullname }}{% if trainer_3_fullname %}, {{ trainer_3_fullname }}{% endif %}<br />
 {% endif %}{% if trainer_familyname %}<strong>{% trans 'Leitung' %}:</strong> {{ trainer_firstname }} {{ trainer_familyname }}{% if trainer_email or trainer_phone %} ({% if trainer_email %}<a href="mailto:{{ trainer_email }}">{{ trainer_email }}</a>{% endif %}{% if trainer_email and trainer_phone %}, {% endif %}{% if trainer_phone %}{{ trainer_phone }}{% endif %}){% endif %}
 {% endif %}</p>
-{% if registration_required and registration_howto %}<p>{{ registration_howto }}</p>
+{% if registration_required and registration_howto %}<p>{{ registration_howto|urlize }}</p>
 {% endif %}
 ---------- Veröffentlichung ----------
 {% if planned_publication_date %}Veröffentlichung starten: {{ planned_publication_date|date:'d.m.Y' }} 00:00:00
diff --git a/dav_events/templates/dav_events/event/default.html b/dav_events/templates/dav_events/event/default.html
index 841ac84..634c21f 100644
--- a/dav_events/templates/dav_events/event/default.html
+++ b/dav_events/templates/dav_events/event/default.html
@@ -22,53 +22,53 @@
         </li>
         <li class="list-group-item">
             <p>
-                {{ description|linebreaksbr }}
+                {{ description|urlize|linebreaksbr }}
             </p>
             {% if mode == 'training' %}
             <div>
                 <p><strong>{% trans 'Kursinhalte' %}:</strong></p>
                 {% if course_topic_2 %}
                 <ul>
-                    <li>{{ course_topic_1 }}</li>
-                    <li>{{ course_topic_2 }}</li>
+                    <li>{{ course_topic_1|urlize }}</li>
+                    <li>{{ course_topic_2|urlize }}</li>
                     {% if course_topic_3 %}
-                    <li>{{ course_topic_3 }}</li>
+                    <li>{{ course_topic_3|urlize }}</li>
                     {% endif %}
                     {% if course_topic_4 %}
-                    <li>{{ course_topic_4 }}</li>
+                    <li>{{ course_topic_4|urlize }}</li>
                     {% endif %}
                     {% if course_topic_5 %}
-                    <li>{{ course_topic_5 }}</li>
+                    <li>{{ course_topic_5|urlize }}</li>
                     {% endif %}
                     {% if course_topic_6 %}
-                    <li>{{ course_topic_6 }}</li>
+                    <li>{{ course_topic_6|urlize }}</li>
                     {% endif %}
                 </ul>
                 {% else %}
-                <p>{{ course_topic_1|linebreaksbr }}</p>
+                <p>{{ course_topic_1|urlize|linebreaksbr }}</p>
                 {% endif %}
             </div>
             <div>
                 <p><strong>{% trans 'Kursziele' %}:</strong></p>
                 {% if course_goal_2 %}
                 <ul>
-                    <li>{{ course_goal_1 }}</li>
-                    <li>{{ course_goal_2 }}</li>
+                    <li>{{ course_goal_1|urlize }}</li>
+                    <li>{{ course_goal_2|urlize }}</li>
                     {% if course_goal_3 %}
-                    <li>{{ course_goal_3 }}</li>
+                    <li>{{ course_goal_3|urlize }}</li>
                     {% endif %}
                     {% if course_goal_4 %}
-                    <li>{{ course_goal_4 }}</li>
+                    <li>{{ course_goal_4|urlize }}</li>
                     {% endif %}
                     {% if course_goal_5 %}
-                    <li>{{ course_goal_5 }}</li>
+                    <li>{{ course_goal_5|urlize }}</li>
                     {% endif %}
                     {% if course_goal_6 %}
-                    <li>{{ course_goal_6 }}</li>
+                    <li>{{ course_goal_6|urlize }}</li>
                     {% endif %}
                 </ul>
                 {% else %}
-                <p>{{ course_goal_1|linebreaksbr }}</p>
+                <p>{{ course_goal_1|urlize|linebreaksbr }}</p>
                 {% endif %}
 
             </div>
@@ -186,7 +186,7 @@
     </div>
     {% if registration_required and registration_howto %}
     <div class="panel-footer">
-        <p>{{ registration_howto }}</p>
+        <p>{{ registration_howto|urlize }}</p>
     </div>
     {% endif %}
 </div>