No no! THIS should be the correct lib statements!
More work on getting email redirects to work correctly.