Index: /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py	(revision 10943)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/smtp.py	(revision 10944)
@@ -164,5 +164,12 @@
 
     mailer = getUtility(IMailService)
-    rcpt_addrs += [from_addr]
+    try:
+        email_admin = grok.getSite()['configuration'].email_admin
+        if from_addr != email_admin:
+            rcpt_addrs += [from_addr]
+    except TypeError:
+        # In tests we might not have a site object
+        rcpt_addrs += [from_addr]
+        pass
     result = mailer().send(from_addr, rcpt_addrs, body.as_string())
     return result
