Version upgrade reverted - wip on mail form