Mail bug fixes
Version update on release