Polish the activity/discussion message part