Index: privatemsg.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg.module,v
retrieving revision 1.70.2.30.2.91.2.64.2.3
diff -u -p -r1.70.2.30.2.91.2.64.2.3 privatemsg.module
--- privatemsg.module	13 Sep 2009 23:41:10 -0000	1.70.2.30.2.91.2.64.2.3
+++ privatemsg.module	14 Sep 2009 19:02:06 -0000
@@ -1649,7 +1649,7 @@ function _privatemsg_action_form() {
       '#options'       => $options,
       '#default_value' => 0,
       // Execute the submit button if a operation has been selected.
-      '#attributes'    => array('onchange' => "$('#edit-submit').click()"),
+      '#attributes'    => array('onchange' => "(function ($) { $('#edit-submit').click() })(jQuery);"),
   );
   $form['submit'] = array(
       '#type'       => 'submit',
@@ -1689,10 +1689,10 @@ function privatemsg_thread_change_status
     ->execute();
 
   if ($status == PRIVATEMSG_UNREAD) {
-    drupal_set_message(t('Marked %count threads as unread.', array('%count' => count($threads))));
+    drupal_set_message(format_plural(count($threads), 'Marked 1 thread as unread.', 'Marked @count threads as unread.'));
   }
   else {
-    drupal_set_message(t('Marked %count threads as read.', array('%count' => count($threads))));
+    drupal_set_message(format_plural(count($threads), 'Marked 1 thread as read.', 'Marked @count threads as read.'));
   }
 }
 /**
@@ -1904,10 +1904,10 @@ function privatemsg_thread_change_delete
   }
 
   if ($delete) {
-    drupal_set_message(t('Deleted %count threads.', array('%count' => count($threads))));
+    drupal_set_message(format_plural(count($threads), 'Deleted 1 thread.', 'Deleted @count threads.'));
   }
   else {
-    drupal_set_message(t('Restored %count threads.', array('%count' => count($threads))));
+    drupal_set_message(format_plural(count($threads), 'Restored 1 thread.', 'Restored @count threads.'));
   }
 }
 
Index: privatemsg_filter/privatemsg_filter.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/privatemsg/privatemsg_filter/privatemsg_filter.module,v
retrieving revision 1.1.2.17.2.2
diff -u -p -r1.1.2.17.2.2 privatemsg_filter.module
--- privatemsg_filter/privatemsg_filter.module	13 Sep 2009 23:39:46 -0000	1.1.2.17.2.2
+++ privatemsg_filter/privatemsg_filter.module	14 Sep 2009 19:02:07 -0000
@@ -156,6 +156,7 @@ function privatemsg_filter_dropdown(&$fo
     '#title' => t('Filter Messages'),
     '#collapsible' => TRUE,
     '#collapsed' => TRUE,
+    '#weight' => 20,
   );
   $form['filter']['search'] = array(
     '#type' => 'textfield',