A quick fix for mail which will hopefully work, but probably won't.