Issue #3145846 by marchuk.vitaliy, rszrama: Support adding additional token types to email token replacement