Issue #1821420 by vijaycs85, cam8001, Albert Volkman, ACF, typhonius, pcambra, Berdir: Convert mail variables to cmi.