Clean up the schema a bit
Add user_id to message table