Simplify email header skipping