add device identifier, and revise the content of Email