Added more logic behind having a User add a message