Sort messages by key and use leading tabs

Change-Id: I00f647c6e03e2d08def6a9500a0fc1c7b0d4eb50