*9009* Changes for the email logger plugin