Revert "jmail upgrade"

This reverts commit e7d1e9d51884d8a9432b6d5da9402608540777a2.