diff --git a/autotests/data/event-2.html b/autotests/data/event-2.html
--- a/autotests/data/event-2.html
+++ b/autotests/data/event-2.html
@@ -84,19 +84,19 @@
       <tr>
         <th valign="top">Required Participants:</th>
         <td>
-          <a href="uid:62645952">Volker Krause
+          <a href="mailto:vkrause@kde.org">Volker Krause
     </a>
           <a href="mailto:Volker Krause %3Cvkrause@kde.org%3E">
             <img src="file:mail-message-new" align="top" height="16" width="16" alt="Send email" title="Send email" />
           </a>
           <br />
-          <a href="uid:35926528">Christian Mollekopf
+          <a href="mailto:cmollekopf@gmail.com">Christian Mollekopf
     </a>
           <a href="mailto:Christian Mollekopf %3Ccmollekopf@gmail.com%3E">
             <img src="file:mail-message-new" align="top" height="16" width="16" alt="Send email" title="Send email" />
           </a>
           <br />
-          <a href="uid:64325328">Sandro Knauß
+          <a href="mailto:sknauss@kde.org">Sandro Knauß
     </a>
           <a href="mailto:Sandro Knauß %3Csknauss@kde.org%3E">
             <img src="file:mail-message-new" align="top" height="16" width="16" alt="Send email" title="Send email" />
diff --git a/autotests/data/todo-1.html b/autotests/data/todo-1.html
--- a/autotests/data/todo-1.html
+++ b/autotests/data/todo-1.html
@@ -83,7 +83,7 @@
       <tr>
         <th valign="top">Required Participants:</th>
         <td>
-          <a href="uid:68225424">Flatmate
+          <a href="mailto:my@flat.mate">Flatmate
     </a>
           <a href="mailto:Flatmate %3Cmy@flat.mate%3E">
             <img src="file:mail-message-new" align="top" height="16" width="16" alt="Send email" title="Send email" />
diff --git a/src/templates/attendee_row.html b/src/templates/attendee_row.html
--- a/src/templates/attendee_row.html
+++ b/src/templates/attendee_row.html
@@ -3,7 +3,6 @@
 {% endif %}
 
 {% if attendee.uid %}
-    <!--<a href="uid:{{ attendee.uid }}"> -->
     <a href="mailto:{{ attendee.email }}">
     {% if attendee.name %}
         {{ attendee.name }}