Feature/336 message appearing new user