Fixed parsing of fetchplan
Mail plugin: minor improvements