diff --git a/browser/concept_macros.pt b/browser/concept_macros.pt
index 1668cf2..b1fdc34 100644
--- a/browser/concept_macros.pt
+++ b/browser/concept_macros.pt
@@ -45,11 +45,11 @@
 </metal:textline>
 
 
-<metal:textline define-macro="display_email">
+<metal:email define-macro="display_email">
       <a href="#"
          tal:attributes="href string:mailto:$value"
          tal:content="value"></a>
-</metal:textline>
+</metal:email>
 
 
 <metal:parents define-macro="conceptparents">
diff --git a/configure.zcml b/configure.zcml
index b610cad..7bb881b 100644
--- a/configure.zcml
+++ b/configure.zcml
@@ -370,6 +370,8 @@
            name="number" />
   <adapter factory="cybertools.composer.schema.field.DateFieldInstance"
            name="date" />
+  <adapter factory="cybertools.composer.schema.field.EmailFieldInstance"
+           name="email" />
   <adapter factory="cybertools.composer.schema.field.BooleanFieldInstance"
            name="boolean" />
   <adapter factory="cybertools.composer.schema.field.FileUploadFieldInstance"
diff --git a/organize/schema.py b/organize/schema.py
index afe87f7..6258d7b 100644
--- a/organize/schema.py
+++ b/organize/schema.py
@@ -39,7 +39,6 @@ class PersonSchemaFactory(SchemaFactory):
         schema = super(PersonSchemaFactory, self).__call__(interface, **kw)
         schema.fields.phoneNumbers.instance_name ='simplelist'
         schema.fields.birthDate.display_format = ('date', 'long')
-        schema.fields.email.display_renderer = 'display_email'
         return schema
 
 
diff --git a/tests/setup.py b/tests/setup.py
index c085193..96e508d 100644
--- a/tests/setup.py
+++ b/tests/setup.py
@@ -31,6 +31,7 @@ from cybertools.browser.controller import Controller
 from cybertools.composer.schema.factory import SchemaFactory
 from cybertools.composer.schema.field import FieldInstance, NumberFieldInstance
 from cybertools.composer.schema.field import DateFieldInstance, BooleanFieldInstance
+from cybertools.composer.schema.field import EmailFieldInstance
 from cybertools.composer.schema.instance import Instance, Editor
 from cybertools.relation.tests import IntIdsStub
 from cybertools.relation.registry import RelationRegistry
@@ -123,6 +124,7 @@ class TestSite(object):
         component.provideAdapter(FieldInstance)
         component.provideAdapter(NumberFieldInstance, name='number')
         component.provideAdapter(DateFieldInstance, name='date')
+        component.provideAdapter(EmailFieldInstance, name='email')
         component.provideAdapter(BooleanFieldInstance, name='boolean')
         component.provideAdapter(SchemaFactory)
         component.provideAdapter(ResourceSchemaFactory)