Airmail support

Hi,

Same mod to support Airmail.