Messages now are from the correct user and show correct image