Using $this in closure for lightbox choice (#988)
Support the recipient_email token in upcoming replyTo address field too