sgwi mailwatch integration
merge changes