diff --git a/CHANGELOG b/CHANGELOG
index 36baf28c5..9779ceeb7 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+Version 0.18.4 (08 Mar 2016)
+ * Changed: Mouse buttons settings of opening news is removed
+ * Changed: SQLite librari is updated to 3.11.1 version
+ * Fixed: msvcr120.dll troubles (Windows)
+ * Fixed: Application crash while using some shortcuts
+ * Fixed: Images are not displayed in some feeds
+ * Fixed: Folder properties does not display "Columns" tab
+
Version 0.18.3 (26 Jan 2015)
* Added: Setting to set mouse buttons to open news
* Changed: Update SQLite library to 3.9.2 version
diff --git a/HISTORY_EN b/HISTORY_EN
index 65ad44a7d..4768bd766 100644
--- a/HISTORY_EN
+++ b/HISTORY_EN
@@ -2,10 +2,10 @@
-Version 0.18.3+ (xx Feb 2016)
+
Version 0.18.4 (08 Mar 2016)
- Changed: Mouse buttons settings of opening news is removed
-- Changed: SQLite librari is updated to 3.11.0 version
+- Changed: SQLite librari is updated to 3.11.1 version
- Fixed: msvcr120.dll troubles (Windows)
- Fixed: Application crash while using some shortcuts
diff --git a/HISTORY_RU b/HISTORY_RU
index ab5ffbc16..f787ca225 100644
--- a/HISTORY_RU
+++ b/HISTORY_RU
@@ -2,10 +2,10 @@
-Версия 0.18.3+ (хх Фев 2016)
+
Версия 0.18.4 (08 Мар 2016)
- Изменено: Удаление настроек кнопок мыши на открытие новостей
-- Изменено: Библиотека SQLite 3.11.0
+- Изменено: Библиотека SQLite 3.11.1
- Исправлено: Проблемы с msvcr120.dll (Windows)
- Исправлено: Падение приложения при использовании некоторых горячих клавиш
diff --git a/Info.plist b/Info.plist
index 3bc17dca1..ee15216c9 100644
--- a/Info.plist
+++ b/Info.plist
@@ -21,7 +21,7 @@
CFBundleDisplayName
@EXECUTABLE@
CFBundleShortVersionString
- 0.18.3
+ 0.18.4
NSHumanReadableCopyright
(C) 2011-2016 QuiteRSS Team
diff --git a/src/VersionNo.h b/src/VersionNo.h
index 1679cb336..e362cfae1 100644
--- a/src/VersionNo.h
+++ b/src/VersionNo.h
@@ -1,9 +1,9 @@
#include "VersionRev.h"
-#define STRDATE "26.01.2016\0"
-#define STRPRODUCTVER "0.18.3\0"
+#define STRDATE "08.03.2016\0"
+#define STRPRODUCTVER "0.18.4\0"
-#define VERSION 0,18,3
+#define VERSION 0,18,4
#define PRODUCTVER VERSION,0
#define FILEVER VERSION,VCS_REVISION
diff --git a/src/optionsdialog.cpp b/src/optionsdialog.cpp
index 1ca26b479..e68c5b24e 100644
--- a/src/optionsdialog.cpp
+++ b/src/optionsdialog.cpp
@@ -1350,7 +1350,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "bg" << QString::fromUtf8("Български [BG]")
- << "0.18.3"
+ << "0.18.4"
<< QString::fromUtf8("Nikolai Tsvetkov") << "koko@cybcom.net";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_BG"));
@@ -1358,7 +1358,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "cs" << QString::fromUtf8("Čeština [CS]")
- << "0.18.2"
+ << "0.18.4"
<< QString::fromUtf8("Matej Szendi") << "matej.szendi@gmail.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_CZ"));
@@ -1390,7 +1390,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "fa" << QString::fromUtf8("فارسی [FA]")
- << "0.18.3"
+ << "0.18.4"
<< "H.Mohamadi" << "";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_FA"));
@@ -1406,7 +1406,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "fr" << QString::fromUtf8("Français [FR]")
- << "0.18.3"
+ << "0.18.4"
<< "Glad Deschrijver" << "glad.deschrijver@gmail.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_FR"));
@@ -1438,7 +1438,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "it" << QString::fromUtf8("Italiano [IT]")
- << "0.18.3"
+ << "0.18.4"
<< "ZeroWis" << "lightflash@hotmail.it";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_IT"));
@@ -1470,7 +1470,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "nl" << QString::fromUtf8("Nederlands [NL]")
- << "0.18.3"
+ << "0.18.4"
<< "TeLLie" << "elbert.pol@gmail.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_NL"));
@@ -1478,7 +1478,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "pl" << QString::fromUtf8("Polski [PL]")
- << "0.18.3"
+ << "0.18.4"
<< QString::fromUtf8("Piotr Pecka") << "piotr.pecka@outlook.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_PL"));
@@ -1486,7 +1486,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "pt_BR" << QString::fromUtf8("Português (Brazil) [pt_BR]")
- << "0.18.3"
+ << "0.18.4"
<< QString::fromUtf8("Marcos M. Ribeiro") << "";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_BR"));
@@ -1502,7 +1502,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "ro_RO" << QString::fromUtf8("Limba română [ro_RO]")
- << "0.18.3"
+ << "0.18.4"
<< QString::fromUtf8("Jaff (Oprea Nicolae)") << "Jaff2002@yahoo.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_RO"));
@@ -1518,7 +1518,7 @@ void OptionsDialog::createLanguageWidget()
treeItem.clear();
treeItem << "sk" << QString::fromUtf8("Slovenčina [SK]")
- << "0.18.3"
+ << "0.18.4"
<< QString::fromUtf8("DAG Software (Ďanovský Ján)") << "dagsoftware@yahoo.com";
languageItem = new QTreeWidgetItem(treeItem);
languageItem->setIcon(1, QIcon(":/flags/flag_SK"));