merge peyue. Update for sharing message and mobile view