Index: django/core/mail/message.py
===================================================================
--- django/core/mail/message.py	(revision 13317)
+++ django/core/mail/message.py	(working copy)
@@ -78,9 +78,9 @@
 
 class SafeMIMEText(MIMEText):
     
-    def __init__(self, text, subtype, charset):
-        self.encoding = charset
-        MIMEText.__init__(self, text, subtype, charset)
+    def __init__(self, _text, _subtype, _charset):
+        self.encoding = _charset
+        MIMEText.__init__(self, _text, _subtype, _charset)
     
     def __setitem__(self, name, val):    
         name, val = forbid_multi_line_headers(name, val, self.encoding)