- fixed mail bugs