fixing messaging part of the app