Changes for leave mail