Moved mail building to separate class