diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index dac542bf9..aab21737e 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -1,20 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.0" language="cs_CZ">
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>AdBlockAddSubscriptionDialog</name>
     <message>
         <source>Add subscription</source>
         <translation>Přidat skupinu filtrů</translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation>Vlastní seznam filtrů</translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation>Zadaná adresa je prázdná.</translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished">Nadpis</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index 1b2f9b379..3f5c1919f 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished">Titel</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index 318f2ba5f..955d5bb23 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts
index 785ab5a9c..6521be228 100644
--- a/localization/rssguard-en_US.ts
+++ b/localization/rssguard-en_US.ts
@@ -10,12 +10,12 @@
     </message>
     <message>
         <location filename="../src/network-web/adblock/adblockaddsubscriptiondialog.ui" line="23"/>
-        <source>Title:</source>
+        <source>Title</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../src/network-web/adblock/adblockaddsubscriptiondialog.ui" line="33"/>
-        <source>Address:</source>
+        <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -738,12 +738,12 @@ Auto-update status: %5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="350"/>
+        <location filename="../src/gui/feedsview.cpp" line="349"/>
         <source>Cannot edit item</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="377"/>
+        <location filename="../src/gui/feedsview.cpp" line="376"/>
         <source>Cannot delete item</source>
         <translation type="unfinished"></translation>
     </message>
@@ -758,67 +758,67 @@ Auto-update status: %5</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="351"/>
+        <location filename="../src/gui/feedsview.cpp" line="350"/>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="378"/>
+        <location filename="../src/gui/feedsview.cpp" line="377"/>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="393"/>
+        <location filename="../src/gui/feedsview.cpp" line="392"/>
         <source>Deleting feed or category</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="394"/>
+        <location filename="../src/gui/feedsview.cpp" line="393"/>
         <source>You are about to delete selected feed or category.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="394"/>
+        <location filename="../src/gui/feedsview.cpp" line="393"/>
         <source>Do you really want to delete selected item?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="408"/>
+        <location filename="../src/gui/feedsview.cpp" line="407"/>
         <source>Deletion of item failed.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="409"/>
+        <location filename="../src/gui/feedsview.cpp" line="408"/>
         <source>Selected item was not deleted due to error.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="457"/>
+        <location filename="../src/gui/feedsview.cpp" line="456"/>
         <source>Permanently delete messages</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="458"/>
+        <location filename="../src/gui/feedsview.cpp" line="457"/>
         <source>You are about to permanenty delete all messages from your recycle bin.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="459"/>
+        <location filename="../src/gui/feedsview.cpp" line="458"/>
         <source>Do you really want to empty your recycle bin?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="561"/>
+        <location filename="../src/gui/feedsview.cpp" line="558"/>
         <source>Context menu for feeds</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="576"/>
+        <location filename="../src/gui/feedsview.cpp" line="573"/>
         <source>Context menu for empty space</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../src/gui/feedsview.cpp" line="585"/>
+        <location filename="../src/gui/feedsview.cpp" line="582"/>
         <source>Context menu for recycle bin</source>
         <translation type="unfinished"></translation>
     </message>
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index 7055ba9aa..0dac3ab77 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished">Titre</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index a07f2b664..35045183e 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished">Titolo</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index c96493f35..04bf192be 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished">Titel</translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts
index 806dbbb21..562c47b6e 100644
--- a/localization/rssguard-sv_SE.ts
+++ b/localization/rssguard-sv_SE.ts
@@ -7,14 +7,6 @@
         <source>Add subscription</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Title:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address:</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Another subscription</source>
         <translation type="unfinished"></translation>
@@ -35,6 +27,14 @@
         <source>Entered url is empty.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Title</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Address</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>AdBlockCustomList</name>
diff --git a/src/miscellaneous/simplecrypt/simplecrypt.h b/src/miscellaneous/simplecrypt/simplecrypt.h
index 9ba232e25..fc0c2412b 100644
--- a/src/miscellaneous/simplecrypt/simplecrypt.h
+++ b/src/miscellaneous/simplecrypt/simplecrypt.h
@@ -87,7 +87,7 @@ class SimpleCrypt {
       ErrorNoError,         /*!< No error occurred. */
       ErrorNoKeySet,        /*!< No key was set. You can not encrypt or decrypt without a valid key. */
       ErrorUnknownVersion,  /*!< The version of this data is unknown, or the data is otherwise not valid. */
-      ErrorIntegrityFailed, /*!< The integrity check of the data failed. Perhaps the wrong key was used. */
+              ErrorIntegrityFailed  /*!< The integrity check of the data failed. Perhaps the wrong key was used. */
     };
 
     /**