Add xmail from #1309