diff -Nup privatemsg/privatemsg.info privatemsg_new/privatemsg.info
--- privatemsg/privatemsg.info	2007-12-21 13:10:21.000000000 +0100
+++ privatemsg_new/privatemsg.info	2008-01-21 19:04:15.000000000 +0100
@@ -1,10 +1,5 @@
-; $Id: privatemsg.info,v 1.1.2.1.2.2 2007/10/28 10:25:23 karthik Exp $
+; $Id$
 name = Privatemsg
 description = Allow private messages between users.
 package = Mail
-
-; Information added by drupal.org packaging script on 2007-12-21
-version = "5.x-2.x-dev"
-project = "privatemsg"
-datestamp = "1198239021"
-
+core = 6.x
diff -Nup privatemsg/privatemsg.install privatemsg_new/privatemsg.install
--- privatemsg/privatemsg.install	2007-10-28 11:25:23.000000000 +0100
+++ privatemsg_new/privatemsg.install	2008-01-12 17:26:53.000000000 +0100
@@ -1,291 +1,85 @@
 <?php
-// $Id: privatemsg.install,v 1.5.2.4.2.11 2007/10/28 10:25:23 karthik Exp $
+// $Id$
 
 function privatemsg_install() {
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      db_query("CREATE TABLE {privatemsg} (
-          id            int unsigned NOT NULL primary key,
-          author        int unsigned NOT NULL,
-          recipient     int unsigned NOT NULL,
-          subject       varchar(255) NOT NULL,
-          message       text NOT NULL,
-          timestamp     int unsigned NOT NULL,
-          newmsg        tinyint unsigned NOT NULL,
-          hostname      varchar(255) NOT NULL,
-          folder        int unsigned NOT NULL DEFAULT 0,
-          author_del    tinyint unsigned NOT NULL DEFAULT 0,
-          recipient_del tinyint unsigned NOT NULL DEFAULT 0,
-          format        int NOT NULL DEFAULT 0,
-          thread        int NOT NULL DEFAULT 0,
-          type          varchar(255) NOT NULL,
-          variables     longtext,
-          key (recipient),
-          key (folder),
-          key(type),
-          key(author)
-        ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-      db_query("CREATE TABLE {privatemsg_folder} (
-          fid           int unsigned NOT NULL primary key,
-          uid           int unsigned NOT NULL,
-          name          varchar(255) NOT NULL
-        ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-      db_query("CREATE TABLE {privatemsg_archive} (
-          id            int unsigned NOT NULL primary key,
-          author        int unsigned NOT NULL,
-          recipient     int unsigned NOT NULL,
-          subject       VARCHAR(64) NOT NULL,
-          message       text NOT NULL,
-          timestamp     int unsigned NOT NULL,
-          hostname      varchar(255) NOT NULL,
-          folder        int unsigned NOT NULL,
-          format        int NOT NULL DEFAULT 0,
-          thread        int NOT NULL DEFAULT 0,
-          key (recipient)
-        ) /*!40100 DEFAULT CHARACTER SET utf8 */;");
-      db_query('CREATE TABLE {privatemsg_block_user} (
-          author int unsigned NOT NULL,
-          recipient int unsigned NOT NULL,
-          PRIMARY KEY (author, recipient)
-        )  /*!40100 DEFAULT CHARACTER SET utf8 */');
-      break;
-      /*
-                notification_subject varchar(255) NOT NULL,
-          notification_text_body varchar(255) NOT NULL,
-          notification_html_body varchar(255) NOT NULL,
-          notification_group_text_body varchar(255) NOT NULL,
-          notification_group_html_body varchar(255) NOT NULL,
-*/
-    case 'pgsql':
-      db_query("CREATE TABLE {privatemsg} (
-          id            integer NOT NULL,
-          author        integer NOT NULL,
-          recipient     integer NOT NULL,
-          subject       varchar(255) NOT NULL,
-          message       text NOT NULL,
-          timestamp     integer NOT NULL,
-          newmsg        smallint NOT NULL,
-          hostname      varchar(255) NOT NULL,
-          format        smallint NOT NULL DEFAULT 0,
-          folder        integer NOT NULL DEFAULT 0,
-          author_del    smallint NOT NULL DEFAULT 0,
-          recipient_del smallint NOT NULL DEFAULT 0,
-          thread        int NOT NULL DEFAULT 0,
-          type          varchar(255) NOT NULL,
-          variables     text,
-          PRIMARY KEY (id)
-        )");
-      db_query("CREATE INDEX {privatemsg_folder_index} ON {privatemsg}(folder)");
-      db_query("CREATE INDEX {privatemsg_folder_recipient} ON {privatemsg}(recipient)");
-      db_query("CREATE INDEX {privatemsg_folder_type} ON {privatemsg}(type)");
-      db_query("CREATE INDEX {privatemsg_folder_author} ON {privatemsg}(author)");
-      db_query("CREATE TABLE {privatemsg_folder} (
-          fid           integer NOT NULL,
-          uid           integer NOT NULL,
-          name          varchar(255) not null,
-          PRIMARY KEY (fid)
-        )");
-      db_query("CREATE TABLE {privatemsg_archive} (
-          id            integer NOT NULL,
-          author        integer NOT NULL,
-          recipient     integer NOT NULL,
-          subject       varchar(64) NOT NULL,
-          message       text NOT NULL,
-          timestamp     integer NOT NULL,
-          hostname      varchar(255) NOT NULL,
-          format        smallint NOT NULL DEFAULT 0,
-          folder        integer NOT NULL,
-          thread        int NOT NULL DEFAULT 0,
-          PRIMARY KEY (id)
-        )");
-      db_query("CREATE INDEX {privatemsg_archive_recipient} ON {privatemsg_archive}(recipient)");
-      db_query('CREATE SEQUENCE {privatemsg}_id_seq INCREMENT 1 START 1');
-      db_query('CREATE SEQUENCE {privatemsg_folder}_fid_seq INCREMENT 1 START 1');
-      db_query('CREATE TABLE {privatemsg_block_user} (
-          author int unsigned NOT NULL,
-          recipient int unsigned NOT NULL,
-          PRIMARY KEY (author, recipient)
-        )');
-      db_query("create or replace function unix_timestamp(timestamp with time zone)
-        returns int as '
-        declare
-           date alias for \$1;
-           timezero timestamp;
-           offset interval;
-        begin
-           timezero := timestamp ''1970-1-1 00:00'' at time zone ''utc'';
-           offset := date-timezero;
-
-           return (extract(''days'' from offset)*86400+
-                   extract(''hours'' from offset)*3600+
-                   extract(''minutes'' from offset)*60+
-                   extract(''seconds'' from offset))::int;
-        end;
-        ' language 'plpgsql'");
-      db_query("create or replace function unix_timestamp(timestamp without time zone)
-        returns int as '
-        declare
-           date alias for \$1;
-           timezero timestamp;
-           offset interval;
-        begin
-           timezero := timestamp ''1970-1-1 00:00'' at time zone ''utc'';
-           offset := date-timezero;
-
-           return (extract(''days'' from offset)*86400+
-                   extract(''hours'' from offset)*3600+
-                   extract(''minutes'' from offset)*60+
-                   extract(''seconds'' from offset))::int;
-        end;
-        ' language 'plpgsql'");
-      break;
-  }
-  // Sent messages folder
-  db_query("INSERT INTO {privatemsg_folder} (fid, uid, name) VALUES (1, 0, 'Sent')");
-  do {
-    $i = db_next_id('{privatemsg_folder}_fid');
-  } while ($i < 1);  // In case this api ever changes to start at zero..
+  // Create tables.
+  drupal_install_schema('privatemsg');
+  $data = array(
+    'fid' => 1,
+    'uid' => 0,
+    'name' => 'Sent',
+  );
+  drupal_write_record('privatemsg_folder', $data);
 }
 
 function privatemsg_uninstall() {
-  db_query("DROP TABLE {privatemsg}");
-  db_query("DROP TABLE {privatemsg_folder}");
-  db_query("DROP TABLE {privatemsg_archive}");
-  if (db_table_exists('privatemsg_block_user')) {
-    db_query("DROP TABLE {privatemsg_block_user}");
-  }
-
-  // The following two tables are now a part of the pm_subscriptions module,
-  // but have been retained to handle updated installs that do not use the
-  // pm_subscriptions module.
-  if (db_table_exists('privatemsg_mails')) {
-    db_query("DROP TABLE {privatemsg_mails}");
-  }
-  if (db_table_exists('privatemsg_mail_edit')) {
-    db_query("DROP TABLE {privatemsg_mail_edit}");
-  }
-
-  db_query("DELETE FROM {variable} WHERE name LIKE 'privatemsg_%'");
-  cache_clear_all('variables', 'cache');
-}
-
-/* Upgrade on mysql from versions before 22-May-2003:
-   Create privatemsg_archive/privatemsg_folder tables and insert one row, shown above^
-   ALTER TABLE privatemsg ADD folder int unsigned NOT NULL;
-   ALTER TABLE privatemsg ADD author_del tinyint unsigned NOT NULL;
-   ALTER TABLE privatemsg ADD recipient_del tinyint unsigned NOT NULL;
-   ALTER TABLE privatemsg ADD INDEX(folder);
-   ALTER TABLE privatemsg CHANGE hostname hostname varchar(255) NOT NULL;
-   Continue with steps below, but skip ALTER line for privatemsg_archive..
- *
- * Upgrade on mysql from versions before 29-Apr-2005:
-   ALTER TABLE privatemsg CHANGE new newmsg tinyint UNSIGNED NOT NULL;
-   ALTER TABLE privatemsg ADD format int NOT NULL DEFAULT '0';
-   ALTER TABLE privatemsg_archive ADD format int NOT NULL DEFAULT '0';
-   UPDATE privatemsg SET format=1;
-   UPDATE privatemsg_archive SET format=1;
- */
-
-function privatemsg_update_1() {
-  return _system_update_utf8(array('privatemsg', 'privatemsg_archive', 'privatemsg_folder'));
-}
-
-function privatemsg_update_2() {
-  $ret = array();
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $sql = 'ALTER TABLE {%s} MODIFY %s int unsigned NOT NULL';
-      $seq = "INSERT INTO {sequences} (name, id) VALUES ('%s', %d)";
-      break;
-    case 'pgsql':
-      $sql = 'ALTER TABLE {%s} ALTER COLUMN %s SET DEFAULT NULL';
-      $seq = 'CREATE SEQUENCE %s_seq INCREMENT 1 START %d';
-      break;
-    default:
-      return $ret;
-  }
-  foreach (array('privatemsg' => 'id', 'privatemsg_folder' => 'fid') as $table => $id) {
-    $ret[] = update_sql(sprintf($sql, $table, $id));
-    $max = db_result(db_query('SELECT max('. $id .') FROM {'. $table .'}'));
-    if ($table == 'privatemsg') {
-      $max = max($max, db_result(db_query('SELECT max(id) FROM {privatemsg_archive}')));
-    }
-    $ret[] = update_sql(sprintf($seq, '{'. $table .'}_'. $id, $max));
-  }
-  $ret[] = update_sql(sprintf($sql, 'privatemsg_archive', 'id'));
-  return $ret;
+  // Drop tables.
+  drupal_uninstall_schema('privatemsg');
 }
 
-function privatemsg_update_3() {
-  $ret = array();
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql('ALTER TABLE {privatemsg} ADD thread int NOT NULL');
-      $ret[] = update_sql('ALTER TABLE {privatemsg_archive} ADD thread int NOT NULL');
-      break;
-    case 'pgsql':
-      foreach (array('privatemsg', 'privatemsg_archive') as $table) {
-        $ret[] = update_sql("ALTER TABLE {$table} ADD thread int");
-        $ret[] = update_sql("ALTER TABLE {$table} ALTER COLUMN thread SET DEFAULT 0");
-        $ret[] = update_sql("UPDATE {$table} SET thread = 0");
-        $ret[] = update_sql("ALTER TABLE {$table} ALTER COLUMN thread SET NOT NULL");
-      }
-      break;
-  }
-  return $ret;
-}
-
-function privatemsg_update_4() {
-  $ret = array();
-
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql("ALTER TABLE {privatemsg} ADD type varchar(255) NOT NULL default '', ADD KEY (type)");
-      $ret[] = update_sql("ALTER TABLE {privatemsg} CHANGE subject subject varchar(255) NOT NULL default ''");
-      if (!db_table_exists('privatemsg_block_user')) {
-        $ret[] = update_sql('CREATE TABLE {privatemsg_block_user} (
-            author int unsigned NOT NULL,
-            recipient int unsigned NOT NULL,
-            PRIMARY KEY (author, recipient)
-          )  /*!40100 DEFAULT CHARACTER SET utf8 */');
-      }
-      break;
-    case 'pgsql':
-      db_add_column($ret, 'privatemsg', 'type', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
-      $ret[] = update_sql("CREATE INDEX {privatemsg_folder_type} ON {privatemsg}(type)");
-      db_change_column($ret, 'privatemsg', 'subject', 'subject', 'varchar(255)', array('not null' => TRUE, 'default' => "''"));
-      if (!db_table_exists('privatemsg_block_user')) {
-        $ret[] = update_sql('CREATE TABLE {privatemsg_block_user} (
-            author int unsigned NOT NULL,
-            recipient int unsigned NOT NULL,
-            PRIMARY KEY (author, recipient)
-          )');
-      }
-      break;
-  }
-
-  return $ret;
-}
-
-/**
- * Add variables column for use by the subscriptions module.
- */
-function privatemsg_update_5() {
-  $ret = array();
-
-  switch ($GLOBALS['db_type']) {
-    case 'mysql':
-    case 'mysqli':
-      $ret[] = update_sql("ALTER TABLE {privatemsg} ADD variables longtext");
-      break;
-    case 'pgsql':
-      db_add_column($ret, 'privatemsg', 'variables', 'text');
-      break;
-  }
-
-  return $ret;
+function privatemsg_schema() {
+  $schema['privatemsg'] = array(
+    'fields' => array(
+      'id' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+      'author' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'recipient' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'subject' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+      'message' => array('type' => 'text'),
+      'timestamp' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'newmsg' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'size' => 'tiny'),
+      'hostname' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+      'folder' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'default' => 0),
+      'author_del' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'size' => 'tiny', 'default' => 0),
+      'recipient_del' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE, 'size' => 'tiny', 'default' => 0),
+      'format' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+      'thread' => array('type' => 'int', 'not null' => TRUE, 'default' => 0),
+      'type' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+      'variables' => array('type' => 'text', 'size' => 'big'),
+    ),
+    'indexes' => array (
+      'recipient' => array('recipient'),
+      'folder' => array('folder'),
+      'type' => array('type'),
+      'author' => array('author'),
+    ),
+    'primary key' => array ('id'),
+  );
+  
+  $schema['privatemsg_folder'] = array(
+    'fields' => array(
+      'fid' => array('type' => 'serial', 'unsigned' => TRUE, 'not null' => TRUE),
+      'uid' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'name' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+    ),
+    'primary key' => array('fid'),
+  );
+  
+  $schema['privatemsg_archive'] = array(
+    'fields' => array(
+      'id' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'author' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'recipient' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'subject' => array('type' => 'varchar', 'length' => 64, 'not null' => TRUE),
+      'message' => array('type' => 'text', 'not null' => TRUE),
+      'timestamp' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'hostname' => array('type' => 'varchar', 'length' => 255, 'not null' => TRUE),
+      'folder' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'format' => array('type' => 'int', 'default' => 0, 'not null' => TRUE),
+      'thread' => array('type' => 'int', 'default' => 0, 'not null' => TRUE),
+    ),
+    'indexes' => array(
+      'recipient' => array('recipient'),
+    ),
+    'primary key' => array('id'),
+  );
+  
+  $schema['privatemsg_block_user'] = array(
+    'fields' => array(
+      'author' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+      'recipient' => array('type' => 'int', 'unsigned' => TRUE, 'not null' => TRUE),
+    ),
+    'primary key' => array('author', 'recipient'),
+  );
+  
+  return $schema;
 }
