Finish email support, prepare for 2.1.0

Special Thanks to jonty800 of 800Craft for working on email support.
Thanks to him for letting me use it too!