Fix email content; fix #163