Some Changes In Mail UI And Code Behind