diff --git a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
index 8c07b1692327af3fb3d79963c5ecb4b52fbdd293..963ba1289c2267f0dec0aaa3b5956639baed3706 100644
--- a/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
+++ b/bt5/erp5_crm/WorkflowTemplateItem/portal_workflow/sale_opportunity_workflow/scripts/mail_message.xml
@@ -72,8 +72,9 @@ document = state_change[\'object\']\n
 # XXX Wrong way to get email or even to send an email\n
 PersonModule_viewPersonList = document.getClientValueList(portal_type="Person") # should become getDestinationSectionList()\n
 email_list = map(lambda x:x.getDefaultEmailText(), PersonModule_viewPersonList)\n
-document.MailHost.send(message, mto=email_list, mfrom=context.portal_preferences.getPreferredEventSenderEmail(),\n
-                                  subject=string_subject)\n
+document.MailHost.send(message, mto=email_list,\n
+                  mfrom=document.portal_preferences.getPreferredEventSenderEmail(),\n
+                  subject=string_subject)\n
 </string> </value>
         </item>
         <item>
@@ -125,7 +126,6 @@ document.MailHost.send(message, mto=email_list, mfrom=context.portal_preferences
                             <string>PersonModule_viewPersonList</string>
                             <string>map</string>
                             <string>email_list</string>
-                            <string>context</string>
                           </tuple>
                         </value>
                     </item>
diff --git a/bt5/erp5_crm/bt/revision b/bt5/erp5_crm/bt/revision
index b854a292176003137b48b2f2eb6267c6c3085c9b..6d3e9dc78d4961c7934c3a850541613398863921 100644
--- a/bt5/erp5_crm/bt/revision
+++ b/bt5/erp5_crm/bt/revision
@@ -1 +1 @@
-128
\ No newline at end of file
+129
\ No newline at end of file
diff --git a/bt5/erp5_crm/bt/template_catalog_datetime_key_list b/bt5/erp5_crm/bt/template_catalog_datetime_key_list
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391