Fixing failing email feature.