Move oa_mailhandler in update hook