Some fixes in loading email headers