Adds handling of returned email addresses