diff --git a/setup.py b/setup.py
index 2b418d2..d2af9b6 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ setup(name='collective.dms.mailcontent',
           'plone.directives.form',
           'collective.dms.basecontent',
           'collective.contact.core',
+          'plone.formwidget.datetime',
 #          'plone.app.relationfield',
           'five.grok',
       ],
diff --git a/src/collective/dms/mailcontent/configure.zcml b/src/collective/dms/mailcontent/configure.zcml
index 4b7362f..1961690 100644
--- a/src/collective/dms/mailcontent/configure.zcml
+++ b/src/collective/dms/mailcontent/configure.zcml
@@ -17,6 +17,7 @@
   <include package="plone.app.dexterity" />
   <include package="plone.supermodel" />
   <include package="plone.app.relationfield" />
+  <include package="plone.formwidget.datetime" />
   <include package="collective.dms.basecontent" />
   <include package="collective.contact.core" />
 
diff --git a/src/collective/dms/mailcontent/dmsmail.py b/src/collective/dms/mailcontent/dmsmail.py
index e5fd207..0fbf372 100644
--- a/src/collective/dms/mailcontent/dmsmail.py
+++ b/src/collective/dms/mailcontent/dmsmail.py
@@ -1,30 +1,30 @@
 import datetime
+
+from five import grok
+
+from z3c.form import validator
 from zope import schema
-#from zope.component import adapts
-from zope.interface import implements
-from zope.interface import Invalid
 from zope.component import getUtility, getMultiAdapter
 from zope.component.interfaces import ComponentLookupError
+from zope.interface import Invalid
+from zope.interface import implements
 from zope.lifecycleevent.interfaces import IObjectAddedEvent
-from plone.registry.interfaces import IRegistry
-from five import grok
+
 from Products.CMFPlone.utils import getToolByName
-#from plone.dexterity.content import Container
+
+from plone.autoform import directives as form
 from plone.dexterity.schema import DexteritySchemaPolicy
+from plone.directives.form import default_value
+from plone.formwidget.datetime.z3cform.widget import DateFieldWidget
 from plone.indexer import indexer
-from z3c.form import validator
+from plone.registry.interfaces import IRegistry
+
 from collective.dms.basecontent.relateddocs import RelatedDocs
-
-#from plone.supermodel import model
-
 from collective.dms.basecontent.dmsdocument import IDmsDocument, DmsDocument
 from collective.contact.core.schema import ContactList, ContactChoice
 
 from . import _
 
-from plone.autoform import directives as form
-from plone.directives.form import default_value
-
 
 def validateIndexValueUniqueness(context, portal_type, index_name, value):
     """
@@ -54,8 +54,10 @@ class IDmsIncomingMail(IDmsDocument):
     """ """
 
     original_mail_date = schema.Date(title=_(u'Original Mail Date'), required=False)
+    form.widget(original_mail_date=DateFieldWidget)
 
     reception_date = schema.Date(title=_(u'Reception Date'), required=False)
+    form.widget(reception_date=DateFieldWidget)
 
     external_reference_no = schema.TextLine(
         title=_(u"External Reference Number"),
diff --git a/src/collective/dms/mailcontent/profiles/default/metadata.xml b/src/collective/dms/mailcontent/profiles/default/metadata.xml
index 2ffc4c7..756a08f 100644
--- a/src/collective/dms/mailcontent/profiles/default/metadata.xml
+++ b/src/collective/dms/mailcontent/profiles/default/metadata.xml
@@ -1,8 +1,9 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>0001</version>
+  <version>1</version>
   <dependencies>
     <dependency>profile-plone.app.dexterity:default</dependency>
+    <dependency>profile-plone.formwidget.datetime:default</dependency>
     <dependency>profile-collective.dms.basecontent:default</dependency>
     <dependency>profile-collective.contact.core:default</dependency>
   </dependencies>