fix contact details merge in message, add tests
Merge pull request #181 from ali-graham/179_fix_contact_names_in_notifications

fix contact details merge in message, add tests