This PR primarily fixes this case: - USER A message - USER B message - USER B reply to USER A message <-- not showing user info when it should Moreover, this commit also improves the spec to correctly test more cases.