Make mail class exchangable

@deiferni