Added the new E-Mail funcitonality