mail: Some changes