Remove duplicate, and re-organize message position