Have messages line up with the rest of the content

Change-Id: I42c027b9911b5e91c93e406ad6ad1beb211cdb84