Trying to fix garbled emails.
Trying to fix garbled emails, now django 1.5 style
Merge remote-tracking branch 'nonZero/hotfix/garbled-email' into hotfix/garbled-email