improved email funcationality