Bug 966517 - Move email verification code into separate module