diff --git a/extensions/webmail/imap_listing.py b/extensions/webmail/imap_listing.py
index cc891af67..7d36fb9ed 100644
--- a/extensions/webmail/imap_listing.py
+++ b/extensions/webmail/imap_listing.py
@@ -372,6 +372,8 @@ class ImapEmail(Email):
                 pass
 
     def render_headers(self, **kwargs):
+        from django.template.loader import render_to_string
+
         attachments = []
         for part in self.attachments:
             decoded = decode_header(part.get_filename())
diff --git a/extensions/webmail/main.py b/extensions/webmail/main.py
index 84dd0a301..74d57c8ba 100644
--- a/extensions/webmail/main.py
+++ b/extensions/webmail/main.py
@@ -151,7 +151,7 @@ def getmailcontent(request, folder, mail_id):
     except KeyError:
         pageid = "1"
     return _render(request, "common/viewmail.html", {
-            "headers" : email.render_headers(folder, mail_id), 
+            "headers" : email.render_headers(folder=folder, mail_id=mail_id), 
             "folder" : folder, "imapid" : mail_id, "mailbody" : email.body, 
             "pre" : email.pre
             })