Conflict:

diff --cc addons/mail/mail_thread.py
index 7df645c,8a336f7..0000000
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@@ -481,11 -500,9 +500,16 @@@ class mail_thread(osv.AbstractModel)
          partner_ids = []
          s = ', '.join([decode(message.get(h)) for h in header_fields if message.get(h)])
          for email_address in tools.email_split(s):
++<<<<<<< HEAD
 +            related_partners = partner_obj.search(cr, uid, [('email', '=ilike', email_address), ('user_ids', '!=', False)], limit=1, context=context)
 +            if not related_partners:
 +                related_partners = partner_obj.search(cr, uid, [('email', '=ilike', email_address)], limit=1, context=context)
 +            partner_ids += related_partners
++=======
+             partner_id = self._message_partner_id_by_email(cr, uid, email_address, context=context)
+             if partner_id:
+                 partner_ids.append(partner_id)
++>>>>>>> odoo/7.0
          return partner_ids
  
      def _message_find_user_id(self, cr, uid, message, context=None):

resolved by

git checkout --theirs addons/mail/mail_thread.py

(_message_partner_id_by_email does even more than this fallback strategy)

Committed by @hbrunn as github.com/OCA/OCB@5c0bad1331

Back to Conflict resolutions OCB synchronization