Mail class fix