Added email plugin
Implementing reverting of changes