Better target emailing status mangement

It can wait until real dev branch, I pull request it now to not forget for 3.7