refactor mailinator support