Index: moodlelib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/lib/moodlelib.php,v
retrieving revision 1.960.2.92
diff -c -r1.960.2.92 moodlelib.php
*** moodlelib.php	11 Sep 2008 19:53:35 -0000	1.960.2.92
--- moodlelib.php	18 Sep 2008 09:31:27 -0000
***************
*** 4151,4157 ****
          $mail->From     = $CFG->noreplyaddress;
          $mail->FromName = $from;
      } else if ($usetrueaddress and $from->maildisplay) {
!         $mail->From     = $from->email;
          $mail->FromName = fullname($from);
      } else {
          $mail->From     = $CFG->noreplyaddress;
--- 4151,4157 ----
          $mail->From     = $CFG->noreplyaddress;
          $mail->FromName = $from;
      } else if ($usetrueaddress and $from->maildisplay) {
!         $mail->From     = stripslashes($from->email);
          $mail->FromName = fullname($from);
      } else {
          $mail->From     = $CFG->noreplyaddress;
***************
*** 4167,4173 ****
  
      $mail->Subject = substr(stripslashes($subject), 0, 900);
  
!     $mail->AddAddress($user->email, fullname($user) );
  
      $mail->WordWrap = $wordwrapwidth;                   // set word wrap
  
--- 4167,4173 ----
  
      $mail->Subject = substr(stripslashes($subject), 0, 900);
  
!     $mail->AddAddress(stripslashes($user->email), fullname($user) );
  
      $mail->WordWrap = $wordwrapwidth;                   // set word wrap