--- privatemsg.module.orig	2008-12-18 17:26:34.000000000 +0100
+++ privatemsg.module	2009-01-08 16:27:36.000000000 +0100
@@ -525,19 +525,13 @@ function privatemsg_new(&$form_state, $a
     '#submit'             => array('pm_send'),
   );
   $form['privatemsg']['cancel'] = array(
-    '#type'               => 'submit',
-    '#value'              => t('Cancel'),
-    '#submit'             => array('pm_cancel'),
+    '#value'              => l(t('Cancel'), 'messages', array('attributes' => array('id' => 'edit-cancel'))),
   );
   $form['#validate'][]    = 'pm_send_validate';
 
   return $form;
 }
 
-function pm_cancel($form, &$form_state) {
-  $form_state['redirect'] = 'messages/new';
-}
-
 function pm_send_validate($form, &$form_state) {
 //  drupal_set_message('<pre>'. print_r($form_state['values'], 1) . '</pre>');
   // The actual message that is being sent, we create this during validation and pass to submit to send out.