Cleanup views
Separate email body in db