MS CRM 2011 : incoming email resolve issue when two contact share same email id

Hi

Contact record [Indika Athukorala] has 2 email activities and Contact Indika Athukorala[TEST] has1 email activity, both these contact records share same email id as primary email.
User receives a new email and he track it to CRM.

When user open above tracked email activity in CRM, he will see it as unresolved. [CRM is unable to resolve this email id as there are two contact with same primary email]

Now user has the option to resolve it manually. 

Imagine user decided to resolve this email to contact Indika Athukorala[TEST].

Now what happened is all the emails (Contact Indika Athukorala - 2 emails + Contact Indika Athukorala[TEST]-2 email ) are resolved to Indika Athukorala[TEST]. 

Anyone encounter this scenario before and any solution for this???

Thanks,

Indika