diff --git a/src/pfwbged/basecontent/profiles/default/types/pfwb.boarddecision.xml b/src/pfwbged/basecontent/profiles/default/types/pfwb.boarddecision.xml
index 52e9165..f85500c 100644
--- a/src/pfwbged/basecontent/profiles/default/types/pfwb.boarddecision.xml
+++ b/src/pfwbged/basecontent/profiles/default/types/pfwb.boarddecision.xml
@@ -14,7 +14,8 @@
   <element value="plone.app.content.interfaces.INameFromTitle"/>
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="pfwbged.basecontent.behaviors.IPfwbDocument"/>
-  <element value="pfwbged.basecontent.behaviors.IMeetingDate"/>
+  <element value="pfwbged.basecontent.behaviors.IPfwbIncomingMail"/>
+  <element value="pfwbged.basecontent.behaviors.IDeadline"/>
  </property>
 
  <!-- Contained Types -->
diff --git a/src/pfwbged/basecontent/profiles/default/types/pfwb.insurancedocument.xml b/src/pfwbged/basecontent/profiles/default/types/pfwb.insurancedocument.xml
index 3dbdee7..b5f6e6e 100644
--- a/src/pfwbged/basecontent/profiles/default/types/pfwb.insurancedocument.xml
+++ b/src/pfwbged/basecontent/profiles/default/types/pfwb.insurancedocument.xml
@@ -15,6 +15,8 @@
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="pfwbged.basecontent.behaviors.IPfwbDocument"/>
   <element value="pfwbged.basecontent.behaviors.IMeetingDate"/>
+  <element value="pfwbged.basecontent.behaviors.IPfwbIncomingMail"/>
+  <element value="pfwbged.basecontent.behaviors.IDeadline"/>
  </property>
 
  <!-- Contained Types -->
diff --git a/src/pfwbged/basecontent/profiles/default/types/pfwb.medicalcertificate.xml b/src/pfwbged/basecontent/profiles/default/types/pfwb.medicalcertificate.xml
index b8a083b..1027a71 100644
--- a/src/pfwbged/basecontent/profiles/default/types/pfwb.medicalcertificate.xml
+++ b/src/pfwbged/basecontent/profiles/default/types/pfwb.medicalcertificate.xml
@@ -14,7 +14,8 @@
   <element value="plone.app.content.interfaces.INameFromTitle"/>
   <element value="plone.app.dexterity.behaviors.metadata.IBasic"/>
   <element value="pfwbged.basecontent.behaviors.IPfwbDocument"/>
-  <element value="pfwbged.basecontent.behaviors.IMeetingDate"/>
+  <element value="pfwbged.basecontent.behaviors.IPfwbIncomingMail"/>
+  <element value="pfwbged.basecontent.behaviors.IDeadline"/>
  </property>
 
  <!-- Contained Types -->
diff --git a/src/pfwbged/basecontent/types.py b/src/pfwbged/basecontent/types.py
index bb90e79..5de62f9 100644
--- a/src/pfwbged/basecontent/types.py
+++ b/src/pfwbged/basecontent/types.py
@@ -5,6 +5,7 @@ from plone.autoform import directives as form
 
 from collective.contact.core.schema import ContactList, ContactChoice
 from collective.dms.basecontent.dmsdocument import IDmsDocument, DmsDocument
+from collective.dms.mailcontent.dmsmail import IDmsIncomingMail, DmsIncomingMail
 
 from pfwbged.basecontent import _
 
@@ -23,10 +24,10 @@ class PfwbBaseDocument(DmsDocument):
     implements(IPfwbBaseDocument)
 
 
-class IMedicalCertificate(IPfwbBaseDocument):
+class IMedicalCertificate(IDmsIncomingMail):
     """ """
 
-class MedicalCertificate(PfwbBaseDocument):
+class MedicalCertificate(DmsIncomingMail):
     implements(IMedicalCertificate)
 
 
@@ -54,11 +55,14 @@ class Agenda(PfwbBaseDocument):
     implements(IAgenda)
 
 
-class IBoardDecision(IMeetingDate):
+class IBoardDecision(IDmsIncomingMail):
     """ """
+    meeting_date = schema.Date(
+            title=_(u'Meeting Date'),
+            required=False)
 
 
-class BoardDecision(PfwbBaseDocument):
+class BoardDecision(DmsIncomingMail):
     implements(IBoardDecision)
 
 
@@ -93,14 +97,11 @@ class InsuranceDocument(PfwbBaseDocument):
     implements(IInsuranceDocument)
 
 
-class IInvoice(IPfwbBaseDocument):
+class IInvoice(IDmsIncomingMail):
     """ """
-    invoice_number = schema.TextLine(
-            title=_(u'Invoice Number'),
-            required=False)
 
 
-class Invoice(PfwbBaseDocument):
+class Invoice(DmsIncomingMail):
     implements(IInvoice)