Backport fixes to Airmail Upsell