some changes (email.apk and proper regex'ed others)