Update message layout am: 1787517df1

Change-Id: I6b0d8e8df82922dad9a0df7d1c9988e8f2926c1f