WEBSPARK-210 fixed some warning messsages from email.inc and changed .module file for current form