diff --git a/addons/mail/models/mail_thread.py b/addons/mail/models/mail_thread.py
index f0065dcd3ca..7c84db28db5 100644
--- a/addons/mail/models/mail_thread.py
+++ b/addons/mail/models/mail_thread.py
@@ -1105,6 +1105,7 @@ class MailThread(models.AbstractModel):
 
     @api.model
     def message_route_process(self, message, message_dict, routes):
+        self = self.with_context(attachments_mime_plainxml=True) # import XML attachments as text
         # postpone setting message_dict.partner_ids after message_post, to avoid double notifications
         partner_ids = message_dict.pop('partner_ids', [])
         thread_id = False
diff --git a/openerp/addons/base/ir/ir_attachment.py b/openerp/addons/base/ir/ir_attachment.py
index 80699e28086..63c1829f834 100644
--- a/openerp/addons/base/ir/ir_attachment.py
+++ b/openerp/addons/base/ir/ir_attachment.py
@@ -211,9 +211,13 @@ class ir_attachment(osv.osv):
         return mimetype or 'application/octet-stream'
 
     def _check_contents(self, cr, uid, values, context=None):
+        if context is None:
+            context = {}
         mimetype = values['mimetype'] = self._compute_mimetype(values)
         xml_like = 'ht' in mimetype or 'xml' in mimetype # hta, html, xhtml, etc.
-        if xml_like and not self.pool['res.users']._is_admin(cr, uid, [uid]):
+        force_text = (xml_like and (not self.pool['res.users']._is_admin(cr, uid, [uid]) or
+            context.get('attachments_mime_plainxml')))
+        if force_text:
             values['mimetype'] = 'text/plain'
         return values