use contextual content in system emails
removed +*message for email templates
Merge remote-tracking branch 'xithan/wikirate' into wikirate