Updated to work with Airmail 2.0