Index: pm_email_notify/pm_email_notify.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/pm_email_notify/pm_email_notify.module,v
retrieving revision 1.6
diff -u -p -r1.6 pm_email_notify.module
--- pm_email_notify/pm_email_notify.module	12 Mar 2010 16:16:39 -0000	1.6
+++ pm_email_notify/pm_email_notify.module	9 Apr 2010 15:34:35 -0000
@@ -88,8 +88,8 @@ function pm_email_notify_mail($key, &$me
 function _pm_email_notify_token($recipient, $message) {
   $tokens = array(
     '!author' => $message['author']->name,
-    '!pm_subject' => drupal_html_to_text(check_plain($message['subject'])),
-    '!pm_body' => drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE)),
+    '!pm_subject' => trim(drupal_html_to_text(check_plain($message['subject']))),
+    '!pm_body' => trim(drupal_html_to_text(check_markup($message['body'], $message['format'], FALSE))),
     '!thread' => $message['thread_id'],
     '!user_uid' => $recipient->uid,
     '!message' => url('messages/view/' . $message['thread_id'], array('absolute' => TRUE)),