WIP: Improvements to email storage plugin

* Allow users to overwrite data
* Simplified some code