remove leading and trailing spaces in references and replyto
Merge branch 'master' into debian