Some changes in for mail