Moved the mail regex outside CheckHandler
Fixed up CheckHandler