Removed Mailhide related methods and a little bit rewriten other methods