Clean up Reset_Mail
Cleanup, Fix 64