Update timer and re-order message bubble for resent message in sender's thread

[riyapenn]

• [X ] I have searched open and closed issues for duplicates

---

Bug description

For the sender of a re-sent message which has a disappearing message timer different than the current setting should
A) update the disappearing message time to that of the re-sent message
B) move the re-sent message bubble to the bottom of the conversation thread

Steps to reproduce

• Desktop is offline/not connected to WiFi
• Set disappearing message timer to X
• Send message A
• Message A fails to send
• Set Disappearing message timer to Y
• Desktop is online/is connected to WiFi
• Send Message B
• Message B sends with timer of Y
• Re-send Message A

Actual result:
For Sender: Message A remains in it's original position and disappears after time X

Expected result:
For Sender: At the end of the conversation thread expect to see 'You set the timer to Y', Message B (if it has not yet disappeared), 'You set the timer to X' followed by Message A

### Platform info

Operating System: Mac OS X 10.12.0
Browser: Chrome 53.0.2785.143

Signal version: 0.24.1