Issue #2723893 by Bambell, larowlan, Berdir, jibran: Merge Webforms "OptionEmailtem" feature into Contact Storage