Fixed bugs in Message Fragment