6 files changed, 16 insertions, 10 deletions
diff --git a/phpBB/install/database_update.php b/phpBB/install/database_update.php
index 90583c8a5a..64a4c46bb8 100644
--- a/phpBB/install/database_update.php
+++ b/phpBB/install/database_update.php
@@ -329,6 +329,12 @@ $database_update_info = array(
 				'prune_viewed'			=> array('UINT', 0),
 				'prune_freq'			=> array('UINT', 0),
 			),
+			PRIVMSGS_RULES_TABLE	=> array(
+				'rule_folder_id'		=> array('UINT', 0),
+			),
+			PRIVMSGS_TO_TABLE		=> array(
+				'folder_id'				=> array('UINT', 0),
+			),
 		),
 		// Remove the following keys
 		'drop_keys'		=> array(
diff --git a/phpBB/install/schemas/mysql_40_schema.sql b/phpBB/install/schemas/mysql_40_schema.sql
index 545642ab74..61ec3e2c9e 100644
--- a/phpBB/install/schemas/mysql_40_schema.sql
+++ b/phpBB/install/schemas/mysql_40_schema.sql
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_folder_id int(4) DEFAULT '0' NOT NULL,
+	rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (rule_id),
 	KEY user_id (user_id)
 );
@@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	folder_id int(4) DEFAULT '0' NOT NULL,
+	folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	KEY msg_id (msg_id),
 	KEY author_id (author_id),
 	KEY usr_flder_id (user_id, folder_id)
diff --git a/phpBB/install/schemas/mysql_41_schema.sql b/phpBB/install/schemas/mysql_41_schema.sql
index 05d81ab209..1f1396e9e8 100644
--- a/phpBB/install/schemas/mysql_41_schema.sql
+++ b/phpBB/install/schemas/mysql_41_schema.sql
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	rule_user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_group_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	rule_action mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
-	rule_folder_id int(4) DEFAULT '0' NOT NULL,
+	rule_folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	PRIMARY KEY (rule_id),
 	KEY user_id (user_id)
 ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
@@ -528,7 +528,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	pm_marked tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
 	pm_forwarded tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
-	folder_id int(4) DEFAULT '0' NOT NULL,
+	folder_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
 	KEY msg_id (msg_id),
 	KEY author_id (author_id),
 	KEY usr_flder_id (user_id, folder_id)
diff --git a/phpBB/install/schemas/oracle_schema.sql b/phpBB/install/schemas/oracle_schema.sql
index 9f3d287e83..f926ff478b 100644
--- a/phpBB/install/schemas/oracle_schema.sql
+++ b/phpBB/install/schemas/oracle_schema.sql
@@ -989,7 +989,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	rule_user_id number(8) DEFAULT '0' NOT NULL,
 	rule_group_id number(8) DEFAULT '0' NOT NULL,
 	rule_action number(8) DEFAULT '0' NOT NULL,
-	rule_folder_id number(4) DEFAULT '0' NOT NULL,
+	rule_folder_id number(8) DEFAULT '0' NOT NULL,
 	CONSTRAINT pk_phpbb_privmsgs_rules PRIMARY KEY (rule_id)
 )
 /
@@ -1026,7 +1026,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied number(1) DEFAULT '0' NOT NULL,
 	pm_marked number(1) DEFAULT '0' NOT NULL,
 	pm_forwarded number(1) DEFAULT '0' NOT NULL,
-	folder_id number(4) DEFAULT '0' NOT NULL
+	folder_id number(8) DEFAULT '0' NOT NULL
 )
 /
 
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index d0005a16a7..aa3eb59c46 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -691,7 +691,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	rule_user_id INT4 DEFAULT '0' NOT NULL CHECK (rule_user_id >= 0),
 	rule_group_id INT4 DEFAULT '0' NOT NULL CHECK (rule_group_id >= 0),
 	rule_action INT4 DEFAULT '0' NOT NULL CHECK (rule_action >= 0),
-	rule_folder_id INT4 DEFAULT '0' NOT NULL,
+	rule_folder_id INT4 DEFAULT '0' NOT NULL CHECK (rule_folder_id >= 0),
 	PRIMARY KEY (rule_id)
 );
 
@@ -710,7 +710,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied INT2 DEFAULT '0' NOT NULL CHECK (pm_replied >= 0),
 	pm_marked INT2 DEFAULT '0' NOT NULL CHECK (pm_marked >= 0),
 	pm_forwarded INT2 DEFAULT '0' NOT NULL CHECK (pm_forwarded >= 0),
-	folder_id INT4 DEFAULT '0' NOT NULL
+	folder_id INT4 DEFAULT '0' NOT NULL CHECK (folder_id >= 0)
 );
 
 CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);
diff --git a/phpBB/install/schemas/sqlite_schema.sql b/phpBB/install/schemas/sqlite_schema.sql
index 184d2332ab..ccc531a989 100644
--- a/phpBB/install/schemas/sqlite_schema.sql
+++ b/phpBB/install/schemas/sqlite_schema.sql
@@ -495,7 +495,7 @@ CREATE TABLE phpbb_privmsgs_rules (
 	rule_user_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	rule_group_id INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	rule_action INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	rule_folder_id int(4) NOT NULL DEFAULT '0'
+	rule_folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
 CREATE INDEX phpbb_privmsgs_rules_user_id ON phpbb_privmsgs_rules (user_id);
@@ -511,7 +511,7 @@ CREATE TABLE phpbb_privmsgs_to (
 	pm_replied INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	pm_marked INTEGER UNSIGNED NOT NULL DEFAULT '0',
 	pm_forwarded INTEGER UNSIGNED NOT NULL DEFAULT '0',
-	folder_id int(4) NOT NULL DEFAULT '0'
+	folder_id INTEGER UNSIGNED NOT NULL DEFAULT '0'
 );
 
 CREATE INDEX phpbb_privmsgs_to_msg_id ON phpbb_privmsgs_to (msg_id);