Fixed issues with DB Models

Primarily the message table - it has two relationships pointing to the
user table.

Reward: A trip to the gym