--- balsa-1.3.6.org/src/sendmsg-window.c	Fri May 10 17:02:46 2002
+++ balsa-1.3.6/src/sendmsg-window.c	Sat May 18 00:52:54 2002
@@ -2595,6 +2595,28 @@
 		}
 	    }
 	}
+	if (!done) {
+	    /* No "to" or "cc" match, maybee this is a mailing list? */
+	    /* Try qmail Delivered-To or Original-Recipient"*/
+	    if (!message->user_headers)
+		message->user_headers = libbalsa_message_user_hdrs(message);
+	    alist = message->user_headers;
+	    for (alist ; !done && alist ; alist = g_list_next(alist)) {
+		gchar **tmp = alist->data;
+		if (libbalsa_find_word(tmp[0], "delivered-to") ||
+		    libbalsa_find_word(tmp[0], "original-recipient")) {
+		    for (ilist = balsa_app.identities; (!done && ilist);
+			 ilist = g_list_next(ilist)) {
+			ident = LIBBALSA_IDENTITY(ilist->data);
+			if (strstr(tmp[1],
+				   (gchar*)(ident->address->address_list->data))) {
+			    msg->ident = ident;
+			    done = TRUE;
+			}
+		    }
+		}
+	    }
+	}
     }
     return done;
 }