add mail support
remove todo