JP-37 Email Handler Updates