[Merge] lp:~tiagosh/messaging-app/fix-duplicate-messages into lp:messaging-app

[Gustavo Pichorim Boiko]

Review: Approve

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?
Yes

Did CI run pass? If not, please explain why.
No, but not related to the changes. Autopilot tests are running fine on the device.

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?
Yes
-- 
https://code.launchpad.net/~tiagosh/messaging-app/fix-duplicate-messages/+merge/257699
Your team Ubuntu Phablet Team is subscribed to branch lp:messaging-app.