remove attachment text display in email
merge conflict