Whitelist and email deletion support added