Mail changed with new SERVER_BASE_ADDRESS model
Some changes in UI