--- src/dspam.c	2006-12-12 16:33:45.000000000 +0100
+++ src/dspam.c.new	2007-08-16 19:14:06.155370137 +0200
@@ -3774,7 +3774,7 @@
     char buf[256];
     if (heading) {
       char *dup = strdup(heading);
-      char *domain = strchr(dup, '@');
+      char *domain = strrchr(dup, '@');
       if (domain) {
         int i;
         for(i=0;domain[i] && domain[i]!='\r' && domain[i]!='\n'