added mailhandler feature