diff --git a/product/ERP5Type/patches/CMFMailIn.py b/product/ERP5Type/patches/CMFMailIn.py
index d840adf5b4bb785fc6beaff1c10a3f23bd3675f6..c446644a8b5a7a6bcc5812a0d9445dda233f33b5 100644
--- a/product/ERP5Type/patches/CMFMailIn.py
+++ b/product/ERP5Type/patches/CMFMailIn.py
@@ -76,10 +76,8 @@ def MailInTool_postUTF8MailMessage(self, file=None):
         payload = unicode(payload, charset).encode('utf-8')
       if body_found:
         # Keep the content type
-        # since this is not a body, this must be 
-        # an attached email - we want it whole (with the headers)
         theMail['attachment_list'].append((file_name, 
-                                           content_type, part.as_string()))
+                                           content_type, payload))
       else:
         theMail['body'] = payload
         body_found = 1