Added some extra removes to these servlets.
Mail.java