Index: /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py	(revision 10853)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py	(revision 10854)
@@ -159,5 +159,5 @@
         body_to += '%s, ' % encode_address(email, rcpt_name)
     body = encode_body(body)
-    body["From"] = encode_address(from_addr, from_name)
+    body["From"] = body["Cc"] = encode_address(from_addr, from_name)
     body["To"] = body_to.strip(', ')
     body["Subject"] = encode_header_item(subject)
Index: /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py	(revision 10853)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py	(revision 10854)
@@ -239,4 +239,5 @@
              u'msg: Content-Transfer-Encoding: 7bit',
              u'msg: From: A sender <sender@example.com>',
+             u'msg: Cc: A sender <sender@example.com>',
              u'msg: To: A recipient <recpt@example.com>',
              u'msg: Subject: A subject',
@@ -262,4 +263,5 @@
              u'msg: Content-Transfer-Encoding: quoted-printable',
              u'msg: From: A sender <sender@example.com>',
+             u'msg: Cc: A sender <sender@example.com>',
              u'msg: To: A recipient <recpt@example.com>',
              u'msg: Subject: A subject',
@@ -285,4 +287,5 @@
              u'msg: Content-Transfer-Encoding: quoted-printable',
              u'msg: From: A sender <sender@example.com>',
+             u'msg: Cc: A sender <sender@example.com>',
              u'msg: To: A recipient <recpt@example.com>',
              u'msg: Subject: A subject',
