Feature/map messages user