improve message container