From 310b5c34b74a24c495359cc2b35c061abd21e580 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 11 Oct 2010 10:18:47 -0600
Subject: [PATCH] ...

---
 src/calibre/utils/smtp.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/calibre/utils/smtp.py b/src/calibre/utils/smtp.py
index 77914bca3b..b8b46a96cb 100644
--- a/src/calibre/utils/smtp.py
+++ b/src/calibre/utils/smtp.py
@@ -11,6 +11,7 @@ This module implements a simple commandline SMTP client that supports:
 
 import sys, traceback, os
 from email import encoders
+from calibre import isbytestring
 
 def create_mail(from_, to, subject, text=None, attachment_data=None,
                  attachment_type=None, attachment_name=None):
@@ -26,7 +27,10 @@ def create_mail(from_, to, subject, text=None, attachment_data=None,
 
     if text is not None:
         from email.mime.text import MIMEText
-        msg = MIMEText(text, 'plain', 'utf-8')
+        if isbytestring(text):
+            msg = MIMEText(text)
+        else:
+            msg = MIMEText(text, 'plain', 'utf-8')
         outer.attach(msg)
 
     if attachment_data is not None: