Index: /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py	(revision 16427)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/tests/test_smtp.py	(revision 16428)
@@ -260,6 +260,7 @@
             u'A subject',
             u'This is a test mail.',None,
-            u'A cc recipient <recpt@example.com>',
-            u'A bcc recipient <recpt@example.com>,A 2nd bcc recipient <recpt@example.com>',
+            (('recpt1@example.com', 'A cc recipient'),),
+            (('recpt2@example.com', 'A bcc recipient'),
+             ('recpt3@example.com', 'A 2nd bcc recipient')),
             )
         self.assertEqual(mail_id, 'fake-message-id@example.com')
@@ -267,5 +268,6 @@
             self.get_fake_smtp_output().split('\n'),
             [u'Sending email from no-reply@waeup.org to '
-             u'recpt@example.com, sender@example.com:',
+             u'recpt@example.com, recpt1@example.com, recpt2@example.com, '
+             u'recpt3@example.com, sender@example.com:',
              u'Message:',
              u'msg: MIME-Version: 1.0',
@@ -274,7 +276,7 @@
              u'msg: From: A sender <no-reply@waeup.org>',
              u'msg: To: A recipient <recpt@example.com>',
-             u'msg: Cc: A cc recipient <recpt@example.com>',
-             u'msg: Bcc: A bcc recipient <recpt@example.com>,',
-             u'msg:  A 2nd bcc recipient <recpt@example.com>',
+             u'msg: Cc: A cc recipient <recpt1@example.com>',
+             u'msg: Bcc: A bcc recipient <recpt2@example.com>',
+             u'msg: Bcc: A 2nd bcc recipient <recpt3@example.com>',
              u'msg: Reply-To: A sender <sender@example.com>',
              u'msg: Subject: A subject',
@@ -282,4 +284,6 @@
              u'msg: This is a test mail.',
              u'']
+
+
             )
         return
