fixed all issues with email parsing afaik