Merge proposals dependent on lp:~boiko/messaging-app/fix_timestamps

lp:~boiko/messaging-app/fix_timestamps has no merge proposals.