! Invalid XHTML in the admin template, naughty, naughty.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! Fix a long standing bug with the mail queue using the wrong variable by accident and do a little clean-up in the process to use the {literal:str} syntax I added.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
! We also need to keep the private flag passed through the mail queue otherwise PMs could accidentally become readable if they failed to send in the mail queue the first time around.

Signed-off-by: Peter Spicer <sleeping@myperch.org>
Merge pull request #838 from Arantor/release-2.1

More miscellaneous bits and pieces that needed doing.