fixes recursive endless loop
improves on namespacing for the mail class