clean up
Add plural function to mail