Changes added for Airmail 2.0