Message reply resizing
conflict resolution