Index: pm_email_notify/pm_email_notify.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_email_notify/Attic/pm_email_notify.module,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 pm_email_notify.module
--- pm_email_notify/pm_email_notify.module	2 Nov 2009 11:41:28 -0000	1.1.2.8
+++ pm_email_notify/pm_email_notify.module	6 Nov 2009 12:31:50 -0000
@@ -126,8 +126,8 @@ function _pm_email_notify_token($recipie
 
   $tokens = array(
     '!author' => $message['author']->name,
-    '!pm_subject' => drupal_html_to_text($message['subject'], array()),
-    '!pm_body' => drupal_html_to_text($message['body'], array()),
+    '!pm_subject' => drupal_html_to_text(check_plain($message['subject'])),
+    '!pm_body' => drupal_html_to_text(check_markup($message['body'], $message['format'])),
     '!thread' => $message['thread_id'],
     '!user_uid' => $recipient->uid,
     '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => TRUE)),