Fix for Yahoo email