Cleaned up mail system to work with new mail server