Changes to messages fragment, etc, reverted yuncun's changes