recipient can be a token, do not require email format
Added editheader support