#261 Fix Mail class