diff -u -r SCMBUG_RELEASE_0-18-3/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Daemon.pm SCMBUG_RELEASE_0-18-3_patched_fix_ListOfMailInFromField/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Daemon.pm
--- SCMBUG_RELEASE_0-18-3/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Daemon.pm	2006-11-06 20:41:10.000000000 +0100
+++ SCMBUG_RELEASE_0-18-3_patched_fix_ListOfMailInFromField/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Daemon.pm	2006-12-06 10:39:26.564429900 +0100
@@ -1307,7 +1307,7 @@
     my $mailing_list_to = emails_to_csv( $mailing_list->{ To } );
     %mail->{ To } = $mailing_list_to;
 
-    # Doon't blindly ingore the From list that was computed
+    # Don't blindly ignore the From list that was computed
     my $mailing_list_from = emails_to_csv( $mailing_list->{ From } );
     %mail->{ From } = $mailing_list_from;
 
@@ -1356,7 +1356,7 @@
     # first.
     foreach my $email( sort { $mailing_list->{ $a } <=> $mailing_list->{ $b } } keys %{ $mailing_list } ) {
 	if ( $counter != 0) {
-	    $mailing_list_string .= ",";
+	    $mailing_list_string .= "; ";
 	}
 	$mailing_list_string .= $email;
 	$counter++;
diff -u -r SCMBUG_RELEASE_0-18-3/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Integration.pm SCMBUG_RELEASE_0-18-3_patched_fix_ListOfMailInFromField/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Integration.pm
--- SCMBUG_RELEASE_0-18-3/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Integration.pm	2006-11-06 20:41:10.000000000 +0100
+++ SCMBUG_RELEASE_0-18-3_patched_fix_ListOfMailInFromField/Program Files/Scmbug/share/scmbug/lib/Scmbug/Daemon/Integration.pm	2006-12-06 11:11:31.920899600 +0100
@@ -345,28 +345,22 @@
 	$mailing_list->{ To }->{ $request->{ policies }->{ mail_on_success }->{ values }->{ To } } = 1;
     }
 
-
     # Add the Sender.
     if ( $request->{ policies }->{ mail_on_success }->{ values }->{ >From } ne '' ) {
-	$mailing_list->{ From }->{ $request->{ policies }->{ mail_on_success }->{ values }->{ From } } = 1;
+	    $mailing_list->{ From }->{ $request->{ policies }->{ mail_on_success }->{ values }->{ From } } = 1;
+	    $mailing_list->{ 'Reply-To' }->{ $request->{ policies }->{ mail_on_success }->{ values }->{ From } } = 1;
     }
 
     # If the email should also appear to have been sent from the SCM
     # user, add that user first in the From list. He is added at a
     # higher priority (value 0)
-    if ( $request->{ policies }->{ mail_also_appears_from_scm_user } == 1) {
-	$mailing_list->{ From }->{ $scm_user_email } = 0;
+    if ( $request->{ policies }->{mail_on_success}->{ mail_also_appears_from_scm_user } == 1) {
+	    $mailing_list->{ From }->{ $scm_user_email } = 0;
     }
 
-    # Setup the 'Reply-to' list. Email should always be replied to the
-    # entire From List.
-    $mailing_list->{ 'Reply-To' } = $mailing_list->{ From };
-
-    # But if the SCM user was not set in From, it should also be
+    # If the SCM user was not set in From, it should also be
     # replied to the SCM user first.
-    if ( $request->{ policies }->{ mail_also_appears_from_scm_user } == 0) {
-	$mailing_list->{ 'Reply-To' }->{ $scm_user_email } = 0;
-    }
+    $mailing_list->{ 'Reply-To' }->{ $scm_user_email } = 0;
 
     return $mailing_list;
 }