Merge proposals dependent on lp:~hyuchia/pantheon-mail/fix-1562958

lp:~hyuchia/pantheon-mail/fix-1562958 has no merge proposals.