Uncommented email
Fixed caps
Added nul check for extracts