Adding a contact without email address doesn't automatically assign other messages, fixes #6674
Check for null, fixes #6674