Mail class rev 2