Mail Bugs fixed