diff --git a/src/gui/DatabaseSettingsWidget.cpp b/src/gui/DatabaseSettingsWidget.cpp
index 291887a97..baea2558a 100644
--- a/src/gui/DatabaseSettingsWidget.cpp
+++ b/src/gui/DatabaseSettingsWidget.cpp
@@ -79,6 +79,8 @@ void DatabaseSettingsWidget::load(Database* db)
     m_uiGeneral->dbDescriptionEdit->setText(meta->description());
     m_uiGeneral->recycleBinEnabledCheckBox->setChecked(meta->recycleBinEnabled());
     m_uiGeneral->defaultUsernameEdit->setText(meta->defaultUserName());
+    m_uiGeneral->compressionCheckbox->setChecked(m_db->compressionAlgo() != Database::CompressionNone);
+
     if (meta->historyMaxItems() > -1) {
         m_uiGeneral->historyMaxItemsSpinBox->setValue(meta->historyMaxItems());
         m_uiGeneral->historyMaxItemsCheckBox->setChecked(true);
@@ -168,6 +170,8 @@ void DatabaseSettingsWidget::save()
         }
     }
 
+    m_db->setCompressionAlgo(m_uiGeneral->compressionCheckbox->isChecked() ? Database::CompressionGZip : Database::CompressionNone);
+
     Metadata* meta = m_db->metadata();
 
     meta->setName(m_uiGeneral->dbNameEdit->text());
diff --git a/src/gui/DatabaseSettingsWidgetGeneral.ui b/src/gui/DatabaseSettingsWidgetGeneral.ui
index c072c1d8d..d3baf6132 100644
--- a/src/gui/DatabaseSettingsWidgetGeneral.ui
+++ b/src/gui/DatabaseSettingsWidgetGeneral.ui
@@ -26,9 +26,6 @@
         <property name="text">
          <string>Database name:</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
        </widget>
       </item>
       <item row="0" column="1">
@@ -39,9 +36,6 @@
         <property name="text">
          <string>Database description:</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
        </widget>
       </item>
       <item row="1" column="1">
@@ -52,9 +46,6 @@
         <property name="text">
          <string>Default username:</string>
         </property>
-        <property name="alignment">
-         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-        </property>
        </widget>
       </item>
       <item row="2" column="1">
@@ -134,6 +125,25 @@
      </layout>
     </widget>
    </item>
+   <item>
+    <widget class="QGroupBox" name="groupBox_3">
+     <property name="title">
+      <string>Additional Database Settings</string>
+     </property>
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <item>
+       <widget class="QCheckBox" name="compressionCheckbox">
+        <property name="text">
+         <string>Enable &amp;compression (recommended)</string>
+        </property>
+        <property name="checked">
+         <bool>true</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <spacer name="verticalSpacer">
      <property name="orientation">