Messaging layout MJ-233

All tests passed.