integrate management in editMail page
the same commit