diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql
index 89cc164e77..308a749078 100644
--- a/phpBB/install/schemas/firebird_schema.sql
+++ b/phpBB/install/schemas/firebird_schema.sql
@@ -419,6 +419,7 @@ CREATE TABLE phpbb_profile_fields (
   field_required INTEGER DEFAULT 0  NOT NULL,
   field_show_on_reg INTEGER DEFAULT 0  NOT NULL,
   field_hide INTEGER DEFAULT 0  NOT NULL,
+  field_no_view INTEGER DEFAULT 0  NOT NULL,
   field_active INTEGER DEFAULT 0  NOT NULL,
   field_order INTEGER DEFAULT 0  NOT NULL
 );;
@@ -696,6 +697,7 @@ CREATE TABLE phpbb_topics (
 CREATE TABLE phpbb_topics_marking (
   user_id INTEGER DEFAULT 0  NOT NULL,
   topic_id INTEGER DEFAULT 0  NOT NULL,
+  forum_id INTEGER DEFAULT 0  NOT NULL,
   mark_type INTEGER DEFAULT 0  NOT NULL,
   mark_time INTEGER DEFAULT 0  NOT NULL
 );;
diff --git a/phpBB/install/schemas/mssql_schema.sql b/phpBB/install/schemas/mssql_schema.sql
index a07eda57d7..7d7c119345 100644
--- a/phpBB/install/schemas/mssql_schema.sql
+++ b/phpBB/install/schemas/mssql_schema.sql
@@ -424,6 +424,7 @@ CREATE TABLE [phpbb_profile_fields] (
 	[field_required] [int] NOT NULL ,
 	[field_show_on_reg] [int] NOT NULL ,
 	[field_hide] [int] NOT NULL ,
+	[field_no_view] [int] NOT NULL ,
 	[field_active] [int] NOT NULL ,
 	[field_order] [int] NOT NULL 
 ) ON [PRIMARY]
@@ -701,6 +702,7 @@ GO
 CREATE TABLE [phpbb_topics_marking] (
 	[user_id] [int] NOT NULL ,
 	[topic_id] [int] NOT NULL ,
+	[forum_id] [int] NOT NULL ,
 	[mark_type] [int] NOT NULL ,
 	[mark_time] [int] NOT NULL 
 ) ON [PRIMARY]
@@ -1382,6 +1384,7 @@ ALTER TABLE [phpbb_profile_fields] WITH NOCHECK ADD
 	CONSTRAINT [DF_pffiel_field_required] DEFAULT (0) FOR [field_required],
 	CONSTRAINT [DF_pffiel_field_show_on_reg] DEFAULT (0) FOR [field_show_on_reg],
 	CONSTRAINT [DF_pffiel_field_hide] DEFAULT (0) FOR [field_hide],
+	CONSTRAINT [DF_pffiel_field_no_view] DEFAULT (0) FOR [field_no_view],
 	CONSTRAINT [DF_pffiel_field_active] DEFAULT (0) FOR [field_active],
 	CONSTRAINT [DF_pffiel_field_order] DEFAULT (0) FOR [field_order]
 GO
@@ -1510,6 +1513,7 @@ GO
 ALTER TABLE [phpbb_topics_marking] WITH NOCHECK ADD 
 	CONSTRAINT [DF_tmarki_user_id] DEFAULT (0) FOR [user_id],
 	CONSTRAINT [DF_tmarki_topic_id] DEFAULT (0) FOR [topic_id],
+	CONSTRAINT [DF_tmarki_forum_id] DEFAULT (0) FOR [forum_id],
 	CONSTRAINT [DF_tmarki_mark_type] DEFAULT (0) FOR [mark_type],
 	CONSTRAINT [DF_tmarki_mark_time] DEFAULT (0) FOR [mark_time]
 GO
diff --git a/phpBB/install/schemas/mysql_schema.sql b/phpBB/install/schemas/mysql_schema.sql
index caf8ae7436..96cc06fb5d 100644
--- a/phpBB/install/schemas/mysql_schema.sql
+++ b/phpBB/install/schemas/mysql_schema.sql
@@ -493,6 +493,7 @@ CREATE TABLE phpbb_profile_fields (
    field_required tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
    field_show_on_reg tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
    field_hide tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
+   field_no_view tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
    field_active tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
    field_order tinyint(4) UNSIGNED DEFAULT '0' NOT NULL,
    PRIMARY KEY (field_id),
@@ -804,8 +805,9 @@ CREATE TABLE phpbb_topics (
 
 # Table: 'phpbb_topic_marking'
 CREATE TABLE phpbb_topics_marking (
-   user_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL,
-   topic_id mediumint(9) UNSIGNED DEFAULT '0' NOT NULL,
+   user_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+   topic_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
+   forum_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
    mark_type tinyint(4) DEFAULT '0' NOT NULL,
    mark_time int(11) DEFAULT '0' NOT NULL,
    PRIMARY KEY (user_id, topic_id)
diff --git a/phpBB/install/schemas/postgres_schema.sql b/phpBB/install/schemas/postgres_schema.sql
index 9879515815..b07992cdfe 100644
--- a/phpBB/install/schemas/postgres_schema.sql
+++ b/phpBB/install/schemas/postgres_schema.sql
@@ -671,6 +671,7 @@ CREATE TABLE phpbb_profile_fields (
    field_required INT2  DEFAULT '0' NOT NULL,
    field_show_on_reg INT2  DEFAULT '0' NOT NULL,
    field_hide INT2  DEFAULT '0' NOT NULL,
+   field_no_view INT2  DEFAULT '0' NOT NULL,
    field_active INT2  DEFAULT '0' NOT NULL,
    field_order INT2  DEFAULT '0' NOT NULL,
    PRIMARY KEY (field_id),
@@ -678,6 +679,7 @@ CREATE TABLE phpbb_profile_fields (
   CHECK (field_required>=0),
   CHECK (field_show_on_reg>=0),
   CHECK (field_hide>=0),
+  CHECK (field_no_view>=0),
   CHECK (field_active>=0),
   CHECK (field_order>=0)
 );
@@ -1083,11 +1085,13 @@ SELECT SETVAL('phpbb_topics_topic_id_seq',(select case when max(topic_id)>0 then
 CREATE TABLE phpbb_topics_marking (
    user_id INT4  DEFAULT '0' NOT NULL,
    topic_id INT4  DEFAULT '0' NOT NULL,
+   forum_id INT4  DEFAULT '0' NOT NULL,
    mark_type INT2 DEFAULT '0' NOT NULL,
    mark_time INT4 DEFAULT '0' NOT NULL,
    PRIMARY KEY (user_id,topic_id),
   CHECK (user_id>=0),
-  CHECK (topic_id>=0)
+  CHECK (topic_id>=0),
+  CHECK (forum_id>=0)
 );
 
 /* Table: phpbb_topics_watch */