Trying to fix garbled emails, now django 1.5 style

(cherry picked from commit d31305cd5461c7456d6014ce63a06e5efd1da38f)