revision base on Eason Email