Airmail Beta v1.3.0 (217)
Merge pull request #1848 from jglenes/airmail-beta-217

Airmail Beta v1.3.0 (217)