patching email behavior
Merge branch 'wikirate' of github.com:wagn/wagn into wikirate