diff --git a/resources/misc/db_init.sql b/resources/misc/db_init.sql
index 2e21266fe..4115a8e3a 100644
--- a/resources/misc/db_init.sql
+++ b/resources/misc/db_init.sql
@@ -1,8 +1,8 @@
 DROP TABLE IF EXISTS Information;
 -- !
 CREATE TABLE IF NOT EXISTS Information (
-  key           TEXT      PRIMARY KEY,
-  value         TEXT      NOT NULL
+  key           TEXT        PRIMARY KEY,
+  value         TEXT        NOT NULL
 );
 -- !
 INSERT INTO Information VALUES ('schema_version', '0.0.1');
@@ -10,8 +10,41 @@ INSERT INTO Information VALUES ('schema_version', '0.0.1');
 DROP TABLE IF EXISTS Categories;
 -- !
 CREATE TABLE IF NOT EXISTS Categories (
-  id             INTEGER  PRIMARY KEY,
-  title          TEXT     NOT NULL UNIQUE CHECK(title != ''),
-  description    TEXT
+  id             INTEGER    PRIMARY KEY,
+  title          TEXT       NOT NULL UNIQUE CHECK (title != ''),
+  description    TEXT,
+  date_created   TEXT       NOT NULL CHECK (date_created != ''),
   icon           BLOB
+);
+-- !
+DROP TABLE IF EXISTS Feeds;
+-- !
+CREATE TABLE IF NOT EXISTS Feeds (
+  id             INTEGER    PRIMARY KEY,
+  title          TEXT       NOT NULL UNIQUE CHECK (title != ''),
+  description    TEXT,
+  date_created   TEXT       NOT NULL CHECK (date_created != ''),
+  icon           BLOB,
+  category       INTEGER    NOT NULL CHECK (category >= -1),
+  encoding       TEXT       NOT NULL CHECK (encoding != ''),
+  url            TEXT       NOT NULL CHECK (url != ''),
+  type           INTEGER    NOT NULL
+);
+-- !
+DROP TABLE IF EXISTS Messages;
+-- !
+CREATE TABLE IF NOT EXISTS Messages (
+  id             INTEGER    PRIMARY KEY,
+  title          TEXT       NOT NULL CHECK (title != ''),
+  owner          INTEGER    NOT NULL,
+  url            TEXT,
+  author         TEXT,
+  date_created   TEXT       NOT NULL CHECK (date_created != ''),
+  date_updated   TEXT,
+  contents       TEXT,
+  read           INTEGER(1) NOT NULL CHECK (read >= 0 AND read <= 1) DEFAULT (0),
+  deleted        INTEGER(1) NOT NULL CHECK (deleted >= 0 AND deleted <= 1) DEFAULT (0),
+  important      INTEGER(1) NOT NULL CHECK (important >= 0 AND important <= 1) DEFAULT (0),
+  
+  FOREIGN KEY (owner) REFERENCES Feeds (id)
 );
\ No newline at end of file
diff --git a/src/core/databasefactory.cpp b/src/core/databasefactory.cpp
index 6d22270c9..eae54d9ef 100644
--- a/src/core/databasefactory.cpp
+++ b/src/core/databasefactory.cpp
@@ -90,18 +90,22 @@ QSqlDatabase DatabaseFactory::initialize(const QString &connection_name) {
       }
 
       database.exec("COMMIT");
-      qWarning("Database backend should be ready now.");
+      qDebug("Database backend should be ready now.");
     }
     else {
       q.next();
+
       qDebug("Database connection '%s' to file '%s' seems to be established.",
              qPrintable(connection_name),
              qPrintable(QDir::toNativeSeparators(database.databaseName())));
       qDebug("Database has version '%s'.", qPrintable(q.value(0).toString()));
     }
+
     q.finish();
   }
 
+  m_initialized = true;
+
   return database;
 }