diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_send.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_send.xml
deleted file mode 100644
index 71b6f57bb83b816968db62b081f6cb4a13b64eba..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_send.xml
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>Python_magic</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>Script_magic</string> </key>
-            <value> <int>3</int> </value>
-        </item>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </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 encoding="cdata"><![CDATA[
-
-if body is None:\n
-  body = context.getTextContent() #XXX This does not support structured text format.\n
-\n
-# Subject\n
-if subject is None:\n
-  subject = context.getTitle()\n
-\n
-# From\n
-if from_url is None:\n
-  sender = context.getSourceValue()\n
-  if sender.getTitle():\n
-    from_url = \'"%s" <%s>\' % (sender.getTitle(),\n
-                            sender.getDefaultEmailText())\n
-  else:\n
-    from_url = sender.getDefaultEmailText()\n
-\n
-# Return-Path\n
-if reply_url is None:\n
-  reply_url = context.portal_preferences.getPreferredEventSenderEmail()\n
-additional_headers = None\n
-if reply_url:\n
-  additional_headers = {\'Return-Path\':reply_url}\n
-\n
-# To (multiple)\n
-to_url_list = []\n
-if to_url is None:\n
-  for recipient in context.getDestinationValueList():\n
-    email = recipient.getDefaultEmailText()\n
-    if email:\n
-      if recipient.getTitle():\n
-        to_url_list.append(\'"%s" <%s>\' % (recipient.getTitle(), email))\n
-      else:\n
-        to_url_list.append(email)\n
-    else:\n
-      raise ValueError, \'Recipient %s has no defined email\' % recipient\n
-elif same_type(to_url, \'\'):\n
-  to_url_list.append(to_url)\n
-\n
-# Attachments\n
-if attachment_list is None:\n
-  attachment_list = []\n
-document_type_list = context.getPortalDocumentTypeList()\n
-for attachment in context.getAggregateValueList():\n
-  mime_type, content = attachment.getMimeTypeAndContent()\n
-  name = attachment.getReference()\n
-\n
-  attachment_list.append({\'mime_type\':mime_type,\n
-                          \'content\':content,\n
-                          \'name\':name})\n
-\n
-# Build message per destination\n
-mail_message = None\n
-if context.getTextFormat()==\'text/html\':\n
-  mail_template = context.Event_viewHtmlMimeMessage\n
-else:\n
-  mail_template = context.Event_viewMimeMessage\n
-\n
-for to_url in to_url_list:\n
-  multipart = mail_template.as_message(mfrom=from_url,\n
-                                       mto=to_url,\n
-                                       subject=subject,\n
-                                       body=body,\n
-                                       encoding=\'utf-8\')\n
-  for attachment_dict in attachment_list:\n
-    multipart.add_file(data=attachment_dict[\'content\'],\n
-                       content_type=attachment_dict[\'mime_type\'],\n
-                       filename=attachment_dict[\'name\'])\n
-  mail_message = str(multipart)\n
-  context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
-\n
-context.setData(mail_message)\n
-\n
-# Transit event workflow\n
-if context.getTypeInfo() is not None:\n
-  context.plan()\n
-  context.order()\n
-  context.start()\n
-\n
-if download:\n
-  return mail_message\n
-
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>_code</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_filepath</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_params</string> </key>
-            <value> <string>from_url=None, to_url=None, reply_url=None, subject=None, body=None, attachment_format=None, attachment_list=None, download=None, **kw</string> </value>
-        </item>
-        <item>
-            <key> <string>_proxy_roles</string> </key>
-            <value>
-              <tuple>
-                <string>Manager</string>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>errors</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_code</string> </key>
-            <value>
-              <object>
-                <klass>
-                  <global name="FuncCode" module="Shared.DC.Scripts.Signature"/>
-                </klass>
-                <tuple/>
-                <state>
-                  <dictionary>
-                    <item>
-                        <key> <string>co_argcount</string> </key>
-                        <value> <int>8</int> </value>
-                    </item>
-                    <item>
-                        <key> <string>co_varnames</string> </key>
-                        <value>
-                          <tuple>
-                            <string>from_url</string>
-                            <string>to_url</string>
-                            <string>reply_url</string>
-                            <string>subject</string>
-                            <string>body</string>
-                            <string>attachment_format</string>
-                            <string>attachment_list</string>
-                            <string>download</string>
-                            <string>kw</string>
-                            <string>None</string>
-                            <string>_getattr_</string>
-                            <string>context</string>
-                            <string>sender</string>
-                            <string>additional_headers</string>
-                            <string>to_url_list</string>
-                            <string>_getiter_</string>
-                            <string>recipient</string>
-                            <string>email</string>
-                            <string>ValueError</string>
-                            <string>same_type</string>
-                            <string>document_type_list</string>
-                            <string>attachment</string>
-                            <string>mime_type</string>
-                            <string>content</string>
-                            <string>name</string>
-                            <string>mail_message</string>
-                            <string>mail_template</string>
-                            <string>multipart</string>
-                            <string>attachment_dict</string>
-                            <string>_getitem_</string>
-                            <string>str</string>
-                          </tuple>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>func_defaults</string> </key>
-            <value>
-              <tuple>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-                <none/>
-              </tuple>
-            </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Event_send</string> </value>
-        </item>
-        <item>
-            <key> <string>warnings</string> </key>
-            <value>
-              <tuple/>
-            </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewHtmlMimeMessage.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewHtmlMimeMessage.xml
deleted file mode 100644
index 13716b6b819e3b9369bbb49e0ac2c33f4caa7906..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewHtmlMimeMessage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </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_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<tal:body xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-          xmlns:metal="http://xml.zope.org/namespaces/metal"\n
-          ><html><body><tal:x replace="structure options/body"/></body></html></tal:body>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/html</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Event_viewHtmlMimeMessage</string> </value>
-        </item>
-        <item>
-            <key> <string>mailhost</string> </key>
-            <value> <string>MailHost</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewMimeMessage.xml b/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewMimeMessage.xml
deleted file mode 100644
index 8e42674c6a2046c7912a0ae8df647ccfff02ba89..0000000000000000000000000000000000000000
--- a/product/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Event_viewMimeMessage.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0"?>
-<ZopeData>
-  <record id="1" aka="AAAAAAAAAAE=">
-    <pickle>
-      <tuple>
-        <global name="MailTemplate" module="Products.MailTemplates.MailTemplate"/>
-        <tuple/>
-      </tuple>
-    </pickle>
-    <pickle>
-      <dictionary>
-        <item>
-            <key> <string>__ac_local_roles__</string> </key>
-            <value>
-              <none/>
-            </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_subpath</string> </key>
-                                <value> <string>traverse_subpath</string> </value>
-                            </item>
-                          </dictionary>
-                        </value>
-                    </item>
-                  </dictionary>
-                </state>
-              </object>
-            </value>
-        </item>
-        <item>
-            <key> <string>_owner</string> </key>
-            <value>
-              <none/>
-            </value>
-        </item>
-        <item>
-            <key> <string>_text</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-<tal:body xmlns:tal="http://xml.zope.org/namespaces/tal"\n
-          xmlns:metal="http://xml.zope.org/namespaces/metal"\n
-          ><tal:x replace="structure options/body"/></tal:body>
-
-]]></string> </value>
-        </item>
-        <item>
-            <key> <string>content_type</string> </key>
-            <value> <string>text/plain</string> </value>
-        </item>
-        <item>
-            <key> <string>expand</string> </key>
-            <value> <int>0</int> </value>
-        </item>
-        <item>
-            <key> <string>id</string> </key>
-            <value> <string>Event_viewMimeMessage</string> </value>
-        </item>
-        <item>
-            <key> <string>mailhost</string> </key>
-            <value> <string>MailHost</string> </value>
-        </item>
-      </dictionary>
-    </pickle>
-  </record>
-</ZopeData>
diff --git a/product/ERP5/bootstrap/erp5_core/bt/change_log b/product/ERP5/bootstrap/erp5_core/bt/change_log
index 4460ba61d81d15ad4a9e4122c68dd4783b83ff2d..68ba7a4495bf283690151cf4b46c4435e10bfc1e 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/change_log
+++ b/product/ERP5/bootstrap/erp5_core/bt/change_log
@@ -1,3 +1,6 @@
+2008-06-11 yusei
+* Move Event_send and mail templates to erp5_base. erp5_core should be a minimum.
+
 2008-06-10 yusei
 * Move Event_send and mail templates from erp5_crm. It supports html email by default.
 
diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 4fe21da97ac9b75a48158e24616e08c36057a7fb..7edd58a8bfe04ca7c3249c6c6d2af5c75392a39e 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-839
\ No newline at end of file
+840
\ No newline at end of file