Use the email messages from the new settings

Also removed a useless check that was always true