Merge proposals dependent on lp:~tiagosh/messaging-app/fix-broken-test

lp:~tiagosh/messaging-app/fix-broken-test has no merge proposals.