Revert "Revert "Jmail again""

This reverts commit f6fa18e1cc1020ce71482c80b5752389304a223a.