add margin for message layout and modify some strings