fixes #6400, #6401 mass email delivery (adjust tokens customization)