diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
index 54dca483582f76a0eac1e4ab2e4ff818fa86928e..940d8b9850ddd4d54699c6e72544804f7f326b3c 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Entity_sendEmail.xml
@@ -50,9 +50,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string encoding="cdata"><![CDATA[
-
-from email.utils import formataddr\n
+ <value> <string>from email.utils import formataddr\n
portal = context.getPortalObject()\n
event = portal.restrictedTraverse(event_relative_url)\n
\n
@@ -83,24 +81,7 @@ mail_message = portal.Base_createMailMessageAsString(from_url,\n
embedded_file_list=embedded_file_list)\n
\n
event.sendMailHostMessage(mail_message)\n
-\n
-if not event.hasData() and len(event.getDestinationList()) == 1:\n
- # Store the content of the email as data, so that we can keep a reference to\n
- # the email that was actually sent.\n
- # We do not store when there is more than one recipent.\n
- if len(embedded_file_list):\n
- # do not store aggregated documents in Email document\n
- # to avoid duplicate data\n
- mail_message = context.Base_createMailMessageAsString(from_url,\n
- to_url,\n
- subject,\n
- body,\n
- content_type,\n
- attachment_list=attachment_list)\n
- event.setData(mail_message)\n
-
-
-]]></string> </value>
+</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.xml
index 2f99deeb8ce31a56cf953f05a759978f2ce4c6f7..8351cf8fb65ea585b6dc98a93b97371932f25c28 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/MailMessage_send.xml
@@ -115,18 +115,6 @@ if download or not use_activity:\n
attachment_list=attachment_list,\n
embedded_file_list=embedded_file_list)\n
\n
- if len(embedded_file_list):\n
- # do not store aggregated documents in Email document\n
- # to avoid duplicate data\n
- tmp_mail_message = context.Base_createMailMessageAsString(from_url,\n
- to_url,\n
- subject,\n
- body,\n
- content_type,\n
- attachment_list=attachment_list)\n
- context.setData(tmp_mail_message)\n
- else:\n
- context.setData(mail_message)\n
if not use_activity:\n
context.activate(activity=\'SQLQueue\').sendMailHostMessage(mail_message)\n
\n
diff --git a/product/ERP5/tests/testCRM.py b/product/ERP5/tests/testCRM.py
index b1c943d8b4a02c196a29a2152068a1c0c271e0c7..21a410b17156dcc34b5895493077103fe2830e8a 100644
--- a/product/ERP5/tests/testCRM.py
+++ b/product/ERP5/tests/testCRM.py
@@ -1111,12 +1111,6 @@ class TestCRMMailSend(BaseTestCRM):
# content type is kept
self.assertEqual(event.getContentType(), 'text/html')
- # The getTextContent() gets the content from the file data instead the
- # Attribute text_content.
- self.assertTrue(event.hasFile())
- self.assertEqual(event.text_content, text_content)
- text_content_from_data = '<html><body>Hello<br />World</body></html>'
- self.assertEqual(event.getTextContent(), text_content_from_data)
last_message = self.portal.MailHost._last_message
self.assertNotEquals((), last_message)
mfrom, mto, messageText = last_message