diff --git a/emailtemplates/email.py b/emailtemplates/email.py
index 000883c..ef2c13a 100644
--- a/emailtemplates/email.py
+++ b/emailtemplates/email.py
@@ -1,6 +1,7 @@
 # coding=utf-8
 import os
 import logging
+import six
 from smtplib import SMTPException
 
 from django.conf import settings
@@ -96,8 +97,8 @@ def get_object(self):
                     "Can't convert to unicode EmailTemplate object from database, using default file template.")
                 break
             else:
-                self.template = unicode(tmp.content)
-                self.subject = unicode(tmp.subject) or self.subject
+                self.template = str(tmp.content)
+                self.subject = str(tmp.subject) or self.subject
                 self._template_source = 'database'
                 logger.debug(u"Got template %s from database", self.name)
                 return