better mail support and couple of enhancements