Improved unsearchable email spec