diff --git a/remail/maillist.py b/remail/maillist.py
index faf658e..048dbef 100644
--- a/remail/maillist.py
+++ b/remail/maillist.py
@@ -233,6 +233,7 @@ class maillist(object):
         If $ORIGINAL_FROM does not contain a name, mangle the email
         address by replacing @ with _at_
         '''
+        mfrom = mfrom.replace('@','_at_')
         return '%s for %s <%s>' % (self.config.name, mfrom,
                                    self.config.listaddrs.post)