Case:55268 improve one-off email support