diff --git a/resources/misc/db_init_mysql.sql b/resources/misc/db_init_mysql.sql
index 75612e8c7..9632bb6d0 100644
--- a/resources/misc/db_init_mysql.sql
+++ b/resources/misc/db_init_mysql.sql
@@ -23,11 +23,11 @@ CREATE TABLE IF NOT EXISTS TtRssAccounts (
   id              INTEGER,
   username        TEXT        NOT NULL,
   password        TEXT,
-  auth_protected  INTEGER(1)  NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0,
+  auth_protected  INTEGER(1)  NOT NULL DEFAULT 0 CHECK (auth_protected >= 0 AND auth_protected <= 1),
   auth_username   TEXT,
   auth_password   TEXT,
   url             TEXT        NOT NULL,
-  force_update    INTEGER(1)  NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
+  force_update    INTEGER(1)  NOT NULL DEFAULT 0 CHECK (force_update >= 0 AND force_update <= 1),
   
   FOREIGN KEY (id) REFERENCES Accounts (id)
 );
@@ -37,7 +37,7 @@ CREATE TABLE IF NOT EXISTS OwnCloudAccounts (
   username        TEXT        NOT NULL,
   password        TEXT,
   url             TEXT        NOT NULL,
-  force_update    INTEGER(1)  NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
+  force_update    INTEGER(1)  NOT NULL DEFAULT 0 CHECK (force_update >= 0 AND force_update <= 1),
   
   FOREIGN KEY (id) REFERENCES Accounts (id)
 );
@@ -71,7 +71,7 @@ CREATE TABLE IF NOT EXISTS Feeds (
   username        TEXT,
   password        TEXT,
   update_type     INTEGER(1)    NOT NULL CHECK (update_type >= 0),
-  update_interval INTEGER       NOT NULL CHECK (update_interval >= 5) DEFAULT 15,
+  update_interval INTEGER       NOT NULL DEFAULT 15 CHECK (update_interval >= 5),
   type            INTEGER,
   account_id      INTEGER       NOT NULL,
   custom_id       TEXT,
@@ -83,16 +83,16 @@ DROP TABLE IF EXISTS Messages;
 -- !
 CREATE TABLE IF NOT EXISTS Messages (
   id              INTEGER     AUTO_INCREMENT PRIMARY KEY,
-  is_read         INTEGER(1)  NOT NULL CHECK (is_read >= 0 AND is_read <= 1) DEFAULT 0,
-  is_deleted      INTEGER(1)  NOT NULL CHECK (is_deleted >= 0 AND is_deleted <= 1) DEFAULT 0,
-  is_important    INTEGER(1)  NOT NULL CHECK (is_important >= 0 AND is_important <= 1) DEFAULT 0 ,
+  is_read         INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_read >= 0 AND is_read <= 1),
+  is_deleted      INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_deleted >= 0 AND is_deleted <= 1),
+  is_important    INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_important >= 0 AND is_important <= 1),
   feed            TEXT        NOT NULL,
   title           TEXT        NOT NULL CHECK (title != ''),
   url             TEXT,
   author          TEXT,
   date_created    BIGINT      NOT NULL CHECK (date_created != 0),
   contents        TEXT,
-  is_pdeleted     INTEGER(1)  NOT NULL CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1) DEFAULT 0 ,
+  is_pdeleted     INTEGER(1)  NOT NULL DEFAULT 0 CHECK (is_pdeleted >= 0 AND is_pdeleted <= 1),
   enclosures      TEXT,
   account_id      INTEGER     NOT NULL,
   custom_id       TEXT,
diff --git a/resources/misc/db_update_mysql_3_4.sql b/resources/misc/db_update_mysql_3_4.sql
index 9dc74ab99..bb60d6105 100644
--- a/resources/misc/db_update_mysql_3_4.sql
+++ b/resources/misc/db_update_mysql_3_4.sql
@@ -11,11 +11,11 @@ CREATE TABLE TtRssAccounts (
   id              INTEGER,
   username        TEXT        NOT NULL,
   password        TEXT,
-  auth_protected  INTEGER(1)  NOT NULL CHECK (auth_protected >= 0 AND auth_protected <= 1) DEFAULT 0,
+  auth_protected  INTEGER(1)  NOT NULL DEFAULT 0 CHECK (auth_protected >= 0 AND auth_protected <= 1),
   auth_username   TEXT,
   auth_password   TEXT,
   url             TEXT        NOT NULL,
-  force_update    INTEGER(1)  NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
+  force_update    INTEGER(1)  NOT NULL DEFAULT 0 CHECK (force_update >= 0 AND force_update <= 1),
   
   FOREIGN KEY (id) REFERENCES Accounts (id)
 );
diff --git a/resources/misc/db_update_mysql_4_5.sql b/resources/misc/db_update_mysql_4_5.sql
index 8367a5c92..44f7af0a6 100755
--- a/resources/misc/db_update_mysql_4_5.sql
+++ b/resources/misc/db_update_mysql_4_5.sql
@@ -3,7 +3,7 @@ CREATE TABLE IF NOT EXISTS OwnCloudAccounts (
   username        TEXT        NOT NULL,
   password        TEXT,
   url             TEXT        NOT NULL,
-  force_update    INTEGER(1)  NOT NULL CHECK (force_update >= 0 AND force_update <= 1) DEFAULT 0,
+  force_update    INTEGER(1)  NOT NULL DEFAULT 0 CHECK (force_update >= 0 AND force_update <= 1),
   
   FOREIGN KEY (id) REFERENCES Accounts (id)
 );
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 0348f058f..21802764d 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -13,6 +13,7 @@ Added:
 
 Fixed:
 
+▪ MySQL scripts improved. (bug #170)
 ▪ Fixed little problem with feed list hiding. (bug #163)
 ▪ Web browser search context menu item now trims the searched string. (bug #168)