fix refactor locketmailer