Revert "jmail Update"

This reverts commit 6122df8bad6831627495d937a9bfc28060c8dad2.