Help Text messages are all out of place.

Got a replacement phone from ATT last week, and one of the major things I've noticed with the new one is my messages are out of place. I'll send a message, and the reply will show in the message list as above (as if I received it first) my original message. Now tonight in a new message, all of my messages were grouped at the top and all of the replies are grouped at the button.

Anyway to straighten this out?