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

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