diff --git a/setup.py b/setup.py
index 190d7d9..9b190fa 100644
--- a/setup.py
+++ b/setup.py
@@ -20,23 +20,23 @@ setup(name='collective.dms.mailcontent',
       description="Mail content type for document management system",
       long_description=long_description,
       classifiers=[
-        "Environment :: Web Environment",
-        "Framework :: Plone",
-        "Framework :: Plone :: 4.2",
-        "Framework :: Plone :: 4.3",
-        "Operating System :: OS Independent",
-        "Programming Language :: Python",
-        "Programming Language :: Python :: 2",
-        "Programming Language :: Python :: 2.7",
-        "Topic :: Software Development :: Libraries :: Python Modules",
-        ],
+          "Environment :: Web Environment",
+          "Framework :: Plone",
+          "Framework :: Plone :: 4.2",
+          "Framework :: Plone :: 4.3",
+          "Operating System :: OS Independent",
+          "Programming Language :: Python",
+          "Programming Language :: Python :: 2",
+          "Programming Language :: Python :: 2.7",
+          "Topic :: Software Development :: Libraries :: Python Modules",
+          ],
       keywords='',
       author='Ecreall, Entrouvert, IMIO',
       author_email='cedricmessiant@ecreall.com',
       url='https://github.com/collective/collective.dms.mailcontent',
       license='gpl',
       packages=find_packages('src'),
-      package_dir = {'': 'src'},
+      package_dir={'': 'src'},
       namespace_packages=['collective', 'collective.dms'],
       include_package_data=True,
       zip_safe=False,
@@ -48,7 +48,7 @@ setup(name='collective.dms.mailcontent',
           'collective.contact.core',
           'collective.dms.basecontent',
           'plone.formwidget.datetime',
-#          'plone.app.relationfield',
+          #'plone.app.relationfield',
           'five.grok',
       ],
       extras_require={
diff --git a/src/collective/dms/mailcontent/configure.zcml b/src/collective/dms/mailcontent/configure.zcml
index 2e767cb..2780b2a 100644
--- a/src/collective/dms/mailcontent/configure.zcml
+++ b/src/collective/dms/mailcontent/configure.zcml
@@ -12,6 +12,9 @@
   <include package=".upgrades" />
   <include file="behaviors.zcml" />
 
+  <include package="plone.directives.form" file="meta.zcml" />
+  <include package="plone.directives.form" />
+
   <grok:grok package="." />
 
   <i18n:registerTranslations directory="locales" />
@@ -20,9 +23,9 @@
   <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" />
+  <include package="plone.formwidget.datetime" />
 
   <genericsetup:registerProfile
       name="default"
diff --git a/src/collective/dms/mailcontent/dmsmail.py b/src/collective/dms/mailcontent/dmsmail.py
index 0e35e8f..25f3c97 100644
--- a/src/collective/dms/mailcontent/dmsmail.py
+++ b/src/collective/dms/mailcontent/dmsmail.py
@@ -15,7 +15,8 @@ from Products.CMFPlone.utils import getToolByName
 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, DatetimeFieldWidget
+from plone.formwidget.datetime.z3cform.widget import (DateFieldWidget,
+                                                      DatetimeFieldWidget)
 from plone.indexer import indexer
 from plone.registry.interfaces import IRegistry
 
diff --git a/src/collective/dms/mailcontent/profiles/default/metadata.xml b/src/collective/dms/mailcontent/profiles/default/metadata.xml
index 756a08f..cb6253e 100644
--- a/src/collective/dms/mailcontent/profiles/default/metadata.xml
+++ b/src/collective/dms/mailcontent/profiles/default/metadata.xml
@@ -3,8 +3,8 @@
   <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>
+    <dependency>profile-plone.formwidget.datetime:default</dependency>
   </dependencies>
 </metadata>