incorporating Dan's comments for UserMailBox entity redesign and cleaning service classes
fixing persistence problems and fixing entity classes