Merge pull request #1462 from rubenk/email-plugin-fix-malloc-check