diff --git a/resources/sql/db_init_mysql.sql b/resources/sql/db_init_mysql.sql
index d9858848d..48e81ac81 100644
--- a/resources/sql/db_init_mysql.sql
+++ b/resources/sql/db_init_mysql.sql
@@ -99,31 +99,5 @@ CREATE TABLE IF NOT EXISTS Messages (
   custom_id       TEXT,
   custom_hash     TEXT,
   
-  FOREIGN KEY (account_id) REFERENCES Accounts (id)
-);
--- !
-DROP TABLE IF EXISTS Labels;
--- !
-CREATE TABLE IF NOT EXISTS Labels (
-  id              INTEGER     AUTO_INCREMENT PRIMARY KEY,
-  account_id      INTEGER     NOT NULL,
-  color_fg        TEXT        NOT NULL,
-  color_bg        TEXT        NOT NULL,
-  title           TEXT        NOT NULL,
-  description     TEXT,
-  custom_id       TEXT,
-  custom_hash     TEXT,
-  
-  FOREIGN KEY (account_id) REFERENCES Accounts (id)
-);
--- !
-DROP TABLE IF EXISTS LabelsInMessages;
--- !
-CREATE TABLE IF NOT EXISTS LabelsInMessages (
-  id                  INTEGER     AUTO_INCREMENT PRIMARY KEY,
-  message_custom_id   TEXT        NOT NULL,
-  label_custom_id     TEXT        NOT NULL,
-  account_id          INTEGER     NOT NULL,
-  
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
\ No newline at end of file
diff --git a/resources/sql/db_init_sqlite.sql b/resources/sql/db_init_sqlite.sql
index 625ffb41a..6bfdfc404 100644
--- a/resources/sql/db_init_sqlite.sql
+++ b/resources/sql/db_init_sqlite.sql
@@ -94,33 +94,5 @@ CREATE TABLE IF NOT EXISTS Messages (
   custom_id       TEXT,
   custom_hash     TEXT,
   
-  FOREIGN KEY (account_id) REFERENCES Accounts (id)
-);
--- !
-DROP TABLE IF EXISTS Labels;
--- !
-CREATE TABLE IF NOT EXISTS Labels (
-  id              INTEGER     PRIMARY KEY,
-  account_id      INTEGER     NOT NULL,
-  color_fg        TEXT        NOT NULL,
-  color_bg        TEXT        NOT NULL,
-  title           TEXT        NOT NULL,
-  description     TEXT,
-  custom_id       TEXT,
-  custom_hash     TEXT,
-  
-  FOREIGN KEY (account_id) REFERENCES Accounts (id)
-);
--- !
-DROP TABLE IF EXISTS LabelsInMessages;
--- !
-CREATE TABLE IF NOT EXISTS LabelsInMessages (
-  id                  INTEGER     PRIMARY KEY,
-  message_custom_id   TEXT        NOT NULL,
-  label_custom_id     TEXT        NOT NULL,
-  account_id          INTEGER     NOT NULL,
-  
-  FOREIGN KEY (message_custom_id) REFERENCES Messages (custom_id),
-  FOREIGN KEY (label_custom_id) REFERENCES Labels (custom_id),
   FOREIGN KEY (account_id) REFERENCES Accounts (id)
 );
\ No newline at end of file
diff --git a/resources/sql/db_update_mysql_8_9.sql b/resources/sql/db_update_mysql_8_9.sql
index 21aa8b282..d9d6c486c 100755
--- a/resources/sql/db_update_mysql_8_9.sql
+++ b/resources/sql/db_update_mysql_8_9.sql
@@ -1,4 +1,8 @@
 ALTER TABLE OwnCloudAccounts
 ADD COLUMN msg_limit INTEGER NOT NULL DEFAULT -1 CHECK (msg_limit >= -1);
 -- !
+DROP TABLE IF EXISTS Labels;
+-- !
+DROP TABLE IF EXISTS LabelsInMessages;
+-- !
 UPDATE Information SET inf_value = '9' WHERE inf_key = 'schema_version';
\ No newline at end of file
diff --git a/resources/sql/db_update_sqlite_8_9.sql b/resources/sql/db_update_sqlite_8_9.sql
index df9372f00..357bdf8f5 100755
--- a/resources/sql/db_update_sqlite_8_9.sql
+++ b/resources/sql/db_update_sqlite_8_9.sql
@@ -18,4 +18,8 @@ SELECT id, username, password, url, force_update  FROM backup_oa;
 -- !
 DROP TABLE backup_oa;
 -- !
+DROP TABLE IF EXISTS Labels;
+-- !
+DROP TABLE IF EXISTS LabelsInMessages;
+-- !
 UPDATE Information SET inf_value = '9' WHERE inf_key = 'schema_version';
\ No newline at end of file
diff --git a/src/gui/dialogs/formabout.ui b/src/gui/dialogs/formabout.ui
index 5ec491ace..8b894c589 100755
--- a/src/gui/dialogs/formabout.ui
+++ b/src/gui/dialogs/formabout.ui
@@ -235,7 +235,7 @@ p, li { white-space: pre-wrap; }
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>83</width>
+            <width>98</width>
             <height>69</height>
            </rect>
           </property>
@@ -435,13 +435,13 @@ p, li { white-space: pre-wrap; }
  </widget>
  <tabstops>
   <tabstop>m_tabAbout</tabstop>
+  <tabstop>m_txtInfo</tabstop>
+  <tabstop>m_txtLicenseGnu</tabstop>
+  <tabstop>m_txtChangelog</tabstop>
   <tabstop>m_txtPathsSettingsType</tabstop>
   <tabstop>m_txtPathsSettingsFile</tabstop>
   <tabstop>m_txtPathsDatabaseRoot</tabstop>
   <tabstop>m_txtPathsSkinsRoot</tabstop>
-  <tabstop>m_txtInfo</tabstop>
-  <tabstop>m_txtLicenseGnu</tabstop>
-  <tabstop>m_txtChangelog</tabstop>
   <tabstop>m_txtLicenseBsd</tabstop>
  </tabstops>
  <resources/>
diff --git a/src/gui/dialogs/formdatabasecleanup.ui b/src/gui/dialogs/formdatabasecleanup.ui
index 44a1ec47b..1d18a2a4e 100755
--- a/src/gui/dialogs/formdatabasecleanup.ui
+++ b/src/gui/dialogs/formdatabasecleanup.ui
@@ -198,6 +198,7 @@
  <tabstops>
   <tabstop>m_checkRemoveReadMessages</tabstop>
   <tabstop>m_checkRemoveRecycleBin</tabstop>
+  <tabstop>m_checkRemoveStarredMessages</tabstop>
   <tabstop>m_checkShrink</tabstop>
   <tabstop>m_checkRemoveOldMessages</tabstop>
   <tabstop>m_spinDays</tabstop>
diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp
index 95ca65746..44849773b 100755
--- a/src/gui/dialogs/formmain.cpp
+++ b/src/gui/dialogs/formmain.cpp
@@ -113,7 +113,7 @@ StatusBar* FormMain::statusBar() const {
 
 void FormMain::showDbCleanupAssistant() {
 	if (qApp->feedUpdateLock()->tryLock()) {
-    FormDatabaseCleanup form(new FormDatabaseCleanup(this));
+    FormDatabaseCleanup form(this);
     form.setCleaner(qApp->feedReader()->databaseCleaner());
     form.exec();