diff --git a/src/pfwbged/basecontent/behaviors.py b/src/pfwbged/basecontent/behaviors.py
index b8b0968..2429015 100644
--- a/src/pfwbged/basecontent/behaviors.py
+++ b/src/pfwbged/basecontent/behaviors.py
@@ -48,26 +48,27 @@ class IRelatedTask(model.Schema):
 class IPfwbDocument(model.Schema):
     """Fields that are specific to Pfwb document"""
 
-    keywords = ThesaurusKeywords(title=_(u'Keywords'),
-                                 required=False)
-
-
-class IPfwbIncomingMail(model.Schema):
-    """Fields that are specific to Pfwb incoming mail"""
-
     treated_by = schema.List(title=_(u"Treated by"),
                              required=False,
                              value_type=schema.Choice(vocabulary=u'collective.dms.basecontent.treating_groups')
                              )
 
+    keywords = ThesaurusKeywords(title=_(u'Keywords'),
+                                 required=False)
+
+    form.widget(treated_by=AjaxChosenMultiFieldWidget)
+    form.order_before(treated_by='treating_groups')
+
+
+class IPfwbIncomingMail(model.Schema):
+    """Fields that are specific to Pfwb incoming mail"""
+
     in_copy = schema.List(title=_(u"In copy"),
                           required=False,
                           value_type=schema.Choice(vocabulary=u'collective.dms.basecontent.recipient_groups')
                           )
 
-    form.widget(treated_by=AjaxChosenMultiFieldWidget)
     form.widget(in_copy=AjaxChosenMultiFieldWidget)
-    form.order_before(treated_by='treating_groups')
     form.order_after(in_copy='treated_by')
     form.order_before(in_copy='treating_groups')