Hopefully final fix for mail