Merge "Use the proper server ID for the message."