Small security patch: Make sure that the envelope sender address doesn't