THIS BRANCH ONLY - email messaging updates