Revert "Jmail again"

This reverts commit 213b294a23b173afca1b9a84d94c51122785dc67.