Improved email converter