diff --git a/src/feature_info_service.py b/src/feature_info_service.py
index 69da9a3..e51ea72 100644
--- a/src/feature_info_service.py
+++ b/src/feature_info_service.py
@@ -553,6 +553,11 @@ def render_value(self, value, htmlEscape=True):
                 r'^(https?:\/\/.*)$',
                 lambda m: m.expand(r'<a href="\1" target="_blank">Link</a>')
             ))
+            # E-Mails
+            rules.append((
+                r'^([\w\-\.]+@([\w-]+\.)+[\w-]{2,4})$',
+                lambda m: m.expand(r'<a href="mailto:\1">\1</a>')
+            ))
             # Attachments
             rules.append((
                 r'^attachment://(.+)/([^/]+)$',