Replace email parser. Fixes #282