diff --git a/integrator/mail/imap.py b/integrator/mail/imap.py
index 9fba519..84a7326 100644
--- a/integrator/mail/imap.py
+++ b/integrator/mail/imap.py
@@ -1,5 +1,5 @@
 #
-#  Copyright (c) 2007 Helmut Merz helmutm@cy55.de
+#  Copyright (c) 2010 Helmut Merz helmutm@cy55.de
 #
 #  This program is free software; you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -123,7 +123,6 @@ def decodeHeader(h):
         result.append(v)
     return ''.join(result)
 
-
 def getPayload(msg):
     parts = {}
     for msg in msg.walk():
diff --git a/organize/browser/party.py b/organize/browser/party.py
index 1e3bd79..814fd65 100644
--- a/organize/browser/party.py
+++ b/organize/browser/party.py
@@ -156,8 +156,8 @@ class SendEmail(FormController):
         recipients += (form.get('addrRecipients') or u'').split('\n')
         person = getPersonForUser(self.context, self.request)
         sender = person and adapted(person).email or 'loops@unknown.com'
-        msg = MIMEText(message, 'plain', 'utf-8')
-        msg['Subject'] = subject
+        msg = MIMEText(message.encode('utf-8'), 'plain', 'utf-8')
+        msg['Subject'] = subject.encode('utf-8')
         msg['From'] = sender
         msg['To'] = ', '.join(r.strip() for r in recipients if r.strip())
         mailhost = component.getUtility(IMailDelivery, 'Mail')