Enable mail on the air branch.
Bug fix. Remove advice and replace it with a function.