Adapts homonyms issues to new mail chain.