Reorder and use full name.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/email/trunk@1632418 13f79535-47bb-0310-9956-ffa450edef68