Bug 845042 - Load more messages layout and type update