added mail_handler 'add mailaddress' patch