[Merge] lp:~boiko/messaging-app/fix_1373494 into lp:messaging-app

[Tiago Salem Herrmann]

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.

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