Mailing feature added and some minor changes