@neilj
neilj committed 43627b4 May 5, 2020
Fix breakage from Fastmail-specific features