diff --git a/core/database.js b/core/database.js
index 945cffec..23d64ae8 100644
--- a/core/database.js
+++ b/core/database.js
@@ -86,12 +86,29 @@ function createMessageBaseTables() {
 	);
 
 	dbs.message.run(
-		'CREATE VIRTUAL TABLE message_fts USING fts4 (' +
+		'CREATE VIRTUAL TABLE IF NOT EXISTS message_fts USING fts4 (' +
 		'	content="message",' +
 		'	subject,' +
 		'	message' +
 		');'
 	);
+
+	dbs.message.run(
+		'CREATE TABLE IF NOT EXISTS message_meta (' +
+		'	message_id	INTEGER NOT NULL,'	+
+		'	meta_name	VARCHAR NOT NULL,'	+
+		'	meta_value	VARCHAR NOT NULL,'	+
+		'	UNIQUE(message_id, meta_name),' 	+
+		'	FOREIGN KEY(message_id) REFERENCES message(message_id) ON DELETE CASCADE' +
+		');'
+	);
+
+	dbs.message.run(
+		'CREATE TABLE IF NOT EXISTS message_hash_tag (' +
+		'	hash_tag	VARCHAR NOT NULL,' +
+		'	message_id	INTEGER NOT NULL' +
+		');'
+	);
 }
 
 function createInitialValues() {
diff --git a/mods/art/demo_fse_local_user.ans b/mods/art/demo_fse_local_user.ans
index 33a5e8eb..09ddde55 100644
Binary files a/mods/art/demo_fse_local_user.ans and b/mods/art/demo_fse_local_user.ans differ
diff --git a/mods/fse.js b/mods/fse.js
index df7cee3d..fff1bb34 100644
--- a/mods/fse.js
+++ b/mods/fse.js
@@ -68,7 +68,7 @@ function FullScreenEditorModule(options) {
 				text : 'This is a longer string',
 			},
 			MT3 : {
-				width : 80,
+				width : 79,
 				height : 17,
 				focus : true,
 				text : 'Ermergerd!\nHuzzah!'