Email Code and Archiving Code added