email fixes

not tested -- I don't have a Django installation here. Please review...