changed mail parser