email parser improved