Revert "Revert "Revert "Jmail again"""

This reverts commit 9fab8f27d63d73764d53298697acbc92568d948c.