Minor fix on mail and update spaces