Fixes useless url encoding.
Annotate RFC2822 keyword.