diff --git a/src/collective/dms/mailcontent/dmsmail.py b/src/collective/dms/mailcontent/dmsmail.py
index 53d2e6e..1ccc3b8 100644
--- a/src/collective/dms/mailcontent/dmsmail.py
+++ b/src/collective/dms/mailcontent/dmsmail.py
@@ -62,8 +62,8 @@ class InternalReferenceIncomingMailValidator(validator.SimpleFieldValidator):
 class IDmsIncomingMail(IDmsDocument):
     """ """
 
-    original_mail_date = schema.Date(title=_(u'Original Mail Date'), required=False)
-    form.widget(original_mail_date=DateFieldWidget)
+    mail_date = schema.Date(title=_(u'Original Mail Date'), required=False)
+    form.widget(mail_date=DateFieldWidget)
 
     reception_date = schema.Datetime(title=_(u'Reception Date'), required=False)
     form.widget(reception_date=DatetimeFieldWidget)
@@ -91,7 +91,7 @@ class IDmsIncomingMail(IDmsDocument):
 
     form.order_before(sender='treating_groups')
     form.order_after(recipients='sender')
-    form.order_before(original_mail_date='treating_groups')
+    form.order_before(mail_date='treating_groups')
     form.order_before(reception_date='treating_groups')
     form.order_before(internal_reference_no='treating_groups')
     form.order_before(external_reference_no='treating_groups')
@@ -114,7 +114,7 @@ def receptionDateDefaultValue(data):
     return reception_date
 
 
-#@default_value(field=IDmsIncomingMail['original_mail_date'])
+#@default_value(field=IDmsIncomingMail['mail_date'])
 def originalMailDateDefaultValue(data):
     # return 3 days before
     return datetime.date.today() - datetime.timedelta(3)