code review fixes that got lost in merge

git-svn-id: http://gsoc.svn.wordpress.org/2013/codebykat/post-by-email/trunk@2302 f69abe3c-2ee2-4550-9a6d-17bd458115be