courier email fix (hopefully the last)