Fixed lazy loading PriateMessage.getUser()
Fixed add User
Some code clean up