diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml
index a703b14c4ca0bde0a51a531783d85f8be1ccd853..072c8f6540c07806bee17a34c920ec09b2de1bd5 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts.xml
@@ -12,6 +12,12 @@
               <dictionary/>
             </value>
         </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>scripts</string> </value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts/DCWorkflow_validate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts/DCWorkflow_validate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..9ed33f3136e507a6adbccc92512b9b8b6dcb65d1
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/scripts/DCWorkflow_validate.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>Script_magic</string> </key>
+            <value> <int>3</int> </value>
+        </item>
+        <item>
+            <key> <string>_bind_names</string> </key>
+            <value>
+              <object>
+                <klass>
+                  <global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
+                </klass>
+                <tuple/>
+                <state>
+                  <dictionary>
+                    <item>
+                        <key> <string>_asgns</string> </key>
+                        <value>
+                          <dictionary>
+                            <item>
+                                <key> <string>name_container</string> </key>
+                                <value> <string>container</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_context</string> </key>
+                                <value> <string>context</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_m_self</string> </key>
+                                <value> <string>script</string> </value>
+                            </item>
+                            <item>
+                                <key> <string>name_subpath</string> </key>
+                                <value> <string>traverse_subpath</string> </value>
+                            </item>
+                          </dictionary>
+                        </value>
+                    </item>
+                  </dictionary>
+                </state>
+              </object>
+            </value>
+        </item>
+        <item>
+            <key> <string>_body</string> </key>
+            <value> <string>"""\n
+This script is invoked each time a new message is validated\n
+The previous version is archived automatically.\n
+"""\n
+document = state_change[\'object\']\n
+reference = document.getReference()\n
+if not reference:\n
+  # If this object has no reference, we can not do anything\n
+  return\n
+portal = document.getPortalObject()\n
+portal_catalog = portal.portal_catalog\n
+search_kw = dict(reference=reference,\n
+                 validation_state="validated",\n
+                 uid=\'NOT %s\' %document.getUid())\n
+for old_document in portal_catalog(**search_kw):\n
+  old_document = old_document.getObject()\n
+  old_document.archive()\n
+</string> </value>
+        </item>
+        <item>
+            <key> <string>_params</string> </key>
+            <value> <string>state_change</string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>DCWorkflow_validate</string> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/archived.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/archived.xml
new file mode 100644
index 0000000000000000000000000000000000000000..66f2faf5ef0c6850193201cacd07042a940c122f
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/archived.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>archived</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Archived</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Add portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Delete objects</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml
index d4bf406f4d065f3e565a3cc0cdf330ceceb37c26..e937d76fa61a058890a53e17c4f98c1ad9e42c05 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/deleted.xml
@@ -41,7 +41,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml
index 3ce6ed717fc2b62771c481c5ad712e0b8e7ec712..57d75a2fb15023fe93b41187f2666ae1dc293809 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/draft.xml
@@ -48,7 +48,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/invalidated.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/invalidated.xml
new file mode 100644
index 0000000000000000000000000000000000000000..ca4546e4c50eb98f14ae52e616efbdb0e38e88ef
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/invalidated.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="StateDefinition" module="Products.DCWorkflow.States"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>invalidated</string> </value>
+        </item>
+        <item>
+            <key> <string>permission_roles</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Invalidated</string> </value>
+        </item>
+        <item>
+            <key> <string>transitions</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+        <item>
+            <key> <string>type_list</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>Access contents information</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Add portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Delete objects</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>Modify portal content</string> </key>
+                    <value>
+                      <tuple/>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>View</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Assignee</string>
+                        <string>Assignor</string>
+                        <string>Associate</string>
+                        <string>Auditor</string>
+                        <string>Manager</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml
index 9701d1d2413f8823b5400ff5285f0346af25dd95..dd6b5ad67534e47a9fbb7fe3dcdca0d91997d7b0 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/submitted.xml
@@ -46,7 +46,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml
index 21614a82d2167ae47ff01bd7b2530ed416520064..73bd0cdab882cdcf91fc63500596843709217df8 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/states/validated.xml
@@ -28,6 +28,7 @@
             <key> <string>transitions</string> </key>
             <value>
               <tuple>
+                <string>archive</string>
                 <string>invalidate</string>
                 <string>invalidate_action</string>
               </tuple>
@@ -44,7 +45,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="PersistentMapping" module="Persistence.mapping"/>
+      <tuple>
+        <global name="PersistentMapping" module="Persistence.mapping"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/archive.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/archive.xml
new file mode 100644
index 0000000000000000000000000000000000000000..c428608534f2dcda398a649c6ffb75c093fa6b9e
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/archive.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="TransitionDefinition" module="Products.DCWorkflow.Transitions"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>workflow</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>after_script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <none/>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>archive</string> </value>
+        </item>
+        <item>
+            <key> <string>new_state_id</string> </key>
+            <value> <string>archived</string> </value>
+        </item>
+        <item>
+            <key> <string>script_name</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>title</string> </key>
+            <value> <string>Archive Message</string> </value>
+        </item>
+        <item>
+            <key> <string>trigger_type</string> </key>
+            <value> <int>2</int> </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml
index b86207ff33d851f460ea15b1b1ee8e8487bd55ff..873e0d81364a12e4338e3cdc2e1f1a9eae40cc49 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/delete_action.xml
@@ -57,7 +57,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml
index 8458c78266a19ddc5726c301f4928ee419c6eec0..33f8530e62ec0f1a71552a7ff496900faa55630a 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate.xml
@@ -10,6 +10,10 @@
             <key> <string>actbox_category</string> </key>
             <value> <string>workflow</string> </value>
         </item>
+        <item>
+            <key> <string>actbox_icon</string> </key>
+            <value> <string></string> </value>
+        </item>
         <item>
             <key> <string>actbox_name</string> </key>
             <value> <string></string> </value>
@@ -38,7 +42,7 @@
         </item>
         <item>
             <key> <string>new_state_id</string> </key>
-            <value> <string>draft</string> </value>
+            <value> <string>invalidated</string> </value>
         </item>
         <item>
             <key> <string>script_name</string> </key>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml
index d0f07ae6c95379b3c66d2486ab9613a86cce7038..2b3b1e851f6431876c3963a5ef3dbbf849e478e8 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/invalidate_action.xml
@@ -57,7 +57,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml
index b99682467ec2f0971b312dcc7d9567fd0b5e0f44..5921388af53a1e79f85c9de58b6620c28437ce4d 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/reject_action.xml
@@ -57,7 +57,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml
index 8e397fee8add8382ec1d40e8234332704c28ae4e..4dd63c0c3627866f673ecbe99b72f0c0ead1c412 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/submit_action.xml
@@ -57,7 +57,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml
index 0d64b3866c8ac5e816da83c695802a4e1ff9ab06..91151f571ea13adc76d86305dabf9ae33741c34d 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/transitions/validate_action.xml
@@ -57,7 +57,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+      <tuple>
+        <global name="Guard" module="Products.DCWorkflow.Guard"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml
index cf9789beee1801e4043920f14b286afe2b7731b2..03e9664295a176c795a09e1e28a1ff3e232dfe89 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/action.xml
@@ -47,7 +47,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
index 99dc5a1238c7346b9b96a1d2ee7d5d05bf6f14b9..a1487eb1f4a6bec5b4be968e8806fab0f8daa0ff 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/actor.xml
@@ -47,7 +47,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml
index 37beb5e4f4c511a40ebafa6a978b08cce1002f06..f9ffdeace18e32086669cd8eb43fb11b21034749 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/comment.xml
@@ -47,7 +47,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml
index 44306b76d7460536661dc87f7786d58d071917d2..e97a0a7c5697b52407bdfaa324a91fc358b36b71 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/history.xml
@@ -47,7 +47,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml
index 5a517524eeccd0eb267d648b8a077e741acc3725..0e45efc0197a8a08b2e23242d70b3cf843c8543c 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/variables/time.xml
@@ -47,7 +47,10 @@
   </record>
   <record id="2" aka="AAAAAAAAAAI=">
     <pickle>
-      <global name="Expression" module="Products.CMFCore.Expression"/>
+      <tuple>
+        <global name="Expression" module="Products.CMFCore.Expression"/>
+        <tuple/>
+      </tuple>
     </pickle>
     <pickle>
       <dictionary>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml
index c3432aa051eac2d67ec0692a384adb38d1b6bac8..c7242ee1148db07bda32db11056a3ebf57c34632 100644
--- a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists.xml
@@ -12,6 +12,12 @@
               <dictionary/>
             </value>
         </item>
+        <item>
+            <key> <string>_objects</string> </key>
+            <value>
+              <tuple/>
+            </value>
+        </item>
         <item>
             <key> <string>id</string> </key>
             <value> <string>worklists</string> </value>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/draft_to_submit.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/draft_to_submit.xml
new file mode 100644
index 0000000000000000000000000000000000000000..2df6f6382e389aaef8acfbdc819bce99d0b00bd2
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/draft_to_submit.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>global</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Messages to Submit (%(count)s)</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+noftification_message_module?validation_state=draft&local_roles=%(local_roles)s&portal_type=%(portal_type)s&reset=1
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Message to submit</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>draft_to_submit</string> </value>
+        </item>
+        <item>
+            <key> <string>var_matches</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Owner</string>
+                <string>Assignee</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Notification Message</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>validation_state</string> </key>
+                    <value>
+                      <tuple>
+                        <string>draft</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/submitted_to_validate.xml b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/submitted_to_validate.xml
new file mode 100644
index 0000000000000000000000000000000000000000..6770f07a96c619ecc1c07ffff6cd5708d09b3668
--- /dev/null
+++ b/bt5/erp5_base/WorkflowTemplateItem/portal_workflow/notification_message_workflow/worklists/submitted_to_validate.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0"?>
+<ZopeData>
+  <record id="1" aka="AAAAAAAAAAE=">
+    <pickle>
+      <global name="WorklistDefinition" module="Products.DCWorkflow.Worklists"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>actbox_category</string> </key>
+            <value> <string>global</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_icon</string> </key>
+            <value> <string></string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_name</string> </key>
+            <value> <string>Messages to Validate (%(count)s)</string> </value>
+        </item>
+        <item>
+            <key> <string>actbox_url</string> </key>
+            <value> <string encoding="cdata"><![CDATA[
+
+noftification_message_module?validation_state=submitted&local_roles=%(local_roles)s&portal_type=%(portal_type)s&reset=1
+
+]]></string> </value>
+        </item>
+        <item>
+            <key> <string>description</string> </key>
+            <value> <string>Submitted to validate</string> </value>
+        </item>
+        <item>
+            <key> <string>guard</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
+            </value>
+        </item>
+        <item>
+            <key> <string>id</string> </key>
+            <value> <string>submitted_to_validate</string> </value>
+        </item>
+        <item>
+            <key> <string>var_matches</string> </key>
+            <value>
+              <persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="2" aka="AAAAAAAAAAI=">
+    <pickle>
+      <global name="Guard" module="Products.DCWorkflow.Guard"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>roles</string> </key>
+            <value>
+              <tuple>
+                <string>Assignor</string>
+              </tuple>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+  <record id="3" aka="AAAAAAAAAAM=">
+    <pickle>
+      <global name="PersistentMapping" module="Persistence.mapping"/>
+    </pickle>
+    <pickle>
+      <dictionary>
+        <item>
+            <key> <string>data</string> </key>
+            <value>
+              <dictionary>
+                <item>
+                    <key> <string>portal_type</string> </key>
+                    <value>
+                      <tuple>
+                        <string>Notification Message</string>
+                      </tuple>
+                    </value>
+                </item>
+                <item>
+                    <key> <string>validation_state</string> </key>
+                    <value>
+                      <tuple>
+                        <string>submitted</string>
+                      </tuple>
+                    </value>
+                </item>
+              </dictionary>
+            </value>
+        </item>
+      </dictionary>
+    </pickle>
+  </record>
+</ZopeData>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index 4242f7fac9f281e0850289b9dd7797e351007a7c..062e64ab9d6cf8c8eeeaa6ffd783d1471d3a0302 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-1053
\ No newline at end of file
+1054
\ No newline at end of file