Adjusted email parsing rules