Improved EmailFormat Library