Some more changes related to mailing page