--- trunk/Nos.pm	2005/05/16 22:04:40	31
+++ trunk/Nos.pm	2005/05/16 22:32:58	32
@@ -156,11 +156,12 @@
 	my $list_name = $args->{'list'} || confess "need list name";
 	my $message_text = $args->{'message'} || croak "need message";
 
-	warn Dumper($message_text);
-
 	my $m = Email::Simple->new($message_text) || croak "can't parse message";
 
-	croak "message doesn't have Subject header\n" unless( $m->header('Subject') );
+	unless( $m->header('Subject') ) {
+		warn "message doesn't have Subject header\n";
+		return;
+	}
 
 	my $lists = $self->{'loader'}->find_class('lists');
 
@@ -223,34 +224,32 @@
 		print "sending message ",$m->message_id," enqueued on ",$m->date," to list ",$m->list_id->name,"\n";
 		my $msg = $m->message_id->message;
 
-		my $auth = Email::Auth::AddressHash->new(
-			$m->list_id->name,	# secret
-			10,			# hashlen
-		);
-
 		foreach my $u ($user_list->search(list_id => $m->list_id)) {
 
 			my $to_email = $u->user_id->email;
 
+			my ($from,$domain) = split(/@/, $u->list_id->email, 2);
+
 			if ($sent->search( message_id => $m->message_id, user_id => $u->user_id )) {
 				print "SKIP $to_email message allready sent\n";
 			} else {
-				print "\t$to_email\n";
+				print "=> $to_email\n";
+
+				my $secret = $m->list_id->name . " " . $u->user_id->email . " " . $m->message_id;
+				my $auth = Email::Auth::AddressHash->new( $secret, 10 );
 
 				my $hash = $auth->generate_hash( $to_email );
 
-				my $from = $u->list_id->name . " <" . $u->list_id->email . "+" . $hash . ">";
+				my $from = $u->list_id->name . " <" . $from . "+" . $hash . ( $domain ? "@" . $domain : '' ). ">";
 				my $to = $u->user_id->full_name . " <$to_email>";
 
-				my $m = Email::Simple->new($msg) || croak "can't parse message";
-
-				print Dumper($m);
+				my $m_obj = Email::Simple->new($msg) || croak "can't parse message";
 
-				$m->header_set('From', $from) || croak "can't set From: header";
-				$m->header_set('To', $to) || croak "can't set To: header";
+				$m_obj->header_set('From', $from) || croak "can't set From: header";
+				$m_obj->header_set('To', $to) || croak "can't set To: header";
 
 				# FIXME do real sending :-)
-				send IO => $m->as_string;
+				send IO => $m_obj->as_string;
 
 				$sent->create({
 					message_id => $m->message_id,