diff --git a/phpBB/includes/constants.php b/phpBB/includes/constants.php
index de289c73dc..7a3c73e987 100644
--- a/phpBB/includes/constants.php
+++ b/phpBB/includes/constants.php
@@ -273,6 +273,7 @@ define('TOPICS_POSTED_TABLE',		$table_prefix . 'topics_posted');
 define('TOPICS_TRACK_TABLE',		$table_prefix . 'topics_track');
 define('TOPICS_WATCH_TABLE',		$table_prefix . 'topics_watch');
 define('USER_GROUP_TABLE',			$table_prefix . 'user_group');
+define('USER_NOTIFICATIONS_TABLE',	$table_prefix . 'user_notifications');
 define('USERS_TABLE',				$table_prefix . 'users');
 define('WARNINGS_TABLE',			$table_prefix . 'warnings');
 define('WORDS_TABLE',				$table_prefix . 'words');
diff --git a/phpBB/includes/notifications/method/email.php b/phpBB/includes/notifications/method/email.php
index b06e2c018e..0c3cb4bd85 100644
--- a/phpBB/includes/notifications/method/email.php
+++ b/phpBB/includes/notifications/method/email.php
@@ -17,11 +17,19 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Email notification method class
+* This class handles sending emails for notifications
+*
 * @package notifications
 */
 class phpbb_notifications_method_email extends phpbb_notifications_method_base
 {
-	function notify()
+	public static function is_available()
+	{
+		// Email is always available
+		return true;
+	}
+
+	public function notify()
 	{
 		// email the user
 	}
diff --git a/phpBB/includes/notifications/type/pm.php b/phpBB/includes/notifications/type/pm.php
index f86050486e..191c0b7e7f 100644
--- a/phpBB/includes/notifications/type/pm.php
+++ b/phpBB/includes/notifications/type/pm.php
@@ -17,6 +17,8 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Private message notifications class
+* This class handles notifications for private messages
+*
 * @package notifications
 */
 class phpbb_notifications_type_pm extends phpbb_notifications_type_base
diff --git a/phpBB/includes/notifications/type/post.php b/phpBB/includes/notifications/type/post.php
index 9bd343d288..addaa30ea6 100644
--- a/phpBB/includes/notifications/type/post.php
+++ b/phpBB/includes/notifications/type/post.php
@@ -17,6 +17,8 @@ if (!defined('IN_PHPBB'))
 
 /**
 * Post notifications class
+* This class handles notifications for replies to a topic
+*
 * @package notifications
 */
 class phpbb_notifications_type_post extends phpbb_notifications_type_base