Email template and mass-send fixes