diff -Nup privatemsg/privatemsg.module privatemsg_new/privatemsg.module
--- privatemsg/privatemsg.module	2007-12-21 10:00:40.000000000 +0100
+++ privatemsg_new/privatemsg.module	2008-01-21 19:17:24.000000000 +0100
@@ -1,5 +1,5 @@
 <?php
-// $Id: privatemsg.module,v 1.70.2.30.2.84 2007/12/21 09:00:40 karthik Exp $
+// $Id: privatemsg.module,v 1.70.2.30.2.63 2007/10/29 17:39:45 karthik Exp $
 
 define('PRIVATEMSG_FOLDER_RECYCLE_BIN', -1);
 define('PRIVATEMSG_FOLDER_INBOX', 0);
@@ -8,10 +8,10 @@ define('PRIVATEMSG_FOLDER_SENT', 1);
 /**
  * Implementation of hook_help().
  */
-function privatemsg_help($section) {
-  switch ($section) {
+function privatemsg_help($path, $arg) {
+  switch ($path) {
     case 'admin/help#privatemsg':
-      $output = '<p>'. t('The private messaging module allows users to send messages to each other without having to share email addresses. An inbox link will appear in the navigation menu. The "write to author" links are included in posts, allowing users to write a private message instead of commenting openly. Allowing users to communicate directly is an important part of building the strength of the community.') .'</p>';
+      $output = '<p>'. t('The private messaging module allows users to send messages to each other without having to share email addresses. An inbox link will appear in the navigation menu. The "write to author" links are included in posts, allowing users to write a private message instead of commenting openly. Allowing users to communicate directly is an important  part of building the strength of the community.') .'</p>';
       $output .= '<p>'. t('The contacts list contains only users that you have previously messaged. To contact users not in your list, you need to know their local user name. Administrators can set messaging options such as frequency of emails, message status display, and number of messages to display per page. They can also configure \'Write to Author\' options.') .'</p>';
       $output .= t('<p>You can</p>
 <ul>
@@ -27,231 +27,202 @@ function privatemsg_help($section) {
 /**
  * Implementation of hook_menu().
  */
-function privatemsg_menu($may_cache) {
+function privatemsg_menu() {
   global $user;
 
   $items = array();
-  $access = user_access('access private messages');
-  if ($may_cache) {
-    $items[] = array(
-      'path' => 'admin/settings/privatemsg',
-      'title' => t('Privatemsg'),
-      'description' => t('Configure Privatemsg settings.'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('privatemsg_configure'),
-      'access' => user_access('administer private messages'),
-    );
-    $items[] = array(
-      'path' => 'privatemsg',
-      'title' => t('Private messages'),
-      'callback' => 'privatemsg_list',
-      'access' => !$user->uid || $access,
-      'type' => MENU_SUGGESTED_ITEM,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/list',
-      'title' => t('List'),
-      'callback' => 'privatemsg_list',
-      'callback arguments' => array(NULL),
-      'access' => !$user->uid || $access,
-      'type' => MENU_DEFAULT_LOCAL_TASK,
-      'weight' => -10,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/new',
-      'title' => t('Compose'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('privatemsg_new_form'),
-      'access' => $access,
-      'type' => MENU_LOCAL_TASK,
-      'weight' => -5,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/contacts',
-      'title' => t('Contacts'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('privatemsg_contacts_form'),
-      'access' => $access,
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 0,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/folders',
-      'title' => t('Manage folders'),
-      'callback' => 'privatemsg_manage_folders',
-      'access' => $access && $user->uid,
-      'type' => MENU_LOCAL_TASK,
-      'weight' => 5,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/folders/movetonew',
-      'title' => t('Move to new folder'),
-      'callback' => 'drupal_get_form',
-      'callback arguments' => array('privatemsg_new_folder_form'),
-      'access' => user_access('create new folder') && $user->uid,
-      'type' => MENU_CALLBACK,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/autocomplete',
-      'title' => t('Privatemsg autocomplete'),
-      'callback' => 'privatemsg_autocomplete',
-      'access' => $access,
-      'type' => MENU_CALLBACK,
-    );
-    $items[] = array(
-      'path' => 'privatemsg/delete',
-      'callback' => 'privatemsg_delete',
-      'access' => $access && $user->uid, // No guest access
-      'type' => MENU_CALLBACK
-    );
-  }
-  else {
-    if (!isset($user->privatemsg_allow)) {
-      _privatemsg_user_add_defaults($user);
-    }
-    if (arg(0) == 'privatemsg' && arg(1) == 'view' && intval(arg(2)) > 0) {
-      $items[] = array(
-        'path' => 'privatemsg/view/'. arg(2),
-        'title' => t('Read message'),
-        'callback' => 'privatemsg_view',
-        'callback arguments' => array(intval(arg(2)), FALSE),
-        'access' => $access && $user->uid, // Check access/redirect in callback
-        'type' => MENU_CALLBACK,
-        'weight' => -10,
-      );
-      $items[] = array(
-        'path' => 'privatemsg/view/'. arg(2) .'/read',
-        'title' => t('Read message'),
-        'access' => $access && $user->uid, // Check access/redirect in callback
-        'type' => MENU_DEFAULT_LOCAL_TASK,
-        'weight' => -10,
-      );
-      $items[] = array(
-        'path' => 'privatemsg/view/'. arg(2) .'/back',
-        'title' => t('Back to list'),
-        'callback' => 'privatemsg_back_to_list',
-        'callback arguments' => array(intval(arg(2))),
-        'access' => TRUE, // Check access/redirect in callback
-        'type' => MENU_LOCAL_TASK,
-        'weight' => 0,
-      );
-    }
-
-    if (arg(0) == 'privatemsg' && arg(1) == 'reply' && intval(arg(2)) > 0) {
-      $items[] = array(
-        'path' => 'privatemsg/reply/'. arg(2),
-        'title' => t('Write a reply'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('privatemsg_new_form'),
-        'access' => $access,
-        'type' => MENU_CALLBACK,
-      );
-    }
-
-    if (arg(0) == 'privatemsg' && arg(1) == 'new' && intval(arg(2)) > 0) {
-      $items[] = array(
-        'path' => 'privatemsg/new/'. arg(2),
-        'title' => t('Write a new message'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('privatemsg_new_form'),
-        'access' => $access,
-        'type' => MENU_CALLBACK,
-      );
-    }
-    if ($user-> uid != arg(2) && arg(0) == 'privatemsg' && arg(1) == 'block' && ($account = user_load(array('uid' => arg(2))))) {
-      $blocked = privatemsg_user_blocked($account->uid);
-      $title_args = array('@user' => $account->name);
-      $items[] = array(
-        'path' => 'privatemsg/block/'. arg(2),
-        'title' => $blocked ? t('Unblock @user', $title_args) : t('Block @user', $title_args),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array($blocked ? 'privatemsg_unblock_user_form' : 'privatemsg_block_user_form', $account),
-        'type' => MENU_CALLBACK,
-      );
-    }
-
-    $new = _privatemsg_get_new_messages();
-    $items[] = array(
-      'path' => 'privatemsg/inbox',
-      'title' => variable_get('privatemsg_menu_link', t('My inbox')) . ($new ? ' ('. $new .')' : ''),
-      'callback' => 'drupal_goto',
-      'callback arguments' => array('privatemsg'),
-      'type' => $user->uid && $user->privatemsg_allow ? MENU_DYNAMIC_ITEM : MENU_CALLBACK,
-    );
-
-    if ($new && strncmp($_GET['q'], 'privatemsg', 10) && $user->privatemsg_setmessage_notify && user_access('access private messages')) {
-      $m = drupal_set_message();
-      if (empty($m)) {
-        drupal_set_message(strtr(format_plural($new, 'You have a new <a href="!url">private message</a>.', 'You have @count new <a href="!url">private messages</a>.'), array('!url' => url('privatemsg'))));
-      }
-    }
-
-    if (arg(0) == 'privatemsg' && arg(1) == 'folders' && intval(arg(2)) > 1) {
-      $modify_folder = privatemsg_folder_access($user->uid, arg(2));
-      if (!$modify_folder) {
-        drupal_goto('privatemsg/folders');
-      }
-
-      $items[] = array(
-        'path' => 'privatemsg/folders/'. arg(2) .'/rename',
-        'title' => t('Rename folder'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('privatemsg_rename_folder_form', arg(2)),
-        'access' => $access,
-        'type' => MENU_CALLBACK,
-      );
-      $items[] = array(
-        'path' => 'privatemsg/folders/'. arg(2) .'/empty',
-        'title' => t('Empty folder?'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('privatemsg_empty_folder_form', arg(2)),
-        'access' => $access,
-        'type' => MENU_CALLBACK,
-      );
-      $items[] = array(
-        'path' => 'privatemsg/folders/'. arg(2) .'/delete',
-        'title' => t('Delete folder?'),
-        'callback' => 'drupal_get_form',
-        'callback arguments' => array('privatemsg_delete_folder_form', arg(2)),
-        'access' => $access,
-        'type' => MENU_CALLBACK,
-      );
-    }
-    if (is_numeric(arg(1)) && (arg(0) == 'privatemsg' || arg(0) == 'user') && ($user->uid == arg(1) || user_access('administer private messages'))) {
-      if (arg(0) == 'user' && arg(2) == 'privatemsg') {
-        $account = $user->uid == arg(1) ? $user : user_load(array('uid' => arg(1)));
-        $items[] = array(
-          'path' => 'user/'. arg(1) .'/privatemsg',
-          'title' => t('Privatemsg'),
-          'callback' => 'privatemsg_list',
-          'callback arguments' => array(arg(1)),
-          'access' => $account->privatemsg_allow,
-          'type' => MENU_LOCAL_TASK,
-        );
-      }
-      if (arg(0) == 'privatemsg') {
-        if ($user->uid == arg(1)) {
-          $account = $user;
-          $title = t('Private messages');
-        }
-        else {
-          $account = user_load(array('uid' => arg(1)));
-          $title = t('Private messages for @name', array('@name' => $account->name));
-        }
 
-        $items[] = array(
-          'path' => 'privatemsg/'. arg(1),
-          'title' => $title,
-          'callback' => 'privatemsg_list',
-          'callback arguments' => array(arg(1)),
-          'access' => $account->privatemsg_allow,
-          'type' => MENU_CALLBACK,
-        );
-      }
-    }
-
-    drupal_add_css('./'. drupal_get_path('module', 'privatemsg') .'/privatemsg.css');
-  }
+  $items['admin/settings/privatemsg'] = array(
+    'title' => 'Privatemsg',
+    'description' => 'Configure Privatemsg settings.',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_configure'),
+    'access arguments' => array('administer private messages'),
+  );
+  $items['privatemsg'] = array(
+    'title' => privatemsg_get_inbox_title(),
+    'title callback' => 'privatemsg_get_inbox_title',
+    'page callback' => 'privatemsg_list',
+    'page arguments' => array(NULL),
+    'access callback' => 'privatemsg_special_access1',
+    'type' => MENU_SUGGESTED_ITEM,
+  );
+  $items['privatemsg/list'] = array(
+    'title' => privatemsg_get_inbox_title(),
+    'page callback' => 'privatemsg_list',
+    'page arguments' => array(NULL),
+    'access callback' => 'privatemsg_special_access1',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['privatemsg/new'] = array(
+    'title' => 'Compose',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_new_form'),
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => -5,
+  );
+  $items['privatemsg/contacts'] = array(
+    'title' => 'Contacts',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_contacts_form'),
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
+  );
+  $items['privatemsg/folders'] = array(
+    'title' => 'Manage folders',
+    'page callback' => 'privatemsg_manage_folders',
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 5,
+  );
+  $items['privatemsg/folders/movetonew'] = array(
+    'title' => 'Move to new folder',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_new_folder_form'),
+    'access callback' => 'privatemsg_special_access3',
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/autocomplete'] = array(
+    'title' => 'Privatemsg autocomplete',
+    'page callback' => 'privatemsg_autocomplete',
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/delete'] = array(
+    'page callback' => 'privatemsg_delete',
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_CALLBACK,
+  );
+
+
+  $items['privatemsg/view/%privatemsg'] = array(
+    'title' => 'Read message',
+    'page callback' => 'privatemsg_view',
+    'page arguments' => array(2, FALSE),
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_CALLBACK,
+    'weight' => -10,
+  );
+  $items['privatemsg/view/%privatemsg/read'] = array(
+    'title' => 'Read message',
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['privatemsg/view/%/back'] = array(
+    'title' => 'Back to list',
+    'page callback' => 'privatemsg_back_to_list',
+    'page arguments' => array(2),
+    'access callback' => 'privatemsg_return_true',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
+  );
+
+  $items['privatemsg/reply/%'] = array(
+    'title' => 'Write a reply',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_new_form', 2),
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/reply/%/write'] = array(
+    'title' => 'Write a reply',
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['privatemsg/reply/%/cancel'] = array(
+    'title' => 'Cancel reply',
+    'page callback' => 'privatemsg_cancel_reply',
+    'page arguments' => array(2),
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
+  );
+
+  $items['privatemsg/new/%'] = array(
+    'title' => 'Write a new message',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_new_form'),
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/new/%/write'] = array(
+    'title' => 'Write a new message',
+    'access arguments' => array('administer private messages'),
+    'type' => MENU_DEFAULT_LOCAL_TASK,
+    'weight' => -10,
+  );
+  $items['privatemsg/new/%/cancel'] = array(
+    'title' => 'Cancel message',
+    'page callback' => 'drupal_goto',
+    'page arguments' => array('privatemsg'),
+    'access callback' => 'privatemsg_special_access2',
+    'type' => MENU_LOCAL_TASK,
+    'weight' => 0,
+  );
+
+  $items['privatemsg/block/%user'] = array(
+    'title callback' => 'privatemsg_get_block_title',
+    'title arguments' => array(2),
+    'page callback' => 'privatemsg_get_block_form',
+    'page arguments' => array(2),
+    'type' => MENU_CALLBACK,
+  );
+
+  $items['privatemsg/inbox'] = array(
+    'title callback' => 'privatemsg_get_inbox_title',
+    'title arguments' => array(),
+    'page callback' => 'drupal_goto',
+    'page arguments' => array('privatemsg'),
+    'type' => MENU_CALLBACK,
+  );
+
+  $items['privatemsg/folders/%/rename'] = array(
+    'title' => 'Rename folder',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_rename_folder_form', 2),
+    'access callback' => 'privatemsg_administer_folder_permission',
+    'access arguments' => array(2),
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/folders/%/empty'] = array(
+    'title' => 'Empty folder?',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_empty_folder_form', 2),
+    'access callback' => 'privatemsg_administer_folder_permission',
+    'access arguments' => array(2),
+    'type' => MENU_CALLBACK,
+  );
+  $items['privatemsg/folders/%/delete'] = array(
+    'title' => 'Delete folder?',
+    'page callback' => 'drupal_get_form',
+    'page arguments' => array('privatemsg_delete_folder_form', 2),
+    'access callback' => 'privatemsg_administer_folder_permission',
+    'access arguments' => array(2),
+    'type' => MENU_CALLBACK,
+  );
+
+  $items['user/%user/privatemsg'] = array(
+    'title' => 'Privatemsg',
+    'page callback' => 'privatemsg_list',
+    'page arguments' => array(1),
+    'access callback' => 'privatemsg_special_access6',
+    'access arguments' => array(1),
+    'type' => MENU_LOCAL_TASK,
+  );
+  $items['privatemsg/%user'] = array(
+    'title callback' => 'privatemsg_get_title',
+    'title arguments' => array(1),
+    'page callback' => 'privatemsg_list',
+    'page arguments' => array(1),
+    'access callback' => 'privatemsg_special_access6',
+    'access arguments' => array(1),
+    'type' => MENU_CALLBACK,
+  );
 
   return $items;
 }
@@ -285,7 +256,11 @@ function privatemsg_link($type, $node = 
   if ($type == 'comment' && $node->nid) {
     $node = node_load($node->nid);
   }
-  if (user_access('access private messages') && in_array($teaser ? 'teaser' : $type, variable_get('privatemsg_link_'. $node->type, array())) && $uid != $user->uid && $user->privatemsg_allow) {
+  if (user_access('access private messages')
+      && in_array($teaser ? 'teaser' : $type, variable_get('privatemsg_link_'. $node->type, array()))
+      && (!property_exists($user, 'uid')
+          || !property_exists($user, 'privatemsg_allow')
+          || ($uid != $user->uid && $user->privatemsg_allow))) {
     if (!isset($access[$uid])) {
       $author = user_load(array('uid' => $uid));
       $access[$uid] = user_access('access private messages', $author) && $author->uid && $author->privatemsg_allow;
@@ -304,8 +279,6 @@ function privatemsg_link($type, $node = 
  * Implementation of hook_user().
  */
 function privatemsg_user($type, &$edit, &$account, $category = NULL) {
-  global $user;
-
   switch ($type) {
     case 'load':
       _privatemsg_user_add_defaults($account);
@@ -313,30 +286,35 @@ function privatemsg_user($type, &$edit, 
     case 'view':
       if (user_access('access private messages')) {
         if (privatemsg_message_allowed($account->uid)) {
-          $return[t('Private messages')][] = array(
-            'value' => l(t('Write private message'), 'privatemsg/new/'. $account->uid, array(
-             'title' => t('Send private message to @name', array('@name' => $account->name)))),
-            'class' => 'send-message');
+          $account->content[t('Private messages')][] = array(
+            '#type' => 'user_profile_item',
+            '#title' => t('Send private message to @name', array('@name' => $account->name)),
+            '#value' => l(t('Write private message'), 'privatemsg/new/'. $account->uid, array('attributes' =>
+              array('title' => t('Send private message to @name', array('@name' => $account->name))))),
+            '#attributes' => array('class' => 'send-message'),
+          );
         }
-        if ($account->uid != $user->uid) {
-          if (!privatemsg_user_blocked($account->uid) ) {
-            $return[t('Private messages')][] = array(
-              'value' => l(t('Block messages'), 'privatemsg/block/'. $account->uid, array(
-              'title' => t('Block private messages from @name', array('@name' => $account->name)))),
-              'class' => 'block-message'
-            );
-          }
-          else {
-            $return[t('Private messages')][] = array(
-              'value' => l(t('Unblock messages'), 'privatemsg/block/'. $account->uid, array(
-              'title' => t('Unblock private messages from @name', array('@name' => $account->name)))),
-              'class' => 'unblock-message');
-          }
+        if (!privatemsg_user_blocked($account->uid)) {
+          $account->content[t('Private messages')][] = array(
+            '#type' => 'user_profile_item',
+            '#title' => t('Block private messages from @name', array('@name' => $account->name)),
+            '#value' => l(t('Block messages'), 'privatemsg/block/'. $account->uid, array('attributes' =>
+              array('title' => t('Block private messages from @name', array('@name' => $account->name))))),
+            '#attributes' => array('class' => 'block-message'),
+          );
         }
-
-        return $return;
+        else  {
+          $account->content[t('Private messages')][] = array(
+            '#type' => 'user_profile_item',
+            '#title' => t('Unblock private messages from @name', array('@name' => $account->name)),
+            '#value' => l(t('Unblock messages'), 'privatemsg/block/'. $account->uid, array('attributes' =>
+              array('title' => t('Unblock private messages from @name', array('@name' => $account->name))))),
+            '#attributes' => array('class' => 'unblock-message'),
+          );
+        }
+        return;
       }
-      elseif ($user->uid) {
+      elseif ($GLOBALS['user']->uid) {
         return;
       }
       elseif ($account->privatemsg_allow) {
@@ -399,35 +377,38 @@ function privatemsg_user($type, &$edit, 
   }
 }
 
+function _privatemsg_user_add_defaults(&$account) {
+  if (!isset($account->privatemsg_allow)) {
+    $account->privatemsg_allow = variable_get('privatemsg_default_allow', 1);
+    $account->privatemsg_setmessage_notify = variable_get('privatemsg_default_setmessage_notify', 1);
+  }
+}
+
 /**
  * Implementation of hook_form_alter().
  */
-function privatemsg_form_alter($form_id, &$form) {
-  switch ($form_id) {
-    case 'node_type_form':
-      $link = variable_get('privatemsg_link_'. $form['#node_type']->type, array());
-      $form['workflow']['privatemsg_link'] = array(
-        '#type' => 'checkboxes',
-        '#title' => t('Private message "Write to author" links'),
-        '#weight' => 30,
-        'node' => array(
-          '#type' => 'checkbox',
-          '#title' => t('Link on node'),
-          '#default_value' => in_array('node', $link),
-        ),
-        'teaser' => array(
-          '#type' => 'checkbox',
-          '#title' => t('Link on teaser'),
-          '#default_value' => in_array('teaser', $link),
-        ),
-        'comment' => array(
-          '#type' => module_exists('comment') ? 'checkbox' : 'hidden',
-          '#title' => t('Link on comments'),
-          '#default_value' => in_array('comment', $link),
-        ),
-      );
-      break;
-  }
+function privatemsg_form_node_type_form_alter(&$form, $form_state, $form_id) {
+  $link = variable_get('privatemsg_link_'. $form['#node_type']->type, array());
+  $form['workflow']['privatemsg_link'] = array(
+    '#type' => 'checkboxes',
+    '#title' => t('Private message "Write to author" links'),
+    '#weight' => 30,
+    'node' => array(
+      '#type' => 'checkbox',
+      '#title' => t('Link on node'),
+      '#default_value' => in_array('node', $link),
+    ),
+    'teaser' => array(
+      '#type' => 'checkbox',
+      '#title' => t('Link on teaser'),
+      '#default_value' => in_array('teaser', $link),
+    ),
+    'comment' => array(
+      '#type' => module_exists('comment') ? 'checkbox' : 'hidden',
+      '#title' => t('Link on comments'),
+      '#default_value' => in_array('comment', $link),
+    ),
+  );
 }
 
 /**
@@ -436,6 +417,7 @@ function privatemsg_form_alter($form_id,
 function privatemsg_block($op = 'list', $delta = 0, $edit = array()) {
   if ($op == 'list') {
     $blocks[0]['info'] = t('Private messages');
+    $blocks[0]['cache'] = BLOCK_NO_CACHE;
     return $blocks;
   }
   else if ($op == 'view') {
@@ -447,7 +429,7 @@ function privatemsg_block($op = 'list', 
 }
 
 /**
- * Implementation of hook privatemsg_alter().
+ * Implementation of hook privatemsg_alter
  */
 function privatemsg_privatemsg_alter($sender = NULL, $recipient = NULL, $subject = NULL, $body = NULL, $format = NULL, $thread = NULL, $type = NULL) {
   $key = _privatemsg_get_type_key($type);
@@ -459,11 +441,18 @@ function privatemsg_privatemsg_alter($se
   return TRUE;
 }
 
-function privatemsg_message_allowed($recipient, $author = NULL) {
-  global $user;
+/**
+ * Implementation of hook_simpletest
+ */
+function privatemsg_simpletest() {
+  $dir = drupal_get_path('module', 'privatemsg') .'/tests';
+  $tests = file_scan_directory($dir, '\.test$');
+  return array_keys($tests);
+}
 
-  $author = $author ? $author : $user->uid;
-  $account = user_load(array('uid' => $recipient));
+function privatemsg_message_allowed($recipient, $author = NULL) {
+  $author = $author ? $author : $GLOBALS['user']->uid;
+  $user = user_load(array('uid' => $recipient));
   # user can not message themselves
   if ($recipient == $author) {
     return FALSE;
@@ -471,7 +460,7 @@ function privatemsg_message_allowed($rec
   if (privatemsg_user_blocked($author, $recipient)) {
     return FALSE;
   }
-  if (isset($account->privatemsg_allow) && !$account->privatemsg_allow) {
+  if (isset($user->privatemsg_allow) && !$user->privatemsg_allow) {
     return FALSE;
   }
   return TRUE;
@@ -479,7 +468,7 @@ function privatemsg_message_allowed($rec
 
 function privatemsg_user_blocked($author, $recipient = NULL) {
   global $user;
-  $recipient = ($recipient) ? $recipient : $user->uid;
+  $recipient = $recipient ? $recipient : $user->uid;
   return db_result(db_query("SELECT COUNT(*) FROM {privatemsg_block_user} WHERE author = %d AND recipient = %d", $author, $recipient));
 }
 
@@ -488,7 +477,9 @@ function privatemsg_block_user($author, 
   global $user;
   $recipient = ($recipient) ? $recipient : $user->uid;
   if (!privatemsg_user_blocked($author, $recipient)) {
-    db_query("INSERT INTO {privatemsg_block_user} (author, recipient) VALUES (%d, %d)", $author, $recipient);
+    $data = array('author' => $author, 'recipient' => $recipient);
+    drupal_write_record('privatemsg_block_user', $data);
+    //db_query("INSERT INTO {privatemsg_block_user} (author, recipient) VALUES (%d, %d)", $author, $recipient);
     drupal_set_message(t('User has been blocked'));
   }
 }
@@ -508,9 +499,9 @@ function privatemsg_block_user_form($acc
   return confirm_form($form, t('Are you sure you want to block !user from sending you any more messages?', array('!user' => $account->name)), 'user/'. $account->uid, '');
 }
 
-function privatemsg_block_user_form_submit($form_id, $form_values) {
-  privatemsg_block_user($form_values['uid']);
-  return 'user/'. $form_values['uid'];
+function privatemsg_block_user_form_submit($form, &$form_state) {
+  privatemsg_block_user($form_state['values']['uid']);
+  $form_state['redirect'] = 'user/'. $form_state['values']['uid'];
 }
 
 function privatemsg_unblock_user_form($account) {
@@ -519,9 +510,9 @@ function privatemsg_unblock_user_form($a
   return confirm_form($form, t('Are you sure you want to allow !user to send you messages?', array('!user' => $account->name)), 'user/'. $account->uid, '');
 }
 
-function privatemsg_unblock_user_form_submit($form_id, $form_values) {
-  privatemsg_unblock_user($form_values['uid']);
-  return 'user/'. $form_values['uid'];
+function privatemsg_unblock_user_form_submit($form, &$form_state) {
+  privatemsg_unblock_user($form_state['values']['uid']);
+  $form_state['redirect'] = 'user/'. $form_state['values']['uid'];
 }
 
 function _privatemsg_block_inbox() {
@@ -654,11 +645,11 @@ function privatemsg_configure() {
   return system_settings_form($form);
 }
 
-function privatemsg_configure_validate($form_id, $form_values, $form) {
-  if (!empty($form_values['privatemsg_welcome_sender'])) {
-    $sender = user_load(array('name' => $form_values['privatemsg_welcome_sender']));
+function privatemsg_configure_validate($form, &$form_state) {
+  if (!empty($form_state['values']['privatemsg_welcome_sender'])) {
+    $sender = user_load(array('name' => $form_state['values']['privatemsg_welcome_sender']));
     if ($sender->uid) {
-      form_set_value($form['welcome']['privatemsg_welcome_sender'], $sender->uid);
+      $form_state['privatemsg_welcome_sender'] = $sender->uid;
     }
     else {
       form_set_error('privatemsg_welcome_sender', t('The <em>Sender</em> does not exist.'));
@@ -666,31 +657,25 @@ function privatemsg_configure_validate($
   }
 }
 
-function privatemsg_list($uid = NULL) {
-  global $user;
-
-  if (!empty($uid) && is_numeric($uid) && user_access('administer private messages')) {
-    $account = user_load(array('uid' => $uid));
-  }
-  else {
-    $account = $user;
+function privatemsg_list($account = NULL) {
+  if ($account == null) {
+    $account = $GLOBALS['user'];
   }
   // Notification emails link here, but the user may not be logged in yet.
   if ($account && !$account->uid) {
     drupal_goto('user/login', 'destination=privatemsg');
   }
-  // wha? Disallow users who have set their pref to "don't contact me" from
-  // seeing their inbox? Surely not: privatemsg_allow only determines whether a
-  // user receives direct private messages, there are still other types of
-  // messages that arrive in a user's inbox.
+  // wha? Disallow users who have set their pref to "don't contact me" from seeing their inbox?
+  // Surely not: privatemsg_allow only determines whether a user receives direct private messages,
+  // there are still other types of message that arrive in a user's inbox
   if (!user_access('access private messages')) {// || !$account->privatemsg_allow) {
     return drupal_access_denied();
   }
 
   $args = array($account->uid);
-  if (isset($_SESSION['privatemsg_type'])) {
+  if (isset($form_state['storage']['privatemsg_type'])) {
     $type = " AND type = '%s'";
-    $args[] = $_SESSION['privatemsg_type'];
+    $args[] = $form_state['storage']['privatemsg_type'];
   }
   else {
     $type = '';
@@ -708,7 +693,7 @@ function privatemsg_list($uid = NULL) {
     $join_field = 'author';
   }
   $sql1 = "SELECT id, subject, p.timestamp, u.uid, u.name, newmsg, type FROM {privatemsg} p INNER JOIN {users} u ON ";
-  $sql = $sql1 ."p.$join_field = u.uid WHERE p.$where_field = %d $type AND p.{$where_field}_del = %d";
+  $sql = $sql1 . "p.$join_field = u.uid WHERE p.$where_field = %d $type AND p.{$where_field}_del = %d";
   if ($current_folder == PRIVATEMSG_FOLDER_RECYCLE_BIN) {
     $args[] = 1;
     $sql .= " UNION $sql1 p.recipient = u.uid WHERE p.author = %d $type AND p.author_del = %d";
@@ -725,7 +710,7 @@ function privatemsg_list($uid = NULL) {
 
   $header = _privatemsg_list_header($current_folder);
   $ts = tablesort_init($header);
-  $_SESSION['privatemsg_list_sql'] = array(
+  $form_state['storage']['privatemsg_list_sql'] = array(
     'sql' => $sql,
     'args' => $args,
     'field' => db_escape_string($ts['sql']),
@@ -733,9 +718,9 @@ function privatemsg_list($uid = NULL) {
   );
   $result = pager_query($sql . tablesort_sql($header), variable_get('privatemsg_per_page', 10), 0, $count_query, $args);
   $messages = array();
-  while ($message = db_fetch_object($result)) {
+  while ($message = db_fetch_array($result)) {
     if ($current_folder == PRIVATEMSG_FOLDER_SENT) {
-      $message->newmsg = 0;
+      $message['newmsg'] = 0;
     }
     $messages[] = $message;
   }
@@ -757,7 +742,7 @@ function _privatemsg_folder_map($fid = N
   if (!isset($fid)) {
     return $map;
   }
-  return isset($map[$fid]) ? $map[$fid] : db_result(db_query('SELECT name FROM {privatemsg_folder} WHERE fid = %d AND uid = %d', $current_folder, $uid));
+  return isset($map[$fid]) ? $map[$fid] : db_result(db_query('SELECT name FROM {privatemsg_folder} WHERE fid = %d AND uid = %d', $fid, $uid));
 }
 
 function _privatemsg_list_header($current_folder) {
@@ -769,9 +754,7 @@ function _privatemsg_list_header($curren
   );
 }
 
-function privatemsg_cur_folder_form($folders, $current_folder) {
-  global $user;
-
+function privatemsg_cur_folder_form(&$form_state, $folders, $current_folder) {
   foreach ($folders as $folder) {
     $options[$folder['fid']] = $folder['name'];
   }
@@ -794,7 +777,7 @@ function privatemsg_cur_folder_form($fol
     '#attributes' => array('class' => 'js-hide'),
   );
   $actor = $current_folder == 1 ? 'author' : 'recipient';
-  $result = db_query("SELECT DISTINCT type FROM {privatemsg} WHERE folder = %d AND {$actor}_del = 0 AND {$actor} = %d", $current_folder, $user->uid);
+  $result = db_query("SELECT DISTINCT type FROM {privatemsg} WHERE folder = %d AND {$actor}_del = 0 AND {$actor} = %d", $current_folder, $GLOBALS['user']->uid);
   $types = array(
     '_all' => t('All'),
     '_read' => t('Read'),
@@ -805,8 +788,8 @@ function privatemsg_cur_folder_form($fol
     'all types' => t('All types'),
   );
   $filter_types = array('all types' => t('All types'));
-  while ($t = db_fetch_object($result)) {
-    $type = check_plain($t->type);
+  while ($t = db_fetch_array($result)) {
+    $type = check_plain($t['type']);
     $types[$type] = $type;
     $filter_types[$type] = $type;
   }
@@ -821,10 +804,10 @@ function privatemsg_cur_folder_form($fol
     '#type' => 'select',
     '#title' => t('Filter'),
     '#options' => $filter_types,
-    '#default_value' => isset($_SESSION['privatemsg_type']) ? $_SESSION['privatemsg_type'] : 'all types',
+    '#default_value' => isset($form_state['storage']['privatemsg_type']) ? $form_state['storage']['privatemsg_type'] : 'all types',
   );
-  if (isset($_SESSION['privatemsg_type'])) {
-    $form['header']['type']['#default_value'] = $_SESSION['privatemsg_type'];
+  if (isset($form_state['storage']['privatemsg_type'])) {
+    $form['header']['type']['#default_value'] = $form_state['storage']['privatemsg_type'];
   }
   $form['header']['type_submit'] = array(
     '#type' => 'submit',
@@ -832,35 +815,36 @@ function privatemsg_cur_folder_form($fol
     '#attributes' => array('class' => 'js-hide'),
   );
 
+
   return $form;
 }
 
-function privatemsg_cur_folder_form_submit($form_id, $form_values) {
-  switch ($form_values['op']) {
+function privatemsg_cur_folder_form_submit($form, &$form_state) {
+  switch ($form_state['clicked_button']['#value']) {
     case t('Go'):
       $redirect = 'privatemsg';
-      if ($form_values['folder_select']) {
+      if ($form_state['values']['folder_select']) {
         $redirect .= '/'. (is_numeric(arg(1)) ? arg(1) : 'list');
-        $redirect .= '/'. $form_values['folder_select'];
+        $redirect .= '/'. $form_state['values']['folder_select'];
       }
-      unset($_SESSION['privatemsg_type']);
-      return $redirect;
+      unset($form_state['storage']['privatemsg_type']);
+      $form_state['redirect'] = $redirect;
     case t('Filter'):
-      $type = $form_values['filter_type'];
+      $type = $form_state['values']['filter_type'];
       // all other '_' will be handled by JS.
       if ($type[0] != '_') {
         if ($type == 'all types') {
-          unset($_SESSION['privatemsg_type']);
+          unset($form_state['storage']['privatemsg_type']);
         }
         else {
-          $_SESSION['privatemsg_type'] = $form_values['filter_type'];
+          $form_state['storage']['privatemsg_type'] = $form_state['values']['filter_type'];
         }
       }
       break;
   }
 }
 
-function privatemsg_list_form($messages, $folders, $current_folder, $account) {
+function privatemsg_list_form(&$form_state, $messages, $folders, $current_folder, $account) {
   global $user;
 
   $extra_folders = array();
@@ -869,6 +853,7 @@ function privatemsg_list_form($messages,
       $extra_folders[$folder['fid']] = $folder['name'];
     }
   }
+
   if (user_access('create new folder')) {
     $extra_folders['new'] = t('New folder...');
   }
@@ -884,38 +869,39 @@ function privatemsg_list_form($messages,
   );
   foreach ($messages as $message) {
     if ($current_folder != 1) {
-      $new = $message->newmsg;
+      $new = $message['newmsg'];
       $new_text = theme('mark');
     }
     else {
-      $new = variable_get('privatemsg_sent_status', 1) ? $message->newmsg : 0;
+      $new = variable_get('privatemsg_sent_status', 1) ? $message['newmsg'] : 0;
       $new_text = ' <span class="marker">'. t('unread') .'</span>';
     }
 
-    $form['messages'][$message->id]['message'] = array(
+
+    $form['messages'][$message['id']]['message'] = array(
       '#type' => 'value',
       '#value' => $message,
     );
 
-    $form['messages'][$message->id]['#new'] = $new;
+    $form['messages'][$message['id']]['#new'] = $new;
 
-    $form['messages'][$message->id]['selected'] = array(
+    $form['messages'][$message['id']]['selected'] = array(
       '#type' => 'checkbox',
     );
-    $form['messages'][$message->id]['type'] = array(
-      '#value' => check_plain($message->type),
+    $form['messages'][$message['id']]['type'] = array(
+      '#value' => check_plain($message['type']),
     );
-    $form['messages'][$message->id]['user'] = array(
+    $form['messages'][$message['id']]['user'] = array(
       '#type' => 'value',
-      '#value' => theme('privatemsg_username', $message),
+      '#value' => theme('privatemsg_username', user_load($message['uid'])),
     );
-    $form['messages'][$message->id]['subject'] = array(
+    $form['messages'][$message['id']]['subject'] = array(
       '#type' => 'value',
-      '#value' => l($message->subject, 'privatemsg/view/'. $message->id, array(), NULL, 'message-'. $message->id) . ($new ? (' '. $new_text) : ''),
+      '#value' => l($message['subject'], 'privatemsg/view/'. $message['id'], array(), NULL, 'message-'. $message['id']) . ($new ? (' '. $new_text) : ''),
     );
-    $form['messages'][$message->id]['date'] = array(
+    $form['messages'][$message['id']]['date'] = array(
       '#type' => 'value',
-      '#value' => format_date($message->timestamp, 'small'),
+      '#value' => format_date($message['timestamp'], 'small'),
     );
   }
   $form['pager'] = array(
@@ -940,7 +926,7 @@ function privatemsg_list_form($messages,
         );
         $actions['undelete'] = array(
           '#type' => 'submit',
-          '#value' => t('Restore'),
+          '#value' => t('Move to inbox'),
         );
         $actions['empty'] = array(
           '#type' => 'submit',
@@ -964,17 +950,13 @@ function privatemsg_list_form($messages,
         );
     }
 
+
     if ($del == 1) {
       $form['selected']['actions'] = $actions;
     }
 
-    // Control to move messages to a new folder. Display only for inbox and
-    // custom folders.
-    if ((arg(1) == NULL || arg(1) == 'list') && count($extra_folders) > 0 && $current_folder != PRIVATEMSG_FOLDER_RECYCLE_BIN && $current_folder != PRIVATEMSG_FOLDER_SENT) {
-      // Do not display the recycle bin in the move to folder drop down as the
-      // delete button is already available.
-      unset($extra_folders[PRIVATEMSG_FOLDER_RECYCLE_BIN]);
-
+    // Control to move messages to a new folder.
+    if ((arg(1) == NULL || arg(1) == 'list' || arg(1) == $account->uid) && count($extra_folders) > 0 && $current_folder != 1) {
       $form['selected']['folder'] = array(
         '#prefix' => '<div style="margin-left: 1em;">',
         '#type' => 'select',
@@ -999,40 +981,40 @@ function privatemsg_list_form($messages,
   );
 
   drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg.js');
-  drupal_add_js(array('privatemsg' => $js), 'setting');
+  if (isset($js)) {
+    drupal_add_js(array('privatemsg' => $js), 'setting');
+  }
 
   return $form;
 }
 
-function privatemsg_list_form_submit($form_id, $form_values) {
-  global $user;
-
+function privatemsg_list_form_submit($form, &$form_state) {
   $selected = array();
-  foreach ($form_values['messages'] as $mid => $message) {
+  foreach ($form_state['values']['messages'] as $mid => $message) {
     if ($message['selected']) {
       $selected[$mid] = $message;
       $placeholders[] = '%d';
     }
   }
-  if (!$selected && ($form_values['op'] != t('Empty recycle bin'))) {
+  if (!$selected && ($form_state['clicked_button']['#value'] != t('Empty recycle bin'))) {
     return;
   }
   $args = array_keys($selected);
-  $args[] = $form_values['account']->uid;
+  $args[] = $form_state['values']['account']->uid;
   $where1 = 'WHERE id IN ('. implode(', ', $placeholders) .')  AND ';
   $where = $where1 .'recipient = %d';
   $new = 0;
-  switch ($form_values['op']) {
+  switch ($form_state['clicked_button']['#value']) {
     case t('Delete'):
       if ($_POST['js_bypass'] == 1) {
         foreach ($selected as $mid => $message) {
           _privatemsg_delete($mid);
         }
-        drupal_set_message(t('The selected messages have been deleted.'));
+        drupal_set_message(t('Messages deleted.'));
       }
       else {
-        $_SESSION['privatemsg'] = $form_values['messages'];
-        $_SESSION['fromfolder'] = intval(arg(2));
+        $form_state['storage']['privatemsg'] = $form_state['values']['messages'];
+        $form_state['storage']['fromfolder'] = intval(arg(2));
         drupal_goto('privatemsg/delete/multiple');
       }
       break;
@@ -1042,38 +1024,33 @@ function privatemsg_list_form_submit($fo
     case t('Mark as read'):
       array_unshift($args, $new);
       db_query('UPDATE {privatemsg} SET newmsg = %d '. $where, $args);
-
-      drupal_set_message(t('The selected messages have been updated.'));
       break;
     case t('Move to folder'):
-      $fid = $form_values['folder'];
+      $fid = $form_state['values']['folder'];
       if ($fid == 'new') {
-        $_SESSION['privatemsg'] = $form_values['messages'];
-        $_SESSION['fromfolder'] = intval(arg(2));
+        $form_state['storage']['privatemsg'] = $form_state['values']['messages'];
+        $form_state['storage']['fromfolder'] = intval(arg(2));
         drupal_goto('privatemsg/folders/movetonew');
       }
-      _privatemsg_move_folder($where, $args, $fid, $form_values['extra_folders']);
+      _privatemsg_move_folder($where, $args, $fid, $form_state['values']['extra_folders']);
       break;
     case t('Delete permanently'):
       foreach (array_keys($selected) as $mid) {
         _privatemsg_delete($mid, 2);
       }
-      drupal_set_message(t('The selected messages have been deleted permanently.'));
+      drupal_set_message(t('Your messages have been deleted permanently'));
       break;
-    case t('Restore'):
+    case t('Move to inbox'):
       db_query('UPDATE {privatemsg} SET recipient_del = 0 '. $where, $args);
       $where = $where1 .'author = %d';
       db_query('UPDATE {privatemsg} SET author_del = 0 '. $where, $args);
-
-      drupal_set_message(t('The selected messages have been restored.'));
-
       break;
     case t('Empty recycle bin'):
-      $result = db_query('SELECT id FROM {privatemsg} p WHERE p.recipient = %d AND p.recipient_del = 1 UNION SELECT id FROM {privatemsg} p WHERE p.author = %d AND p.author_del = 1', $user->uid, $user->uid);
-      while ($message = db_fetch_object($result)) {
-        _privatemsg_delete($message->id, 2);
+      $result = db_query('SELECT id FROM privatemsg p WHERE p.recipient = %d AND p.recipient_del = 1 UNION SELECT id FROM privatemsg p  WHERE p.author = %d AND p.author_del = 1', $GLOBALS['user']->uid, $GLOBALS['user']->uid);
+      while ($message = db_fetch_array($result)) {
+        _privatemsg_delete($message['id'], 2);
       }
-      drupal_set_message('Recycle bin emptied.');
+      drupal_set_message('Recycle bin emptied');
       break;
   }
 }
@@ -1084,7 +1061,7 @@ function _privatemsg_move_folder($where,
   $msg_count = count($args);
 
   $folder = $extra_folders[$fid];
-  $link = l(t('%folder', array('%folder' => $folder)), 'privatemsg/list/'. $fid, array(), NULL, NULL, FALSE, TRUE);
+  $link = l(t('%folder', array('%folder' => $folder)), 'privatemsg/list/'. $fid, array('html' => TRUE));
 
   if ($msg_count == 1) {
     drupal_set_message(t('Your message has been moved to !link.', array('!link' => $link)));
@@ -1136,7 +1113,7 @@ function privatemsg_manage_folders() {
 /**
  * Form to add a new folder.
  */
-function privatemsg_new_folder_form() {
+function privatemsg_new_folder_form(&$form_state) {
   if (arg(2) == 'movetonew') {
     $movetonew = TRUE;
   }
@@ -1144,10 +1121,10 @@ function privatemsg_new_folder_form() {
     $movetonew = FALSE;
   }
 
-  if (isset($_SESSION['privatemsg'])) {
+  if (isset($form_state['storage']['privatemsg'])) {
     $name_desc = t('Enter a name for the new folder.');
     $form['messages'] = array('#tree' => TRUE);
-    foreach ($_SESSION['privatemsg'] as $mid => $message) {
+    foreach ($form_state['storage']['privatemsg'] as $mid => $message) {
       if ($message['selected']) {
         $form['messages'][$mid] = array(
           '#type' => 'hidden',
@@ -1162,7 +1139,7 @@ function privatemsg_new_folder_form() {
     }
   }
 
-  $to_fid = $_SESSION['fromfolder'];
+  $to_fid = $form_state['storage']['fromfolder'];
   if (empty($to_fid)) {
     $path = 'privatemsg';
   }
@@ -1194,38 +1171,42 @@ function privatemsg_new_folder_form() {
   return $form;
 }
 
-function privatemsg_new_folder_form_validate($form_id, $form_values) {
+function privatemsg_new_folder_form_validate($form, &$form_state) {
   global $user;
-  if (!empty($form_values['name']) && db_result(db_query("SELECT name FROM {privatemsg_folder} WHERE name = '%s' AND uid = %d", $form_values['name'], $user->uid))) {
+  if (!empty($form_state['values']['name']) && db_result(db_query("SELECT name FROM {privatemsg_folder} WHERE name = '%s' AND uid = %d", $form_state['values']['name'], $user->uid))) {
     form_set_error('name', t('A folder with this name already exists.'));
   }
-  if (empty($form_values['name'])) {
+  if (empty($form_state['values']['name'])) {
     form_set_error('name', t('You must specify a name for the new folder.'));
   }
 }
 
-function privatemsg_new_folder_form_submit($form_id, $form_values) {
+function privatemsg_new_folder_form_submit($form, &$form_state) {
   global $user;
-  $fid = db_next_id('{privatemsg_folder}_fid');
-  db_query("INSERT INTO {privatemsg_folder} (fid, uid, name) VALUES (%d, %d, '%s')", $fid, $user->uid, $form_values['name']);
-
-  if (isset($form_values['messages']) && is_array($form_values['messages'])) {
-    unset($_SESSION['privatemsg']);
-    foreach ($form_values['messages'] as $key => $value) {
+  $record = array(
+    'uid' => $user->uid,
+    'name' => $form_state['values']['name'],
+  );
+  drupal_write_record('privatemsg_folder', $record);
+  //db_query("INSERT INTO {privatemsg_folder} (fid, uid, name) VALUES (%d, %d, '%s')", $fid, $user->uid, $form_state['values']['name']);
+
+  if (isset($form_state['values']['messages']) && is_array($form_state['values']['messages'])) {
+    unset($form_state['storage']['privatemsg']);
+    foreach ($form_state['values']['messages'] as $key => $value) {
       db_query("UPDATE {privatemsg} SET folder = %d WHERE id = %d AND recipient = %d", $fid, $key, $user->uid);
     }
 
-    $link = l(t('%folder', array('%folder' => $form_values['name'])), 'privatemsg/list/'. $fid, array(), NULL, NULL, FALSE, TRUE);
+    $link = l(t('%folder', array('%folder' => $form_state['values']['name'])), 'privatemsg/list/'. $fid, array('html' => TRUE));
 
-    if (count($form_values['messages']) == 1) {
+    if (count($form_state['values']['messages']) == 1) {
       drupal_set_message(t('Your message has been moved to !link.', array('!link' => $link)));
     }
-    elseif (count($form_values['messages']) > 1) {
+    elseif (count($form_state['values']['messages']) > 1) {
       drupal_set_message(t('Your messages have been moved to !link.', array('!link' => $link)));
     }
 
-    $to_fid = $_SESSION['fromfolder'];
-    unset($_SESSION['fromfolder']);
+    $to_fid = $form_state['storage']['fromfolder'];
+    unset($form_state['storage']['fromfolder']);
     if (empty($to_fid)) {
       drupal_goto('privatemsg');
     }
@@ -1241,10 +1222,10 @@ function privatemsg_new_folder_form_subm
   }
   else {
     drupal_set_message(t('Folder created successfully.'));
-    if (isset($_SESSION['privatemsg'])) {
-      unset($_SESSION['privatemsg']);
-      $to_fid = $_SESSION['fromfolder'];
-      unset($_SESSION['fromfolder']);
+    if (isset($form_state['storage']['privatemsg'])) {
+      unset($form_state['storage']['privatemsg']);
+      $to_fid = $form_state['storage']['fromfolder'];
+      unset($form_state['storage']['fromfolder']);
       if (empty($to_fid)) {
         drupal_goto('privatemsg');
       }
@@ -1258,7 +1239,7 @@ function privatemsg_new_folder_form_subm
 /**
  * Display form to rename a folder.
  */
-function privatemsg_rename_folder_form($fid) {
+function privatemsg_rename_folder_form($form_id, $fid) {
   $folder = db_result(db_query("SELECT name FROM {privatemsg_folder} WHERE fid = %d", $fid));
   if (empty($folder)) {
     drupal_set_message(t('Folder does not exist.'));
@@ -1286,24 +1267,24 @@ function privatemsg_rename_folder_form($
   return $form;
 }
 
-function privatemsg_rename_folder_form_validate($form_id, $form_values) {
+function privatemsg_rename_folder_form_validate($form, &$form_state) {
   global $user;
-  if (!empty($form_values['new_name']) &&
-      $form_values['new_name'] != $form_values['old_name'] &&
-      db_result(db_query("SELECT name FROM {privatemsg_folder} WHERE name = '%s' AND uid = %d", $form_values['new_name'], $user->uid))) {
+  if (!empty($form_state['values']['new_name']) &&
+      $form_state['values']['new_name'] != $form_state['values']['old_name'] &&
+      db_result(db_query("SELECT name FROM {privatemsg_folder} WHERE name = '%s' AND uid = %d", $form_state['values']['new_name'], $user->uid))) {
     form_set_error('new_name', t('A folder with this name already exists.'));
   }
-  if (empty($form_values['new_name'])) {
+  if (empty($form_state['values']['new_name'])) {
     form_set_error('new_name', t('You must specify a name for the new folder.'));
   }
 }
 
-function privatemsg_rename_folder_form_submit($form_id, $form_values) {
-  if ($form_values['new_name'] != $form_values['old_name']) {
-    db_query("UPDATE {privatemsg_folder} SET name = '%s' WHERE fid = %d", $form_values['new_name'], intval(arg(2)));
+function privatemsg_rename_folder_form_submit($form, &$form_state) {
+  if ($form_state['values']['new_name'] != $form_state['values']['old_name']) {
+    db_query("UPDATE {privatemsg_folder} SET name = '%s' WHERE fid = %d", $form_state['values']['new_name'], intval(arg(2)));
     drupal_set_message(t('Folder name changed from %old_name to %new_name.',
-                         array('%old_name' => $form_values['old_name'],
-                               '%new_name' => $form_values['new_name'])));
+                         array('%old_name' => $form_state['values']['old_name'],
+                               '%new_name' => $form_state['values']['new_name'])));
   }
   else {
     drupal_set_message(t('Folder name left the same.'));
@@ -1329,11 +1310,11 @@ function privatemsg_empty_folder_form($f
   return $form;
 }
 
-function privatemsg_empty_folder_form_submit($form_id, $form_values) {
+function privatemsg_empty_folder_form_submit($form, &$form_state) {
   global $user;
   $fid = intval(arg(2));
 
-  if ($fid == 0 || $form_values['empty'] != 1) {
+  if ($fid == 0 || $form_state['values']['empty'] != 1) {
     drupal_goto('privatemsg/folders');
   }
 
@@ -1341,7 +1322,7 @@ function privatemsg_empty_folder_form_su
     db_query("UPDATE {privatemsg} SET author_del = 1 WHERE author = %d", $user->uid);
   }
   else if ($fid > 1 && !db_result(db_query('SELECT fid FROM {privatemsg_folder} WHERE fid = %d AND uid = %d', $fid, $user->uid))) {
-    watchdog('privatemsg', t('Attempted use of unauthorized folder'), WATCHDOG_WARNING);
+    watchdog('privatemsg', 'Attempted use of unauthorized folder', array(), WATCHDOG_WARNING);
     return drupal_access_denied();
   }
   else {
@@ -1370,16 +1351,16 @@ function privatemsg_delete_folder_form($
   return $form;
 }
 
-function privatemsg_delete_folder_form_submit($form_id, $form_values) {
+function privatemsg_delete_folder_form_submit($form, &$form_state) {
   global $user;
   $fid = intval(arg(2));
 
-  if ($fid == 0 || $form_values['delete'] != 1) {
+  if ($fid == 0 || $form_state['values']['delete'] != 1) {
     drupal_goto('privatemsg/folders');
   }
 
   if (!db_result(db_query("SELECT fid FROM {privatemsg_folder} WHERE fid = %d AND uid = %d", $fid, $user->uid))) {
-    watchdog('privatemsg', t('Attempted use of unauthorized folder'), WATCHDOG_WARNING);
+    watchdog('privatemsg', 'Attempted use of unauthorized folder', array(), WATCHDOG_WARNING);
     return drupal_access_denied();
   }
   db_query("DELETE FROM {privatemsg_folder} WHERE fid = %d", $fid);
@@ -1392,7 +1373,7 @@ function privatemsg_delete_folder_form_s
 /**
  * Provides a form to write a private message.
  */
-function privatemsg_new_form($message = NULL) {
+function privatemsg_new_form(&$form_state, $message = NULL) {
   global $user;
   if (!isset($message)) {
     $message = 0;
@@ -1401,21 +1382,21 @@ function privatemsg_new_form($message = 
     if ($op == 'reply') {
       $message = arg(2);
     }
-    else if (($uid = arg(2)) && ($msg->recipient = db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $uid)))) {
+    else if (($uid = arg(2)) && ($msg['recipient'] = db_result(db_query('SELECT name FROM {users} WHERE uid = %d', $uid)))) {
       if (!privatemsg_message_allowed($uid, $user->uid)) {
-        drupal_set_message(t('You cannot contact %recipient', array('%recipient' => $msg->recipient)));
+        drupal_set_message(t('You cannot contact %recipient', array('%recipient' => $msg['recipient'])));
         drupal_goto("user/$uid");
       }
       $message = $msg;
     }
   }
 
-  if ($message && !is_object($message)) {
+  if ($message && !is_array($message)) {
     // This is a reply to another message
-    $message = db_fetch_object(db_query('SELECT thread, subject, message, u.name AS recipient FROM {privatemsg} p INNER JOIN {users} u ON u.uid = p.author WHERE id = %d AND recipient = %d', $message, $user->uid));
+    $message = db_fetch_array(db_query('SELECT thread, subject, message, u.name AS recipient FROM {privatemsg} p INNER JOIN {users} u ON u.uid = p.author WHERE id = %d AND recipient = %d', $message, $user->uid));
 
-    if (!stristr($message->subject, t('Re:'))) {
-      $message->subject = t('Re: ') . $message->subject;
+    if (!stristr($message['subject'], t('Re:'))) {
+      $message['subject'] = t('Re:') .' '. $message['subject'];
     }
 
     // quoting; [quote] if default input format uses bbcode or quote, else > quoting
@@ -1426,80 +1407,117 @@ function privatemsg_new_form($message = 
       }
     }
     if (isset($bbcode)) {
-      $message->message = "\n\n[quote=". $message->recipient .']'. $message->message .'[/quote]';
+      $message['message'] = "\n\n[quote=". $message['recipient'] .']'. $message['message'] .'[/quote]';
     }
     else {
-      $message->message = "\n\n\n". str_replace("\n", "\n> ", "\n". $message->message);
+      $message['message'] = "\n\n\n". str_replace("\n", "\n> ", "\n". $message['message']);
     }
   }
-  if (!is_object($message)) {
-    $message = new stdClass();
+  if (!is_array($message)) {
+    $message = array();
   }
   // The first if can provide a partial message, so we fill it in to avoid
   // notices. Also we remove the message if it's a reply in a threaded view,
   // the original message will be seen anyways.
-  if (!isset($message->subject) || variable_get('privatemsg_threaded_view', 0)) {
-    $message->message = '';
+  if (variable_get('privatemsg_threaded_view', 0)) {
+    $message['message'] = '';
+  }
+  foreach (array('subject', 'recipient', 'format', 'message') as $key) {
+    if (!isset($message[$key])) {
+      $message[$key] = '';
+    }
   }
 
   if (isset($_SESSION['recipients'])) {
-    $recipient = implode(', ', $_SESSION['recipients']);
+    $message['recipient'] = implode(', ', $_SESSION['recipients']);
     unset($_SESSION['recipients']);
   }
 
-  $form['thread'] = array('#type' => 'value', '#value' => isset($message->thread) ? $message->thread : 0);
+  if (isset($form_state['post']['op']) && $form_state['post']['op'] == t('Preview')) {
+    $pass = TRUE;
+    $recipients = explode(',', $form_state['post']['recipient']);
+    foreach ($recipients as $recipient) {
+      $recipient = user_load(array('name' => trim($recipient)));
+      if (!$recipient->uid) {
+        $pass = FALSE;
+      }
+    }
+    if ($pass) {
+      $message['subject'] = $form_state['post']['subject'];
+      $message['message'] = $form_state['post']['privatemsgbody'];
+      $message['format'] = $form_state['post']['format'];
+      $message['timestamp'] = time();
+      $message['newmsg'] = TRUE;
+      $message['folder'] = 1;
+      $message['uid'] = $message['author'] = $user->uid;
+      $message['name'] = $user->name;
+      $message['recipient'] = implode(', ', $recipients);
+      $message['preview'] = TRUE;
+
+      // Allow other modules to change the message.
+      privatemsg_invoke_privatemsg($message, 'view');
+      
+      $form['#prefix'] = '<div class="preview">' .
+        theme('privatemsg_view', $message, TRUE) .
+        '</div>';
+      drupal_set_title(t('Preview message'));
+    }
+  }
+
+  if (!isset($form['thread'])) {
+    $form['thread'] = array('#type' => 'value', '#value' => isset($message['thread']) ? $message['thread'] : 0);
+  }
   $form['header']['#theme'] = 'privatemsg_new_msg_header';
-  $form['header']['recipient'] = array(
-    '#type' => 'textfield',
-    '#title' => t('To'),
-    '#description' => t('Separate multiple names with commas.'),
-    '#default_value' => isset($recipient) ? $recipient : $message->recipient,
-    '#autocomplete_path' => 'privatemsg/autocomplete',
-    '#size' => 50,
-    '#maxlength' => 1000,
-    '#required' => TRUE,
-  );
+  if (!isset($form['header']['recipient'])) {
+    $form['header']['recipient'] = array(
+      '#type' => 'textfield',
+      '#title' => t('To'),
+      '#description' => t('Separate multiple names with commas.'),
+      '#default_value' => $message['recipient'],
+      '#autocomplete_path' => 'privatemsg/autocomplete',
+      '#size' => 50,
+      '#maxlength' => 1000,
+      '#required' => TRUE,
+    );
+  }
   $form['header']['subject'] = array(
     '#type' => 'textfield',
     '#title' => t('Subject'),
-    '#default_value' => $message->subject,
+    '#default_value' => $message['subject'],
     '#size' => 50,
     '#maxlength' => 64,
     '#required' => TRUE,
   );
   $form['privatemsgbody'] = array(
     '#type' => 'textarea',
-    '#title' => empty($message->thread) ? t('Message') : t('Reply'),
-    '#default_value' => $message->message,
+    '#title' => empty($message['thread']) ? t('Message') : t('Reply'),
+    '#default_value' => $message['message'],
     '#cols' => 80,
     '#rows' => 6,
   );
-  $form['filter_form'] = filter_form($message->format);
+  $form['filter_form'] = filter_form($message['format']);
   $form['preview'] = array(
     '#type' => 'submit',
-    '#value' => t('Preview'),
-    '#prefix' => '<div class="pm-controls">'
+    '#value' => t('Preview')
+  );
+  $form['preview_msg'] = array(
+    '#weight' => -5,
+    '#value' => '',
   );
   $form['send'] = array(
     '#type' => 'submit',
     '#value' => t('Send private message')
   );
-  $form['cancel'] = array(
-    '#value' => l(t('Cancel'), arg(1) == 'reply' ? 'privatemsg/view/'. arg(2) : 'privatemsg'),
-    '#suffix' => '</div>'
-  );
-
-  $form['#after_build'] = array('_privatemsg_new_preview');
 
   drupal_add_js(drupal_get_path('module', 'privatemsg') .'/privatemsg.js');
 
   return $form;
 }
 
-function _privatemsg_new_preview($form, $form_values) {
-  if ($form_values['op'] == t('Preview')) {
+function _privatemsg_new_preview($form, &$form_state) {
+  if (isset($form_state['clicked_button']) && $form_state['clicked_button']['#value'] == t('Preview')) {
     $pass = TRUE;
-    $recipients = explode(',', $form_values['recipient']);
+    $recipients = explode(',', $form_state['values']['recipient']);
     foreach ($recipients as $recipient) {
       $recipient = user_load(array('name' => trim($recipient)));
       if (!$recipient->uid) {
@@ -1508,31 +1526,34 @@ function _privatemsg_new_preview($form, 
     }
     if ($pass) {
       global $user;
-      $message->subject = $form_values['subject'];
-      $message->message = $form_values['privatemsgbody'];
-      $message->format = $form_values['format'];
-      $message->timestamp = time();
-      $message->newmsg = TRUE;
-      $message->folder = 1;
-      $message->uid = $message->author = $user->uid;
-      $message->name = $user->name;
-      $message->recipient = implode(', ', $recipients);
-      $message->preview = TRUE;
+      $message['subject'] = $form_state['values']['subject'];
+      $message['message'] = $form_state['values']['privatemsgbody'];
+      $message['format'] = $form_state['values']['format'];
+      $message['timestamp'] = time();
+      $message['newmsg'] = TRUE;
+      $message['folder'] = 1;
+      $message['uid'] = $message['author'] = $user->uid;
+      $message['name'] = $user->name;
+      $message['recipient'] = implode(', ', $recipients);
+      $message['preview'] = TRUE;
+
       // Allow other modules to change the message.
       privatemsg_invoke_privatemsg($message, 'view');
-      $form['preview'] = array(
+      $form['preview_msg'] = array(
+        '#weight' => -5,
         '#prefix' => '<div class="preview">',
         '#value' => theme('privatemsg_view', $message, TRUE),
-        '#suffix' => '</div>');
+        '#suffix' => '</div>',
+      );
       drupal_set_title(t('Preview message'));
     }
   }
   return $form;
 }
 
-function privatemsg_new_form_validate($form_id, $form_values) {
-  if (!empty($form_values['recipient'])) {
-    $recipients = explode(',', $form_values['recipient']);
+function privatemsg_new_form_validate($form, &$form_state) {
+  if (!empty($form_state['values']['recipient'])) {
+    $recipients = explode(',', $form_state['values']['recipient']);
     foreach ($recipients as $recipient) {
       $account = user_load(array('name' => trim($recipient)));
       if (!$account) {
@@ -1543,46 +1564,48 @@ function privatemsg_new_form_validate($f
       }
     }
   }
-  if (!isset($form_values['format']) || !filter_access($form_values['format'])) {
+  if (!isset($form_state['values']['format']) || !filter_access($form_state['values']['format'])) {
     form_set_error('format', t('The supplied input format is invalid.'));
   }
-  if (empty($form_values['privatemsgbody'])) {
+  if (empty($form_state['values']['privatemsgbody'])) {
     form_set_error('privatemsgbody', t('Message field is required.'));
   }
 }
 
-function privatemsg_new_form_submit($form_id, $form_values) {
+function privatemsg_new_form_submit($form, $form_state) {
   global $user;
   static $seen = array();
-  if ($form_values['op'] != t('Send private message')) {
-    return FALSE;
-  }
-
-  // Do not allow sending a message to yourself.
-  $seen[$user->name] = TRUE;
-  $recipients = explode(',', $form_values['recipient']);
-  $sent = FALSE;
-  foreach ($recipients as $recipient) {
-    $recipient = trim($recipient);
-    if (isset($seen[$recipient])) {
-      continue;
-    }
-    $seen[$recipient] = TRUE;
-    $recipient = user_load(array('name' => $recipient));
-    $message_id = _privatemsg_send($user, $recipient, $form_values['subject'], $form_values['privatemsgbody'], $form_values['format'], $form_values['thread']);
-    if ($message_id) {
-      // Load the message for consistency.
-      $message = privatemsg_load($message_id);
-      // Tell the other modules a new private message has been sent.
-      privatemsg_invoke_privatemsg($message, 'sent');
-      $sent = TRUE;
+  if ($form_state['clicked_button']['#value'] == t('Send private message')) {
+    // Do not allow sending a message to yourself.
+    $seen[$user->name] = TRUE;
+    $recipients = explode(',', $form_state['values']['recipient']);
+    $sent = FALSE;
+    foreach ($recipients as $recipient) {
+      $recipient = trim($recipient);
+      if (isset($seen[$recipient])) {
+        continue;
+      }
+      $seen[$recipient] = TRUE;
+      $recipient = user_load(array('name' => $recipient));
+      $message_id = _privatemsg_send($user, $recipient, $form_state['values']['subject'], $form_state['values']['privatemsgbody'], $form_state['values']['format'], $form_state['values']['thread']);
+      if ($message_id) {
+        // Load the message for consistency.
+        $message = privatemsg_load($message_id);
+        // Tell the other modules a new private message has been sent.
+        privatemsg_invoke_privatemsg($message, 'sent');
+        $sent = TRUE;
+      }
     }
-  }
 
-  if ($sent) {
-    drupal_set_message(t('Message sent.'));
+    if ($sent) {
+      drupal_set_message(t('Message sent.'));
+    }
+    drupal_goto($user->uid ? 'privatemsg' : '');
+  }
+  else if ($form_state['clicked_button']['#value'] == t('Preview')) {
+    $form_state['redirect'] = FALSE;
+    $form_state['rebuild'] = FALSE;
   }
-  drupal_goto($user->uid ? 'privatemsg' : '');
 }
 
 /**
@@ -1601,8 +1624,7 @@ function privatemsg_new_form_submit($for
  * @param $type
  *   Type of the message as defined on admin/build/privatemsg .
  * @param $variables
- *   If this message is a subscriptions mail, the variables used to compose the
- * message.
+ *   If this message is a subscriptions mail, the variables used to compose the message.
  **/
 function privatemsg_send_privatemsg($recipient, $subject, $body, $format = FILTER_FORMAT_DEFAULT, $thread = 0, $type = 'private-message', $variables = array()) {
   global $user;
@@ -1615,9 +1637,9 @@ function _privatemsg_send($sender, $reci
     return;
   }
 
-  // Hook to allow other modules to alter any aspect of a privatemsg by
-  // accepting these params by reference. Any module can cancel a privatemsg by
-  // returning false here
+  // hook to allow other modules to alter any aspect of a privatemsg
+  // by accepting these params by reference. Any module can cancel a
+  // privatemsg by returning false here
   foreach (module_implements('privatemsg_alter') as $name) {
     $function = $name .'_privatemsg_alter';
     if (!$function($sender, $recipient, $subject, $body, $format, $thread, $type)) {
@@ -1627,37 +1649,51 @@ function _privatemsg_send($sender, $reci
   if ($sender->uid == $recipient->uid) {
     return FALSE;
   }
-  $message_id = db_next_id('{privatemsg}_id');
+  $message_id = db_last_insert_id('{privatemsg}', 'id') + 1;
   if (!$thread) {
-    $thread = db_next_id('{privatemsg}_thread');
+    $thread = db_last_insert_id('{privatemsg}', 'thread');
   }
   $variables = array();
   foreach ($original_variables as $name => $value) {
     $variables[str_replace('!', '!original_', $name)] = $value;
   }
-  $result = db_query("INSERT INTO {privatemsg} (id, author, recipient, subject, message, timestamp, newmsg, hostname, format, thread, type, variables) VALUES (%d, %d, %d, '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s')", $message_id, $sender->uid, $recipient->uid, $subject, $body, time(), 1, getenv('REMOTE_ADDR'), $format, $thread, $type, serialize($variables));
+
+  $message = array(
+    'author' => $sender->uid,
+    'recipient' => $recipient->uid,
+    'subject' => $subject,
+    'message' => $body,
+    'timestamp' => time(),
+    'newmsg' => 1,
+    'hostname' => getenv('REMOTE_ADDR'),
+    'format' => $format,
+    'thread' => $thread,
+    'type' => $type,
+    'variables' => serialize($variables),
+  );
+  $result = drupal_write_record('privatemsg', $message);
+  //$result = db_query("INSERT INTO {privatemsg} (id, author, recipient, subject, message, timestamp, newmsg, hostname, format, thread, type, variables) VALUES (%d, %d, %d, '%s', '%s', %d, %d, '%s', %d, %d, '%s', '%s')", $message_id, $sender->uid, $recipient->uid, $subject, $body, time(), 1, getenv('REMOTE_ADDR'), $format, $thread, $type, serialize($variables));
   if ($points = variable_get('privatemsg_userpoints', 0)) {
     module_invoke('userpoints', 'userpointsapi', 'points', $points, $sender->uid, 'privatemsg');
   }
   module_invoke('pm_subscriptions', 'subscriptions_handle', privatemsg_load($message_id));
 
-  return $result ? $message_id : $result;
+  return ($result == SAVED_NEW) ? db_last_insert_id('privatemsg', 'id') : FALSE;
 }
 
 /**
- * Return a version of type that can be used as an object property key
- * (change whitespace to _)
+ * Return a version of type that can be used as an object property key (change whitespace to _)
  */
 function _privatemsg_get_type_key($type) {
-  return 'privatemsg_allow_'. preg_replace('/\s+/', '_', $type);
+  return 'privatemsg_allow_' . preg_replace('/\s+/', '_', $type);
 }
 
 /**
  * Display a user's contacts list and let them write a PM to multiple contacts.
  */
 function privatemsg_contacts_form() {
-  $contacts = array();
   global $user;
+  $contacts = array();
 
   // Add people who have messaged the user to the contact list.
   $result = db_query("SELECT DISTINCT u.name, u.uid FROM {privatemsg} AS p "
@@ -1665,8 +1701,8 @@ function privatemsg_contacts_form() {
                     ."p.recipient = %d AND p.author != %d AND p.timestamp > "
                     ."(UNIX_TIMESTAMP(NOW()) - (3600 * 24 * 30)) ORDER BY "
                     ."u.name", $user->uid, $user->uid);
-  while ($author = db_fetch_object($result)) {
-    $contacts[check_plain($author->name)] = $author->uid;
+  while ($author = db_fetch_array($result)) {
+    $contacts[check_plain($author['name'])] = $author['uid'];
   }
 
   // Add people the user has messaged to the contact list.
@@ -1675,15 +1711,15 @@ function privatemsg_contacts_form() {
                     ."p.author = %d AND p.timestamp > "
                     ."(UNIX_TIMESTAMP(NOW()) - (3600 * 24 * 30)) ORDER BY "
                     ."u.name", $user->uid, $user->uid);
-  while ($author = db_fetch_object($result)) {
-    $contacts[check_plain($author->name)] = $author->uid;
+  while ($author = db_fetch_array($result)) {
+    $contacts[check_plain($author['name'])] = $author['uid'];
   }
 
   if (module_exists('buddylist')) {
     $result = db_query("SELECT u.name, u.uid FROM {buddylist} AS b LEFT JOIN "
                       ."{users} AS u ON b.buddy = u.uid WHERE b.uid = %d", $user->uid);
-    while ($buddy = db_fetch_object($result)) {
-      $contacts[check_plain($buddy->name)] = $buddy->uid;
+    while ($buddy = db_fetch_array($result)) {
+      $contacts[check_plain($buddy['name'])] = $buddy['uid'];
     }
   }
 
@@ -1731,9 +1767,10 @@ function privatemsg_contacts_form() {
   return $form;
 }
 
-function privatemsg_contacts_form_submit($form_id, $form_values) {
-  if ($form_values['op'] == t('Write private message')) {
-    foreach ($form_values['contacts'] as $uid => $contact) {
+function privatemsg_contacts_form_submit($form, &$form_state) {
+  if ($form_state['clicked_button']['#value'] == t('Write private message')) {
+    $recipients = array();
+    foreach ($form_state['values']['contacts'] as $uid => $contact) {
       if ($contact['selected']) {
         $recipients[] = $contact['name'];
       }
@@ -1748,8 +1785,8 @@ function privatemsg_contacts_form_submit
 /**
  * Display a private message to a user.
  *
- * We calculate previous and next message here. Let's assume the order is from
- * oldest to newest. The next message is then the first row from:
+ * We calculate previous and next message here. Let's assume the order is
+ * from oldest to newest. The next message is then the first row from:
  * SELECT id FROM privatemsg WHERE timestamp > %d ORDER BY timestamp ASC
  * The code below is the abstraction of this to every field and ASC/DESC.
  */
@@ -1757,18 +1794,18 @@ function privatemsg_view($message_id) {
   global $user;
   if ($message = privatemsg_load($message_id)) {
     $threaded_view = variable_get('privatemsg_threaded_view', 0);
-    if (isset($_SESSION['privatemsg_list_sql'])) {
+    if (isset($form_state['storage']['privatemsg_list_sql'])) {
       // This is the SQL assembled in privatemsg_list
-      $sql = $_SESSION['privatemsg_list_sql']['sql'];
+      $sql = $form_state['storage']['privatemsg_list_sql']['sql'];
       // These are the arguments, again from privatemsg_list
-      $args = $_SESSION['privatemsg_list_sql']['args'];
+      $args = $form_state['storage']['privatemsg_list_sql']['args'];
       // This is the field we are ordering on.
-      $field = $_SESSION['privatemsg_list_sql']['field'];
+      $field = $form_state['storage']['privatemsg_list_sql']['field'];
       // This is either ASC or DESC.
-      $sort = $_SESSION['privatemsg_list_sql']['sort'];
+      $sort = $form_state['storage']['privatemsg_list_sql']['sort'];
       if ($threaded_view) {
         $sql .= ' AND thread != %d';
-        $args[] = $message->thread;
+        $args[] = $message['thread'];
       }
       $placeholder = ($field == 'type' || $field == 'subject') ? "'%s'" : '%d';
       $args[] = $message->$field;
@@ -1785,26 +1822,26 @@ function privatemsg_view($message_id) {
         $next_sort = 'DESC';
       }
       if ($previous_id = db_result(db_query_range("$sql AND $field $prev_operator $placeholder ORDER BY $field $prev_sort", $args, 0, 1))) {
-        $previous_link = l(t('Previous'), 'privatemsg/view/'. $previous_id, array(), NULL, 'message-'. $previous_id);
+        $previous_link = l(t('Previous'), 'privatemsg/view/'. $previous_id, array('fragment' => 'message-'. $previous_id));
       }
       else {
         $previous_link = '';
       }
       if ($next_id = db_result(db_query_range("$sql AND $field $next_operator $placeholder ORDER BY $field $next_sort", $args, 0, 1))) {
-        $next_link =  l(t('Next'), 'privatemsg/view/'. $next_id, array(), NULL, 'message-'. $next_id);
+        $next_link =  l(t('Next'), 'privatemsg/view/'. $next_id, array('fragment' => 'message-'. $next_id));
       }
       else {
         $next_link = '';
       }
     }
-    if ($threaded_view && $message->thread) {
-      $result = db_query('SELECT p.id, u.uid, u.name, p.author, p.timestamp, p.subject, p.message, p.newmsg, p.recipient, p.folder, p.format FROM {privatemsg} p INNER JOIN {users} u ON p.author = u.uid WHERE p.thread = %d ORDER BY timestamp ASC', $message->thread);
+    if ($threaded_view && $message['thread']) {
+      $result = db_query('SELECT p.id, u.uid, u.name, p.author, p.timestamp, p.subject, p.message, p.newmsg, p.recipient, p.folder, p.format FROM {privatemsg} p INNER JOIN {users} u ON p.author = u.uid WHERE p.thread = %d ORDER BY timestamp ASC', $message['thread']);
       $messages = '';
-      while ($message = db_fetch_object($result)) {
+      while ($message = db_fetch_array($result)) {
         if (!isset($first)) {
           $first = $message;
         }
-        if ($message->recipient == $user->uid) {
+        if ($message['recipient'] == $user->uid) {
           $last = $message;
         }
         $messages .= _privatemsg_view($message);
@@ -1814,10 +1851,13 @@ function privatemsg_view($message_id) {
       $first = $message;
       $messages = _privatemsg_view($message);
     }
-    $output = theme('privatemsg_links', $previous_link, $next_link);
+    $output = '';
+    if (isset($previous_link)) {
+      $output .= theme('privatemsg_links', $previous_link, $next_link);
+    }
     $output .= $messages;
-    if ($last->recipient == $user->uid) {
-      $output .= drupal_get_form('privatemsg_new_form', $last->id);
+    if (isset($last) && $last['recipient'] == $user->uid) {
+      $output .= drupal_get_form('privatemsg_new_form', $last['id']);
     }
     return $output;
   }
@@ -1828,8 +1868,8 @@ function _privatemsg_view($message) {
   global $user;
   // Allow other modules to change the message.
   privatemsg_invoke_privatemsg($message, 'view');
-  if ($message->newmsg && $user->uid == $message->recipient) {
-    db_query("UPDATE {privatemsg} SET newmsg = 0 WHERE id = %d", $message->id);
+  if ($message['newmsg'] && $user->uid == $message['recipient']) {
+    db_query("UPDATE {privatemsg} SET newmsg = 0 WHERE id = %d", $message['id']);
   }
   return theme('privatemsg_view', $message, FALSE);
 }
@@ -1837,13 +1877,13 @@ function _privatemsg_view($message) {
 /**
  * Add the action form to the view message screen.
  */
-function privatemsg_view_form($message) {
+function privatemsg_view_form(&$form_state, $message) {
   global $user;
 
   $folders = privatemsg_load_folders($user->uid);
   $extra_folders = array();
   foreach ($folders as $folder) {
-    if ($folder['fid'] != 1 && $folder['fid'] != $message->folder) {
+    if ($folder['fid'] != 1 && $folder['fid'] != $message['folder']) {
       $extra_folders[$folder['fid']] = $folder['name'];
     }
   }
@@ -1851,15 +1891,15 @@ function privatemsg_view_form($message) 
 
   $form['pm_id'] = array(
     '#type' => 'hidden',
-    '#value' => $message->id,
+    '#value' => $message['id'],
   );
   $form['pm_fid'] = array(
     '#type' => 'hidden',
-    '#value' => $message->folder,
+    '#value' => $message['folder'],
   );
   $form['author']= array(
     '#type' => 'value',
-    '#value' => $message->author,
+    '#value' => $message['author'],
   );
   $form['js_bypass'] = array(
     '#type' => 'hidden',
@@ -1875,7 +1915,7 @@ function privatemsg_view_form($message) 
   $form['actions']['text'] = array(
     '#value' => '<div><strong>'. t('With this message:') .'</strong> </div>',
   );
-  if ($user->uid == $message->recipient) {
+  if ($user->uid == $message['recipient']) {
     $form['actions']['reply'] = array(
       '#type' => 'submit',
       '#value' => t('Reply'),
@@ -1894,11 +1934,14 @@ function privatemsg_view_form($message) 
     );
   }
 
-  if ($user->uid == $message->recipient) {
-    // Avoid listing the recycle bin as a folder when the delete button is
-    // available.
-    unset($extra_folders[PRIVATEMSG_FOLDER_RECYCLE_BIN]);
+  $form['actions']['unread'] = array(
+      '#type' => 'submit',
+      '#value' => t('Mark as Unread'),
+      '#prefix' => ' &nbsp; &nbsp;',
+      '#attributes' => array('class' => 'pm-add-unread pm-spacer'),
+    );
 
+  if ($user->uid == $message['recipient']) {
     $form['actions']['folder'] = array(
       '#type' => 'select',
       '#options' => $extra_folders,
@@ -1909,6 +1952,12 @@ function privatemsg_view_form($message) 
       '#type' => 'submit',
       '#value' => t('Move to folder'),
     );
+    if (!privatemsg_user_blocked($message['author'])) {
+      $form['actions']['block'] = array(
+        '#type' => 'submit',
+        '#value' => t('Block this user'),
+      );
+    }
   }
 
   if ($del == '2') {
@@ -1933,29 +1982,35 @@ function privatemsg_view_form($message) 
   return $form;
 }
 
-function privatemsg_view_form_submit($form_id, $form_values) {
+function privatemsg_view_form_submit($form, &$form_state) {
   global $user;
 
-  switch ($form_values['op']) {
+  switch ($form_state['clicked_button']['#value']) {
     case t('Reply'):
-      drupal_goto('privatemsg/reply/'. $form_values['pm_id']);
+      drupal_goto('privatemsg/reply/'. $form_state['values']['pm_id']);
     case t('Delete'):
       if ($_POST['js_bypass'] == 1) {
-        drupal_goto('privatemsg/delete/'. $form_values['pm_id']);
+        drupal_goto('privatemsg/delete/'. $form_state['values']['pm_id']);
       }
-      drupal_goto('privatemsg/delete/confirm/'. $form_values['pm_id']);
+      drupal_goto('privatemsg/delete/confirm/'. $form_state['values']['pm_id']);
+    case t('Mark as Unread'):
+      db_query("UPDATE {privatemsg} SET newmsg = 1 WHERE id = %d", $form_state['values']['pm_id']);
+      drupal_goto('privatemsg/list/'. $form_state['values']['pm_fid']);
+    case t('Block this user'):
+      privatemsg_block_user($form_state['values']['author']);
+      break;
     case t('Move to folder'):
-      $fid = $form_values['folder'];
+      $fid = $form_state['values']['folder'];
       if ($fid == 'new') {
-        $_SESSION['privatemsg'] = array(
-          $form_values['pm_id'] => array('selected' => TRUE)
+        $form_state['storage']['privatemsg'] = array(
+          $form_state['values']['pm_id'] => array('selected' => TRUE)
         );
-        $_SESSION['fromfolder'] = 'view/'. intval($form_values['pm_id']);
+        $form_state['storage']['fromfolder'] = 'view/'. intval($form_state['values']['pm_id']);
         drupal_goto('privatemsg/folders/movetonew');
       }
 
-      db_query("UPDATE {privatemsg} SET folder = %d WHERE id = %d AND recipient = %d", $fid, $form_values['pm_id'], $user->uid);
-      $link = l(t('%folder', array('%folder' => $form_values['extra_folders'][$fid])), 'privatemsg/list/'. $fid, array(), NULL, NULL, FALSE, TRUE);
+      db_query("UPDATE {privatemsg} SET folder = %d WHERE id = %d AND recipient = %d", $fid, $form_state['values']['pm_id'], $user->uid);
+      $link = l(t('%folder', array('%folder' => $form_state['values']['extra_folders'][$fid])), 'privatemsg/list/'. $fid, array('html' => TRUE));
       drupal_set_message(t('Your message has been moved to !link.', array('!link' => $link)));
 
       break;
@@ -1964,13 +2019,13 @@ function privatemsg_view_form_submit($fo
 
 function privatemsg_back_to_list($message_id) {
   global $user;
-  $message = db_fetch_object(db_query("SELECT folder, recipient FROM {privatemsg} WHERE id = %d", $message_id));
+  $message = db_fetch_array(db_query("SELECT folder, recipient FROM {privatemsg} WHERE id = %d", $message_id));
 
-  if ($message->fid > 0) {
+  if ($message['folder'] > 0) {
     drupal_goto('privatemsg/list/'. $fid);
   }
   else {
-    drupal_goto('privatemsg'. ($user->uid == $message->recipient ? '' : '/'. $message->recipient));
+    drupal_goto('privatemsg'. ($user->uid == $message['recipient'] ? '' : '/'. $message['recipient']));
   }
 }
 
@@ -1987,7 +2042,7 @@ function privatemsg_delete() {
   }
 
   if (arg(2) == 'multiple') {
-    if (empty($_SESSION['privatemsg']) || !is_array($_SESSION['privatemsg'])) {
+    if (empty($form_state['storage']['privatemsg']) || !is_array($form_state['storage']['privatemsg'])) {
       drupal_goto('priatemsg');
     }
     return drupal_get_form('privatemsg_delete_multiple_form');
@@ -2009,22 +2064,22 @@ function privatemsg_delete_form($mid) {
   return $form;
 }
 
-function privatemsg_delete_form_submit($form_id, $form_values) {
+function privatemsg_delete_form_submit($form, &$form_state) {
   drupal_goto('privatemsg/delete/'. arg(3));
 }
 
 function privatemsg_delete_multiple_form() {
-  foreach ($_SESSION['privatemsg'] as $mid => $message) {
+  foreach ($form_state['storage']['privatemsg'] as $mid => $message) {
     if ($message['selected']) {
       $messages[] = $message['subject'];
     }
   }
 
-  if ($_SESSION['fromfolder'] == 0) {
+  if ($form_state['storage']['fromfolder'] == 0) {
     $cancel_path = 'privatemsg';
   }
   else {
-    $cancel_path = 'privatemsg/list/'. $_SESSION['fromfolder'];
+    $cancel_path = 'privatemsg/list/'. $form_state['storage']['fromfolder'];
   }
 
   $message = t('Are you sure you wish to delete the following messages?')
@@ -2036,20 +2091,20 @@ function privatemsg_delete_multiple_form
   return $form;
 }
 
-function privatemsg_delete_multiple_form_submit($form_id, $form_values) {
-  foreach ($_SESSION['privatemsg'] as $mid => $message) {
+function privatemsg_delete_multiple_form_submit($form, &$form_state) {
+  foreach ($form_state['storage']['privatemsg'] as $mid => $message) {
     if ($message['selected']) {
       _privatemsg_delete($mid);
     }
   }
 
-  if ($_SESSION['fromfolder'] == 0) {
+  if ($form_state['storage']['fromfolder'] == 0) {
     $path = 'privatemsg';
   }
   else {
-    $path = 'privatemsg/list/'. $_SESSION['fromfolder'];
+    $path = 'privatemsg/list/'. $form_state['storage']['fromfolder'];
   }
-  unset($_SESSION['privatemsg'], $_SESSION['fromfolder']);
+  unset($form_state['storage']['privatemsg'], $form_state['storage']['fromfolder']);
 
   drupal_set_message(t('Messages deleted.'));
 
@@ -2061,14 +2116,14 @@ function _privatemsg_delete($id, $delete
 
   $result = db_query('SELECT author, recipient, folder FROM {privatemsg} WHERE (recipient = %d OR author = %d) AND id = %d', $user->uid, $user->uid, $id);
 
-  if ($message = db_fetch_object($result)) {
-    if ($message->author == $user->uid) {
+  if ($message = db_fetch_array($result)) {
+    if ($message['author'] == $user->uid) {
       db_query('UPDATE {privatemsg} SET author_del = %d WHERE id = %d', $deleted_status, $id);
       $retval = 1;
     }
-    if ($message->recipient == $user->uid) {
+    if ($message['recipient'] == $user->uid) {
       db_query('UPDATE {privatemsg} SET recipient_del = %d WHERE id = %d', $deleted_status, $id);
-      $retval = $message->folder;
+      $retval = $message['folder'];
     }
     // Notify other modules that a message is deleted.
     privatemsg_invoke_privatemsg($message, 'delete');
@@ -2089,9 +2144,6 @@ function _privatemsg_get_new_messages($u
   return $cache[$uid];
 }
 
-/**
- * Implementation of hook_userpoints.
- */
 function privatemsg_userpoints($op, $new_points = 0, $uid = 0, $event = '') {
   switch ($op) {
     case 'setting':
@@ -2104,47 +2156,75 @@ function privatemsg_userpoints($op, $new
 }
 
 /**
- * Implementation of hook_simpletest.
+ * Implementation of hook_theme().
  */
-function privatemsg_simpletest() {
-  $dir = drupal_get_path('module', 'privatemsg') .'/tests';
-  $tests = file_scan_directory($dir, '\.test$');
-  return array_keys($tests);
+function privatemsg_theme() {
+  $themes = array();
+
+  $themes['privatemsg_view'] = array('arguments' => array(
+    'message' => array(),
+    'preview' => FALSE,
+    'prev' => 0,
+    'next' => 0,
+  ));
+  $themes['privatemsg_message_table'] = array('arguments' => array(
+    'form' => array(),
+  ));
+  $themes['privatemsg_contacts_table'] = array('arguments' => array(
+    'form' => array(),
+  ));
+  $themes['privatemsg_new_msg_header'] = array('arguments' => array(
+    'form' => array(),
+  ));
+  $themes['privatemsg_username'] = array('arguments' => array(
+    'user' => new stdClass(),
+  ));
+  $themes['privatemsg_links'] = array('arguments' => array(
+    'previous_link' => '',
+    'next_link' => '',
+  ));
+  $themes['privatemsg_block_inbox'] = array('arguments' => array(
+    'new' => FALSE,
+  ));
+
+  return $themes;
 }
 
 /**
  * @addtogroup theme_system
  *
- * Privatemsg module specific theme functions.
+ * Privatemsg module specific theme functions
  * @{
- */
+**/
 
 /**
- * Returns content to view a private message.
- *
- * @param message
- */
+ Returns content to view a private message
+
+ @param message
+**/
 function theme_privatemsg_view($message, $preview = FALSE, $prev = 0, $next = 0) {
+  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/privatemsg.css');
   $option = variable_get('privatemsg_view_actions', '3');
   global $user;
+  $output = '';
 
   if ($option == '4') {
     $links = array();
-    if ($message->recipient == $user->uid) {
-      $author = user_load(array('uid' => $message->uid));
+    if ($message['recipient'] == $user->uid) {
+      $author = user_load(array('uid' => $message['uid']));
       if ($author->uid && $author->privatemsg_allow) {
-        $links['privatemsg_reply'] = array('title' => t('Reply to this message'), 'href' => 'privatemsg/reply/'. $message->id);
+        $links['privatemsg_reply'] = array('title' => t('Reply to this message'), 'href' => 'privatemsg/reply/'. $message['id']);
       }
       else {
         $links['privatemsg_noreply'] = array('title' => t('Sender does not accept replies'), 'href' => NULL);
       }
     }
-    if ($message->recipient == $user->uid || variable_get('privatemsg_sent_status', 1)) {
-      $links['privatemsg_delete'] = array('title' => t('Delete this message'), 'href' => 'privatemsg/delete/'. $message->id, 'attributes' => array('onclick' => "return confirm('". t('Are you sure you want to delete this message?') ."')"));
+    if ($message['recipient'] == $user->uid || variable_get('privatemsg_sent_status', 1)) {
+      $links['privatemsg_delete'] = array('title' => t('Delete this message'), 'href' => 'privatemsg/delete/'. $message['id'], 'attributes' => array('onclick' => "return confirm('". t('Are you sure you want to delete this message?') ."')"));
     }
 
-    $links['privatemsg_list'] = array('title' => t('List messages'), 'href' => ($message->recipient == $user->uid && $message->folder) ? 'privatemsg/list/'. $message->folder : 'privatemsg');
-    if ($message->id) {
+    $links['privatemsg_list'] = array('title' => t('List messages'), 'href' => ($message['recipient'] == $user->uid && $message['folder']) ? 'privatemsg/list/'. $message['folder'] : 'privatemsg');
+    if ($message['id']) {
       $link_display = '<div class="links">'. theme('links', $links) .'</div>';
     }
   }
@@ -2154,15 +2234,7 @@ function theme_privatemsg_view($message,
     $pm_from = $user->name;
   }
   else {
-    $pm_from = theme('privatemsg_username', $message);
-    if ($message->author != $user->uid) {
-      if (!privatemsg_user_blocked($message->author)) {
-        $pm_from .= t('<span class="pm-block-link">(<a href="!block-link">Block user</a>)</span>', array('!block-link' => url('privatemsg/block/'. $message->author, drupal_get_destination())));
-      }
-      else {
-        $pm_from .= t('<span class="pm-block-link">(<a href="!block-link">Unblock user</a>)</span>', array('!block-link' => url('privatemsg/block/'. $message->author, drupal_get_destination())));
-      }
-    }
+    $pm_from = theme('privatemsg_username', user_load(array('uid' => $message['author'])));
   }
   $rows[] = array(
     array('data' => t('From:'), 'class' => 'title-cell', 'nowrap' => 'nowrap'),
@@ -2171,10 +2243,10 @@ function theme_privatemsg_view($message,
 
   // To row.
   if ($preview) {
-    $pm_to = $message->recipient;
+    $pm_to = $message['recipient'];
   }
   else {
-    $pm_to = theme('privatemsg_username', user_load(array('uid' => $message->recipient)));
+    $pm_to = theme('privatemsg_username', user_load(array('uid' => $message['recipient'])));
   }
   $rows[] = array(
     array('data' => t('To:'), 'class' => 'title-cell', 'nowrap' => 'nowrap'),
@@ -2182,14 +2254,14 @@ function theme_privatemsg_view($message,
   );
 
   // Subject row.
-  $subject = check_plain($message->subject);
+  $subject = check_plain($message['subject']);
   $rows[] = array(
     array('data' => t('Subject:'), 'class' => 'title-cell', 'nowrap' => 'nowrap'),
     array('data' => $subject, 'class' => 'data-cell'),
   );
 
   // Date row.
-  $date = format_date($message->timestamp);
+  $date = format_date($message['timestamp']);
   $rows[] = array(
     array('data' => t('Date:'), 'class' => 'title-cell', 'nowrap' => 'nowrap'),
     array('data' => $date, 'class' => 'data-cell'),
@@ -2197,7 +2269,7 @@ function theme_privatemsg_view($message,
 
   // Message body.
   $body = '<div class="pm-body">'
-        . check_markup($message->message, $message->format, FALSE) .'</div>';
+        . check_markup($message['message'], $message['format'], FALSE) .'</div>';
 /*  $rows[] = array(
     array('data' => $body, 'class' => 'pm-body', 'colspan' => 5),
   );*/
@@ -2208,7 +2280,12 @@ function theme_privatemsg_view($message,
   if (!$preview && ($option == '1' || $option == '3')) {
     $output .= $form;
   }
-  $output .= theme('table', NULL, $rows, array('id' => 'message-'. $message->id, 'class' => 'pm-view-table'));
+  if (isset($message['id'])) {
+    $output .= theme('table', NULL, $rows, array('id' => 'message-'. $message['id'], 'class' => 'pm-view-table'));
+  }
+  else {
+    $output .= theme('table', NULL, $rows, array('id' => 'newmessage', 'class' => 'pm-view-table'));
+  }
   $output .= $body;
   if (!$preview && ($option == '2' || $option == '3')) {
     $output .= $form;
@@ -2245,7 +2322,7 @@ function theme_privatemsg_message_table(
   }
 
   if (count($rows) == 0) {
-    $rows[] = array(array('data' => t('No messages.'), 'colspan' => 5));
+    $rows[] = array(array('data' => t('No messages.'), 'colspan' => 4));
     $select_cell = NULL;
   }
   else {
@@ -2259,6 +2336,7 @@ function theme_privatemsg_message_table(
 }
 
 function theme_privatemsg_contacts_table($form) {
+  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/privatemsg.css');
   $rows = array();
 
   foreach (element_children($form) as $key) {
@@ -2287,6 +2365,7 @@ function theme_privatemsg_contacts_table
 }
 
 function theme_privatemsg_new_msg_header($form) {
+  drupal_add_css(drupal_get_path('module', 'privatemsg') .'/privatemsg.css');
   $rows = array();
 
   $title = $form['recipient']['#title'] .':';
@@ -2332,7 +2411,7 @@ function theme_privatemsg_block_inbox($n
 
 /**  @} End of addtogroup theme_system
  *
- */
+**/
 
 /**
  * Return autocomplete results for usernames.
@@ -2351,7 +2430,7 @@ function privatemsg_autocomplete($string
     $result = db_query_range($sql, $search, 0, 10);
     $prefix = count($names) ? implode(', ', $names) .', ' : '';
     $matches = array();
-    while ($user = db_fetch_object($result)) {
+    while ($user = db_fetch_array($result)) {
       $matches[$prefix . $user->name] = check_plain($user->name);
     }
     print drupal_to_js($matches);
@@ -2388,10 +2467,6 @@ function privatemsg_folder_access($uid, 
     return FALSE;
   }
 
-  if (intval($fid) == 0) {
-    return FALSE;
-  }
-
   // Check the database for the user ID of the folder.
   $owner = db_result(db_query("SELECT uid FROM {privatemsg_folder} WHERE fid = %d", $fid));
   if ($owner == $uid) {
@@ -2404,18 +2479,27 @@ function privatemsg_folder_access($uid, 
 function _privatemsg_prune() {
   // move deleted message older than 1 month to archive table, and optimize table
   $result = db_query('SELECT * FROM {privatemsg} WHERE author_del = 1 AND recipient_del = 1 AND timestamp < %d', time() - 3600*24*30);
-  while ($message = db_fetch_object($result)) {
-    db_query("INSERT INTO {privatemsg_archive} (id, author, recipient, subject, message, timestamp, hostname, format, folder, thread, type) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s')", $message->id, $message->author, $message->recipient, $message->subject, $message->message, $message->timestamp, $message->hostname, $message->format, $message->folder, $message->thread, $message->type);
-    db_query('DELETE FROM {privatemsg} WHERE id = %d', $message->id);
+  while ($message = db_fetch_array($result)) {
+    /*$data = array(
+    'id' => $message['id'],
+    'author' => $message['author'],
+    'recipient' => $message['recipient'],
+    'subject' => $message['subject'],
+    'message' => $message['message'],
+    'timestamp' => $message['timestamp'],
+    'hostname' => $message['hostname'],
+    'format' => $message['format'],
+    'folder' => $message['folder'],
+    'thread' => $message['thread'],
+    'type' => $message['type'],
+    );*/
+    drupal_write_record('privatemsg_archive', $message);
+    //db_query("INSERT INTO {privatemsg_archive} (id, author, recipient, subject, message, timestamp, hostname, format, folder, thread, type) VALUES (%d, %d, %d, '%s', '%s', %d, '%s', %d, %d, %d, '%s')", $message['id'], $message['author'], $message['recipient'], $message['subject'], $message['message'], $message['timestamp'], $message['hostname'], $message['format'], $message['folder'], $message['thread'], $message['type']);
+    db_query('DELETE FROM {privatemsg} WHERE id = %d', $message['id']);
 
     // Notify other modules that a message is pruned.
     privatemsg_invoke_privatemsg($message, 'prune');
   }
-
-  // this is MySQL-specific
-  if (!strncmp($GLOBALS['db_type'], 'mysql', 5)) {
-    db_query('OPTIMIZE TABLE {privatemsg}');
-  }
 }
 
 /**
@@ -2453,12 +2537,133 @@ function privatemsg_load($message_id) {
     $params[] = $user->uid;
   }
   $result = db_query($sql, $params);
-  return db_fetch_object($result);
+  return db_fetch_array($result);
 }
 
-function _privatemsg_user_add_defaults(&$account) {
-  if (!isset($account->privatemsg_allow)) {
-    $account->privatemsg_allow = variable_get('privatemsg_default_allow', 1);
-    $account->privatemsg_setmessage_notify = variable_get('privatemsg_default_setmessage_notify', 1);
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access1() {
+  global $user;
+  return !$user->uid || user_access('access private messages');
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access2() {
+  global $user;
+  return user_access('access private messages') && $user->uid;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access3() {
+  global $user;
+  return user_access('create new folder') && $user->uid;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access4() {
+  global $user;
+  if (arg(0) == 'user' && arg(2) == 'privatemsg' && is_numeric(arg(1))) {
+    if ($user->uid == arg(1)) {
+      return $user->privatemsg_allow;
+    }
+    else if (user_access('administer private messages')) {
+      $account = user_load(array('uid' => arg(1)));
+      return $account->privatemsg_allow;
+    }
+  }
+  return false;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access5() {
+  global $user;
+  return arg(0) == 'privatemsg' && is_numeric(arg(1)) && ($user->uid == arg(1) || user_access('administer private messages'));
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access6($account) {
+  global $user;
+  return ($user->uid == $account->uid || user_access('administer private messages')) && $account->privatemsg_allow;
+}
+
+/**
+ * Tests, whether the user has the right to manipulate the given folder.
+ */
+function privatemsg_administer_folder_permission($fid) {
+  global $user;
+  return privatemsg_folder_access($user->uid, $fid) && user_access('administer private messages');
+}
+
+/**
+ * Function that just returns true. (For access control.)
+ */
+function privatemsg_return_true() {
+  return true;
+}
+
+/**
+ * Function that determines the title for the /block site.
+ */
+function privatemsg_get_block_title($account) {
+  $title = t(privatemsg_user_blocked($account->uid) ? 'Unblock @user' : 'Block @user');
+  return str_replace('@user', $account->name, $title);
+}
+
+/**
+ * Callback for the /block site.
+ */
+function privatemsg_get_block_form($account) {
+  return drupal_get_form(privatemsg_user_blocked($account->uid) ? 'privatemsg_unblock_user_form ' : 'privatemsg_block_user_form', $account);
+}
+
+/**
+ * Returns the title for the inbox site.
+ */
+function privatemsg_get_inbox_title() {
+  global $user;
+
+  $new = _privatemsg_get_new_messages();
+
+  if ($new && strncmp($_GET['q'], 'privatemsg', 10) && property_exists($user, 'privatemsg_setmessage_notify') &&
+      $user->privatemsg_setmessage_notify && user_access('access private messages')) {
+    $m = drupal_set_message();
+    if (empty($m)) {
+      drupal_set_message(strtr(
+        format_plural($new,
+          'You have a new <a href="!url">private message</a>.',
+          'You have @count new <a href="!url">private messages</a>.'),
+        array('!url' => url('privatemsg'))));
+    }
+  }
+
+  return variable_get('privatemsg_menu_link', 'My inbox') . ($new ? ' ('. $new .')' : '');
+}
+
+/**
+ * Returns the title for the privatemsg main site.
+ */
+function privatemsg_get_title($account) {
+  global $user;
+  if ($user->uid == $account->uid) {
+    return 'Private messages';
   }
+  return 'Private messages for ' . $account->name;
 }
+
+/**
+ * Cancels from 'reply'.
+ */
+function privatemsg_cancel_reply($msgid) {
+  return drupal_goto('privatemsg/view/' . $msgid);
+}
\ No newline at end of file
diff -Nup privatemsg/privatemsg.pages.inc privatemsg_new/privatemsg.pages.inc
--- privatemsg/privatemsg.pages.inc	1970-01-01 01:00:00.000000000 +0100
+++ privatemsg_new/privatemsg.pages.inc	2007-12-15 20:36:11.000000000 +0100
@@ -0,0 +1,126 @@
+<?php
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access1() {
+  global $user;
+  return !$user->uid || user_access('access private messages');
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access2() {
+  global $user;
+  return user_access('access private messages') && $user->uid;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access3() {
+  global $user;
+  return user_access('create new folder') && $user->uid;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access4() {
+  global $user;
+  if (arg(0) == 'user' && arg(2) == 'privatemsg' && is_numeric(arg(1))) {
+    if ($user->uid == arg(1)) {
+      return $user->privatemsg_allow;
+    }
+    else if (user_access('administer private messages')) {
+      $account = user_load(array('uid' => arg(1)));
+      return $account->privatemsg_allow;
+    }
+  }
+  return false;
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access5() {
+  global $user;
+  return arg(0) == 'privatemsg' && is_numeric(arg(1)) && ($user->uid == arg(1) || user_access('administer private messages'));
+}
+
+/**
+ * Provides a callback function for a special permission type of privatemsg.
+ */
+function privatemsg_special_access6($account) {
+  global $user;
+  return ($user->uid == $account->uid || user_access('administer private messages')) && $account->privatemsg_allow;
+}
+
+/**
+ * Tests, whether the user has the right to manipulate the given folder.
+ */
+function privatemsg_administer_folder_permission($fid) {
+  global $user;
+  return privatemsg_folder_access($user->uid, $fid) && user_access('administer private messages');
+}
+
+/**
+ * Function that just returns true. (For access control.)
+ */
+function privatemsg_return_true() {
+  return true;
+}
+
+/**
+ * Function that determines the title for the /block site.
+ */
+function privatemsg_get_block_title($account) {
+  $title = t(privatemsg_user_blocked($account->uid) ? 'Unblock @user' : 'Block @user');
+  return str_replace('@user', $account->name, $title);
+}
+
+/**
+ * Callback for the /block site.
+ */
+function privatemsg_get_block_form($account) {
+  return drupal_get_form(privatemsg_user_blocked($account->uid) ? 'privatemsg_unblock_user_form ' : 'privatemsg_block_user_form', $account);
+}
+
+/**
+ * Returns the title for the inbox site.
+ */
+function privatemsg_get_inbox_title() {
+  $new = _privatemsg_get_new_messages();
+  
+  if ($new && strncmp($_GET['q'], 'privatemsg', 10) && $user->privatemsg_setmessage_notify && user_access('access private messages')) {
+    $m = drupal_set_message();
+    if (empty($m)) {
+      drupal_set_message(strtr(
+        format_plural($new,
+          'You have a new <a href="!url">private message</a>.',
+          'You have @count new <a href="!url">private messages</a>.'),
+        array('!url' => url('privatemsg'))));
+    }
+  }
+  
+  return variable_get('privatemsg_menu_link', 'My inbox') . ($new ? ' ('. $new .')' : '');
+}
+
+/**
+ * Returns the title for the privatemsg main site.
+ */
+function privatemsg_get_title($account) {
+  global $user;
+  if ($user->uid == $account->uid) {
+    return 'Private messages';
+  }
+  return 'Private messages for ' . $account->name;
+}
+
+/**
+ * Cancels from 'reply'.
+ */
+function privatemsg_cancel_reply($msgid) {
+  return drupal_goto('privatemsg/view/' . $msgid);
+}
\ No newline at end of file