Added message editing page
Resolved conflict