diff --git a/localization/rssguard_cs.ts b/localization/rssguard_cs.ts
index 0b1ae5961..8d83a91e5 100644
--- a/localization/rssguard_cs.ts
+++ b/localization/rssguard_cs.ts
@@ -91,11 +91,11 @@
     </message>
     <message>
         <source>Blocked popup window</source>
-        <translation type="unfinished"/>
+        <translation>Zablokováno vyskakovací okno</translation>
     </message>
     <message>
         <source>AdBlock blocked unwanted popup window.</source>
-        <translation type="unfinished"/>
+        <translation>AdBlock zablokoval vyskakovací okno.</translation>
     </message>
     <message>
         <source>Show AdBlock &amp;settings</source>
@@ -908,11 +908,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Downloading attachment...</source>
-        <translation type="unfinished"/>
+        <translation>Stahuji přílohu...</translation>
     </message>
     <message>
         <source>Downloaded: %1 kB</source>
-        <translation type="unfinished"/>
+        <translation>Staženo: %1 kB</translation>
     </message>
 </context>
 <context>
@@ -1134,11 +1134,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>No username entered.   </source>
-        <translation type="unfinished"/>
+        <translation>Nezadáno uživatelské jméno.</translation>
     </message>
     <message>
         <source>Some username entered.   </source>
-        <translation type="unfinished"/>
+        <translation>Uživatelské jméno zadáno.</translation>
     </message>
     <message>
         <source>You did not grant access.</source>
@@ -1150,7 +1150,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>There is error. %1 </source>
-        <translation type="unfinished"/>
+        <translation>Chyba. %1</translation>
     </message>
     <message>
         <source>Tested successfully.You may be prompted to login once more.</source>
@@ -1162,11 +1162,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add new Gmail account</source>
-        <translation type="unfinished"/>
+        <translation>Přidat nový účet Gmail</translation>
     </message>
     <message>
         <source>Edit existing Gmail account</source>
-        <translation type="unfinished"/>
+        <translation>Upravit existující účet Gmail</translation>
     </message>
     <message>
         <source>Empty value is entered.</source>
@@ -1178,11 +1178,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>You must use &quot;%1&quot; as base redirect URL. You can use custom port to make sure that no local service occupies it. Make sure that this redirect URL matches redirect URL of used &quot;application&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Musíte použít &quot;%1&quot; jako základní přesměrovací URL. Můžete použít vlastní číslo portu, abyste měli jistotu, že nekoliduje s jinou službou. Ujistěte se, že nastavení přesměrovací URL je konzistentní s nastavením na straně webové služby.</translation>
     </message>
     <message>
         <source>Predefined settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!</source>
-        <translation type="unfinished"/>
+        <translation>Předdefinovaná nastavení měňte pouze pokud opravdu víte co děláte.</translation>
     </message>
 </context>
 <context>
@@ -1285,7 +1285,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>You must use &quot;%1&quot; as base redirect URL. You can use custom port to make sure that no local service occupies it. Make sure that this redirect URL matches redirect URL of used &quot;application&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Musíte použít &quot;%1&quot; jako základní přesměrovací URL. Můžete použít vlastní číslo portu, abyste měli jistotu, že nekoliduje s jinou službou. Ujistěte se, že nastavení přesměrovací URL je konzistentní s nastavením na straně webové služby.</translation>
     </message>
 </context>
 <context>
@@ -1867,7 +1867,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Použít výchozí ikonu z tématu</translation>
     </message>
 </context>
 <context>
@@ -2271,11 +2271,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Enable message preview</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Povolit náhled zprávy</translation>
     </message>
     <message>
         <source>&amp;Donate...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Podpořit autora...</translation>
     </message>
 </context>
 <context>
@@ -2522,7 +2522,7 @@ Musíte restartovat manuálně.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Použít výchozí ikonu z tématu</translation>
     </message>
 </context>
 <context>
@@ -2668,11 +2668,11 @@ Musíte restartovat manuálně.</translation>
     </message>
     <message>
         <source>&amp;Export to file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportovat do souboru</translation>
     </message>
     <message>
         <source>&amp;Import from file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Importovat ze souboru</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard_lt.ts b/localization/rssguard_lt.ts
index d1a8c9eec..b59e9c01c 100644
--- a/localization/rssguard_lt.ts
+++ b/localization/rssguard_lt.ts
@@ -1867,7 +1867,7 @@ arba šis funkcionalumas dar nėra įgyvendintas.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Naudoti numatytąją piktogramą iš piktogramų temos</translation>
     </message>
 </context>
 <context>
@@ -2275,7 +2275,7 @@ arba šis funkcionalumas dar nėra įgyvendintas.</translation>
     </message>
     <message>
         <source>&amp;Donate...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Paaukoti...</translation>
     </message>
 </context>
 <context>
@@ -2522,7 +2522,7 @@ Jūs turite paleisti iš naujo rankiniu būdu.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Naudoti numatytąją piktogramą iš piktogramų temos</translation>
     </message>
 </context>
 <context>
@@ -2668,11 +2668,11 @@ Jūs turite paleisti iš naujo rankiniu būdu.</translation>
     </message>
     <message>
         <source>&amp;Export to file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Eksportuoti į failą</translation>
     </message>
     <message>
         <source>&amp;Import from file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Importuoti iš failo</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard_pt.ts b/localization/rssguard_pt.ts
index 974ac0d2c..a2a5916f0 100644
--- a/localization/rssguard_pt.ts
+++ b/localization/rssguard_pt.ts
@@ -1865,7 +1865,7 @@ ou esta função ainda não foi implementada.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Usar ícone padrão do tema de ícones</translation>
     </message>
 </context>
 <context>
@@ -2273,7 +2273,7 @@ ou esta função ainda não foi implementada.</translation>
     </message>
     <message>
         <source>&amp;Donate...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Doar...</translation>
     </message>
 </context>
 <context>
@@ -2520,7 +2520,7 @@ Você precisa reiniciar manualmente.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Usar ícone padrão do tema de ícones</translation>
     </message>
 </context>
 <context>
@@ -2666,11 +2666,11 @@ Você precisa reiniciar manualmente.</translation>
     </message>
     <message>
         <source>&amp;Export to file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportar para arquivo</translation>
     </message>
     <message>
         <source>&amp;Import from file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Importar do arquivo</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard_sv.ts b/localization/rssguard_sv.ts
index 7cdd8d614..686566ee5 100644
--- a/localization/rssguard_sv.ts
+++ b/localization/rssguard_sv.ts
@@ -3,11 +3,11 @@
     <name>AccountCheckModel</name>
     <message>
         <source> (category)</source>
-        <translation>(kategori)</translation>
+        <translation> (kategori)</translation>
     </message>
     <message>
         <source> (feed)</source>
-        <translation>(flöde)</translation>
+        <translation> (flöde)</translation>
     </message>
 </context>
 <context>
@@ -30,7 +30,7 @@
     </message>
     <message>
         <source>URL</source>
-        <translation>URL </translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Absolute URL to online subscription file</source>
@@ -68,7 +68,7 @@
     </message>
     <message>
         <source>Add subscription</source>
-        <translation>Lägg till prenumeration </translation>
+        <translation>Lägg till prenumeration</translation>
     </message>
     <message>
         <source>Remove subscription</source>
@@ -95,7 +95,7 @@
     </message>
     <message>
         <source>AdBlock blocked unwanted popup window.</source>
-        <translation> AdBlock blockerade oönskat popup-fönster.</translation>
+        <translation>AdBlock blockerade oönskat popup-fönster.</translation>
     </message>
     <message>
         <source>Show AdBlock &amp;settings</source>
@@ -132,11 +132,11 @@
     <name>AdBlockTreeWidget</name>
     <message>
         <source>Add rule</source>
-        <translation>Lägg till regel </translation>
+        <translation>Lägg till regel</translation>
     </message>
     <message>
         <source>Remove rule</source>
-        <translation>Ta bort regel </translation>
+        <translation>Ta bort regel</translation>
     </message>
     <message>
         <source>Add custom rule</source>
@@ -159,11 +159,11 @@
     <name>Application</name>
     <message>
         <source>Application is already running.</source>
-        <translation>Programmet är redan startat</translation>
+        <translation>Programmet är redan startat.</translation>
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation>Utdatamappen är inte skrivbar</translation>
+        <translation>Utdatamappen är inte skrivbar.</translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
@@ -505,7 +505,7 @@ Status: %2</translation>
     <name>FeedsImportExportModel</name>
     <message>
         <source>Category </source>
-        <translation>Kategori</translation>
+        <translation>Kategori </translation>
     </message>
 </context>
 <context>
@@ -1108,7 +1108,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source> message(s)</source>
-        <translation>meddelande(n)</translation>
+        <translation> meddelande(n)</translation>
     </message>
     <message>
         <source>&amp;Login</source>
@@ -1132,11 +1132,11 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>No username entered.   </source>
-        <translation>Inget användarnamn angivet</translation>
+        <translation>Inget användarnamn angivet.   </translation>
     </message>
     <message>
         <source>Some username entered.   </source>
-        <translation>Användarnamn angivet</translation>
+        <translation>Användarnamn angivet.   </translation>
     </message>
     <message>
         <source>You did not grant access.</source>
@@ -1148,7 +1148,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>There is error. %1 </source>
-        <translation>Det finns fel. %1</translation>
+        <translation>Det finns fel. %1 </translation>
     </message>
     <message>
         <source>Tested successfully.You may be prompted to login once more.</source>
@@ -1207,7 +1207,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>These settings DO NOT have to be changed from their default values. Change these values only of you are advanced user and you know what you are doing!</source>
-        <translation>Dessa inställningar behöver INTE ändras från standardvärdena. Ändra dessa värden endast om du är avancerad användare och vet vad du gör.</translation>
+        <translation>Dessa inställningar behöver INTE ändras från standardvärdena. Ändra dessa värden endast om du är avancerad användare och vet vad du gör!</translation>
     </message>
     <message>
         <source>Only download newest X messages per feed</source>
@@ -1215,7 +1215,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source> message(s)</source>
-        <translation>meddelande(n)</translation>
+        <translation> meddelande(n)</translation>
     </message>
     <message>
         <source>&amp;Login</source>
@@ -1346,7 +1346,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation>Redigera befintligt </translation>
+        <translation>Redigera befintligt ownCloud News-konto</translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
@@ -1354,7 +1354,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation>Den valda ownCloud News-servern kör en version som inte stöds. </translation>
+        <translation>Den valda ownCloud News-servern kör en version som inte stöds.</translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
@@ -1414,7 +1414,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source> = unlimited</source>
-        <translation>= obegränsat</translation>
+        <translation> = obegränsat</translation>
     </message>
     <message>
         <source>Limiting number of downloaded messages per feed makes updating of feeds faster but if your feed contains bigger number of messages than specified limit, then some messages might not be downloaded during feed update.</source>
@@ -1433,7 +1433,7 @@ att funktionen inte är implementerad än.</translation>
     <name>FormEditTtRssAccount</name>
     <message>
         <source>URL</source>
-        <translation>URL </translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1493,7 +1493,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>URL of your TT-RSS instance WITHOUT trailing &quot;/api/&quot; string</source>
-        <translation>URL för din TT-RSS-instans UTAN vidhängande &quot;/api/-sträng&quot;.</translation>
+        <translation>URL för din TT-RSS-instans UTAN vidhängande API-sträng</translation>
     </message>
     <message>
         <source>No test done yet.</source>
@@ -1509,7 +1509,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation>Redigera befintligt </translation>
+        <translation>Redigera befintligt Tiny Tiny RSS-konto</translation>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
@@ -1569,7 +1569,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation>Användarnamnet är ok, eller behövs inte. </translation>
+        <translation>Användarnamnet är OK, eller behövs inte.</translation>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -1577,7 +1577,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation>Lösenordet är ok, eller behövs inte. </translation>
+        <translation>Lösenordet är OK, eller behövs inte.</translation>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -1624,7 +1624,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation>Autouppdatering </translation>
+        <translation>Autouppdatering</translation>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
@@ -1640,7 +1640,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>URL</source>
-        <translation>URL </translation>
+        <translation>URL</translation>
     </message>
     <message>
         <source>Fetch it now</source>
@@ -1664,11 +1664,11 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Username</source>
-        <translation>Användarnamn </translation>
+        <translation>Användarnamn</translation>
     </message>
     <message>
         <source>Password</source>
-        <translation>Lösenord </translation>
+        <translation>Lösenord</translation>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -1712,19 +1712,19 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation>Användarnamnet är ok, eller behövs inte. </translation>
+        <translation>Användarnamnet är ok, eller behövs inte.</translation>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation>Användarnamn saknas. </translation>
+        <translation>Användarnamn saknas.</translation>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation>Lösenordet är ok, eller behövs inte. </translation>
+        <translation>Lösenordet är ok, eller behövs inte.</translation>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation>Lösenord saknas. </translation>
+        <translation>Lösenord saknas.</translation>
     </message>
     <message>
         <source>Select icon file for the feed</source>
@@ -1865,7 +1865,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Använd standardikon från ikontemat</translation>
     </message>
 </context>
 <context>
@@ -2112,7 +2112,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation>Tar bort alla meddelanden från alla objekt</translation>
+        <translation>Tar bort smtliga meddelanden från alla objekt.</translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
@@ -2216,7 +2216,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>New web browser tab</source>
-        <translation>Ny webbläsarflik.</translation>
+        <translation>Ny webbläsarflik</translation>
     </message>
     <message>
         <source>Close all tabs</source>
@@ -2273,7 +2273,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>&amp;Donate...</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Donera...</translation>
     </message>
 </context>
 <context>
@@ -2288,7 +2288,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation>Kan inte lägga till flödet </translation>
+        <translation>Kan inte lägga till flöde</translation>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
@@ -2520,7 +2520,7 @@ Du måste starta om manuellt.</translation>
     </message>
     <message>
         <source>Use default icon from icon theme</source>
-        <translation type="unfinished"/>
+        <translation>Använd standardikon från ikontemat</translation>
     </message>
 </context>
 <context>
@@ -2638,7 +2638,7 @@ Du måste starta om manuellt.</translation>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation>Kan inte skriva till målfilen: %1</translation>
+        <translation>Kan inte skriva till målfilen: %1.</translation>
     </message>
     <message>
         <source>Root node</source>
@@ -2666,11 +2666,11 @@ Du måste starta om manuellt.</translation>
     </message>
     <message>
         <source>&amp;Export to file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Exportera till fil</translation>
     </message>
     <message>
         <source>&amp;Import from file</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Importera från fil</translation>
     </message>
 </context>
 <context>
@@ -2685,7 +2685,7 @@ Du måste starta om manuellt.</translation>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation>Kan inte lägga till flödet </translation>
+        <translation>Kan inte lägga till flöde</translation>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
@@ -2838,7 +2838,7 @@ Du måste installera det manuellt.</translation>
     </message>
     <message>
         <source> (size </source>
-        <translation>(storlek</translation>
+        <translation> (storlek </translation>
     </message>
     <message>
         <source>Available update files</source>
@@ -2946,7 +2946,7 @@ Inloggningstoken upphör: %2</translation>
     </message>
     <message>
         <source>Inoreader: authentication error</source>
-        <translation>Inoreader: Autentiseringsfel </translation>
+        <translation>Inoreader: Autentiseringsfel</translation>
     </message>
     <message>
         <source>Click this to login again. Error is: &apos;%1&apos;</source>
@@ -3020,7 +3020,7 @@ Inloggningstoken upphör: %2</translation>
     </message>
     <message>
         <source>Selected hyperlink is invalid.</source>
-        <translation>Den valda länken är ogiltig</translation>
+        <translation>Den valda hyperlänken är ogiltig.</translation>
     </message>
     <message>
         <source>Mark message as read</source>
@@ -3163,7 +3163,7 @@ Inloggningstoken upphör: %2</translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation>Konto-ID för meddelandet</translation>
+        <translation>Konto-ID för meddelandet.</translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
@@ -3440,7 +3440,9 @@ Inloggningstoken upphör: %2</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation><numerusform>+ %n annat flöde.</numerusform><numerusform>
+        <translation><numerusform>
+
++ %n annat flöde.</numerusform><numerusform>
 
 + %n andra flöden.</numerusform></translation>
     </message>
@@ -3504,7 +3506,7 @@ Minst API-nivå %1 krävs.</translation>
     </message>
     <message>
         <source>This is integration of Inoreader.</source>
-        <translation>Detta är integrering av Inoreader</translation>
+        <translation>Detta är integrering av Inoreader.</translation>
     </message>
     <message>
         <source>Simple Gmail integration via JSON API. Allows sending e-mails too.</source>
@@ -3641,7 +3643,7 @@ Minst API-nivå %1 krävs.</translation>
  • %2 - body of selected message.</source>
         <translation>Platshållare:
  • %1 - titel för aktuellt meddelande
- • %2 - brödtext för </translation>
+ • %2 - brödtext för.</translation>
     </message>
     <message>
         <source>Proxy</source>
@@ -4285,7 +4287,7 @@ Denna kategori innehåller inga objekt.</translation>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation>Metadata hämtades inte på grund av: %1</translation>
+        <translation>Metadata hämtades inte på grund av: %1.</translation>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -4315,7 +4317,8 @@ Uppdateringsstatus: %5</translation>
 Network status: %1
 Encoding: %2
 Type: %3</source>
-        <translation>Nätverksstatus: %1
+        <translation>
+Nätverksstatus: %1
 Kodning: %2
 Typ: %3</translation>
     </message>
@@ -4422,7 +4425,7 @@ Konto-ID: %1</translation>
     </message>
     <message>
         <source> bytes</source>
-        <translation>byte</translation>
+        <translation> byte</translation>
     </message>
 </context>
 <context>
@@ -4488,7 +4491,7 @@ Olästa nyheter: %2</translation>
     </message>
     <message>
         <source> and </source>
-        <translation>och</translation>
+        <translation> och </translation>
     </message>
 </context>
 <context>
diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 8a8a34722..e2ccf00e8 100755
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.5.8" date="2019-05-31"/>
+    <release version="3.5.8" date="2019-06-03"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/rssguard.pro b/rssguard.pro
index 98990251a..21a897c79 100755
--- a/rssguard.pro
+++ b/rssguard.pro
@@ -51,7 +51,7 @@ APP_REVERSE_NAME              = "com.github.rssguard"
 APP_LOW_H_NAME                = ".rssguard"
 APP_AUTHOR                    = "Martin Rotter"
 APP_COPYRIGHT                 = "(C) 2011-2019 $$APP_AUTHOR"
-APP_VERSION                   = "3.5.8"
+APP_VERSION                   = "3.5.9"
 APP_LONG_NAME                 = "$$APP_NAME $$APP_VERSION"
 APP_EMAIL                     = "rotter.martinos@gmail.com"
 APP_URL                       = "https://github.com/martinrotter/rssguard"
@@ -223,379 +223,381 @@ RESOURCES += resources/sql.qrc \
              resources/rssguard.qrc \
              resources/icons.qrc
 
-HEADERS +=  src/core/feeddownloader.h \
-            src/core/feedsmodel.h \
-            src/core/feedsproxymodel.h \
-            src/core/message.h \
-            src/core/messagesmodel.h \
-            src/core/messagesmodelcache.h \
-            src/core/messagesmodelsqllayer.h \
-            src/core/messagesproxymodel.h \
-            src/definitions/definitions.h \
-            src/dynamic-shortcuts/dynamicshortcuts.h \
-            src/dynamic-shortcuts/dynamicshortcutswidget.h \
-            src/dynamic-shortcuts/shortcutbutton.h \
-            src/dynamic-shortcuts/shortcutcatcher.h \
-            src/exceptions/applicationexception.h \
-            src/exceptions/ioexception.h \
-            src/gui/baselineedit.h \
-            src/gui/basetoolbar.h \
-            src/gui/colorlabel.h \
-            src/gui/comboboxwithstatus.h \
-            src/gui/dialogs/formabout.h \
-            src/gui/dialogs/formaddaccount.h \
-            src/gui/dialogs/formbackupdatabasesettings.h \
-            src/gui/dialogs/formdatabasecleanup.h \
-            src/gui/dialogs/formmain.h \
-            src/gui/dialogs/formrestoredatabasesettings.h \
-            src/gui/dialogs/formsettings.h \
-            src/gui/dialogs/formupdate.h \
-            src/gui/edittableview.h \
-            src/gui/feedmessageviewer.h \
-            src/gui/feedstoolbar.h \
-            src/gui/feedsview.h \
-            src/gui/guiutilities.h \
-            src/gui/labelwithstatus.h \
-            src/gui/lineeditwithstatus.h \
-            src/gui/messagebox.h \
-            src/gui/messagessearchlineedit.h \
-            src/gui/messagestoolbar.h \
-            src/gui/messagesview.h \
-            src/gui/plaintoolbutton.h \
-            src/gui/settings/settingsbrowsermail.h \
-            src/gui/settings/settingsdatabase.h \
-            src/gui/settings/settingsdownloads.h \
-            src/gui/settings/settingsfeedsmessages.h \
-            src/gui/settings/settingsgeneral.h \
-            src/gui/settings/settingsgui.h \
-            src/gui/settings/settingslocalization.h \
-            src/gui/settings/settingspanel.h \
-            src/gui/settings/settingsshortcuts.h \
-            src/gui/squeezelabel.h \
-            src/gui/statusbar.h \
-            src/gui/styleditemdelegatewithoutfocus.h \
-            src/gui/systemtrayicon.h \
-            src/gui/tabbar.h \
-            src/gui/tabcontent.h \
-            src/gui/tabwidget.h \
-            src/gui/timespinbox.h \
-            src/gui/toolbareditor.h \
-            src/gui/treeviewcolumnsmenu.h \
-            src/gui/widgetwithstatus.h \
-            src/miscellaneous/application.h \
-            src/miscellaneous/autosaver.h \
-            src/miscellaneous/databasecleaner.h \
-            src/miscellaneous/databasefactory.h \
-            src/miscellaneous/databasequeries.h \
-            src/miscellaneous/debugging.h \
-            src/miscellaneous/externaltool.h \
-            src/miscellaneous/feedreader.h \
-            src/miscellaneous/iconfactory.h \
-            src/miscellaneous/iofactory.h \
-            src/miscellaneous/localization.h \
-            src/miscellaneous/mutex.h \
-            src/miscellaneous/settings.h \
-            src/miscellaneous/settingsproperties.h \
-            src/miscellaneous/simplecrypt/simplecrypt.h \
-            src/miscellaneous/skinfactory.h \
-            src/miscellaneous/systemfactory.h \
-            src/miscellaneous/textfactory.h \
-            src/network-web/basenetworkaccessmanager.h \
-            src/network-web/downloader.h \
-            src/network-web/downloadmanager.h \
-            src/network-web/networkfactory.h \
-            src/network-web/oauth2service.h \
-            src/network-web/silentnetworkaccessmanager.h \
-            src/network-web/webfactory.h \
-            src/qtsingleapplication/qtlocalpeer.h \
-            src/qtsingleapplication/qtlockedfile.h \
-            src/qtsingleapplication/qtsingleapplication.h \
-            src/qtsingleapplication/qtsinglecoreapplication.h \
-            src/services/abstract/accountcheckmodel.h \
-            src/services/abstract/cacheforserviceroot.h \
-            src/services/abstract/category.h \
-            src/services/abstract/feed.h \
-            src/services/abstract/gui/formfeeddetails.h \
-            src/services/abstract/recyclebin.h \
-            src/services/abstract/rootitem.h \
-            src/services/abstract/serviceentrypoint.h \
-            src/services/abstract/serviceroot.h \
-            src/services/gmail/definitions.h \
-            src/services/gmail/gmailentrypoint.h \
-            src/services/gmail/gmailfeed.h \
-            src/services/gmail/gmailserviceroot.h \
-            src/services/gmail/gui/formeditgmailaccount.h \
-            src/services/gmail/network/gmailnetworkfactory.h \
-            src/services/inoreader/definitions.h \
-            src/services/inoreader/gui/formeditinoreaderaccount.h \
-            src/services/inoreader/inoreaderentrypoint.h \
-            src/services/inoreader/inoreaderfeed.h \
-            src/services/inoreader/inoreaderserviceroot.h \
-            src/services/inoreader/network/inoreadernetworkfactory.h \
-            src/services/owncloud/definitions.h \
-            src/services/owncloud/gui/formeditowncloudaccount.h \
-            src/services/owncloud/gui/formowncloudfeeddetails.h \
-            src/services/owncloud/network/owncloudnetworkfactory.h \
-            src/services/owncloud/owncloudfeed.h \
-            src/services/owncloud/owncloudserviceentrypoint.h \
-            src/services/owncloud/owncloudserviceroot.h \
-            src/services/standard/atomparser.h \
-            src/services/standard/feedparser.h \
-            src/services/standard/gui/formstandardcategorydetails.h \
-            src/services/standard/gui/formstandardfeeddetails.h \
-            src/services/standard/gui/formstandardimportexport.h \
-            src/services/standard/rdfparser.h \
-            src/services/standard/rssparser.h \
-            src/services/standard/standardcategory.h \
-            src/services/standard/standardfeed.h \
-            src/services/standard/standardfeedsimportexportmodel.h \
-            src/services/standard/standardserviceentrypoint.h \
-            src/services/standard/standardserviceroot.h \
-            src/services/tt-rss/definitions.h \
-            src/services/tt-rss/gui/formeditttrssaccount.h \
-            src/services/tt-rss/gui/formttrssfeeddetails.h \
-            src/services/tt-rss/network/ttrssnetworkfactory.h \
-            src/services/tt-rss/ttrssfeed.h \
-            src/services/tt-rss/ttrssserviceentrypoint.h \
-            src/services/tt-rss/ttrssserviceroot.h \
-            src/network-web/httpresponse.h \
-            src/services/gmail/gui/formdownloadattachment.h \
-            src/services/gmail/gui/formaddeditemail.h \
-            src/gui/searchtextwidget.h
+HEADERS += src/core/feeddownloader.h \
+           src/core/feedsmodel.h \
+           src/core/feedsproxymodel.h \
+           src/core/message.h \
+           src/core/messagesmodel.h \
+           src/core/messagesmodelcache.h \
+           src/core/messagesmodelsqllayer.h \
+           src/core/messagesproxymodel.h \
+           src/definitions/definitions.h \
+           src/dynamic-shortcuts/dynamicshortcuts.h \
+           src/dynamic-shortcuts/dynamicshortcutswidget.h \
+           src/dynamic-shortcuts/shortcutbutton.h \
+           src/dynamic-shortcuts/shortcutcatcher.h \
+           src/exceptions/applicationexception.h \
+           src/exceptions/ioexception.h \
+           src/gui/baselineedit.h \
+           src/gui/basetoolbar.h \
+           src/gui/colorlabel.h \
+           src/gui/comboboxwithstatus.h \
+           src/gui/dialogs/formabout.h \
+           src/gui/dialogs/formaddaccount.h \
+           src/gui/dialogs/formbackupdatabasesettings.h \
+           src/gui/dialogs/formdatabasecleanup.h \
+           src/gui/dialogs/formmain.h \
+           src/gui/dialogs/formrestoredatabasesettings.h \
+           src/gui/dialogs/formsettings.h \
+           src/gui/dialogs/formupdate.h \
+           src/gui/edittableview.h \
+           src/gui/feedmessageviewer.h \
+           src/gui/feedstoolbar.h \
+           src/gui/feedsview.h \
+           src/gui/guiutilities.h \
+           src/gui/labelwithstatus.h \
+           src/gui/lineeditwithstatus.h \
+           src/gui/messagebox.h \
+           src/gui/messagessearchlineedit.h \
+           src/gui/messagestoolbar.h \
+           src/gui/messagesview.h \
+           src/gui/plaintoolbutton.h \
+           src/gui/settings/settingsbrowsermail.h \
+           src/gui/settings/settingsdatabase.h \
+           src/gui/settings/settingsdownloads.h \
+           src/gui/settings/settingsfeedsmessages.h \
+           src/gui/settings/settingsgeneral.h \
+           src/gui/settings/settingsgui.h \
+           src/gui/settings/settingslocalization.h \
+           src/gui/settings/settingspanel.h \
+           src/gui/settings/settingsshortcuts.h \
+           src/gui/squeezelabel.h \
+           src/gui/statusbar.h \
+           src/gui/styleditemdelegatewithoutfocus.h \
+           src/gui/systemtrayicon.h \
+           src/gui/tabbar.h \
+           src/gui/tabcontent.h \
+           src/gui/tabwidget.h \
+           src/gui/timespinbox.h \
+           src/gui/toolbareditor.h \
+           src/gui/treeviewcolumnsmenu.h \
+           src/gui/widgetwithstatus.h \
+           src/miscellaneous/application.h \
+           src/miscellaneous/autosaver.h \
+           src/miscellaneous/databasecleaner.h \
+           src/miscellaneous/databasefactory.h \
+           src/miscellaneous/databasequeries.h \
+           src/miscellaneous/debugging.h \
+           src/miscellaneous/externaltool.h \
+           src/miscellaneous/feedreader.h \
+           src/miscellaneous/iconfactory.h \
+           src/miscellaneous/iofactory.h \
+           src/miscellaneous/localization.h \
+           src/miscellaneous/mutex.h \
+           src/miscellaneous/regexfactory.h \
+           src/miscellaneous/settings.h \
+           src/miscellaneous/settingsproperties.h \
+           src/miscellaneous/simplecrypt/simplecrypt.h \
+           src/miscellaneous/skinfactory.h \
+           src/miscellaneous/systemfactory.h \
+           src/miscellaneous/textfactory.h \
+           src/network-web/basenetworkaccessmanager.h \
+           src/network-web/downloader.h \
+           src/network-web/downloadmanager.h \
+           src/network-web/networkfactory.h \
+           src/network-web/oauth2service.h \
+           src/network-web/silentnetworkaccessmanager.h \
+           src/network-web/webfactory.h \
+           src/qtsingleapplication/qtlocalpeer.h \
+           src/qtsingleapplication/qtlockedfile.h \
+           src/qtsingleapplication/qtsingleapplication.h \
+           src/qtsingleapplication/qtsinglecoreapplication.h \
+           src/services/abstract/accountcheckmodel.h \
+           src/services/abstract/cacheforserviceroot.h \
+           src/services/abstract/category.h \
+           src/services/abstract/feed.h \
+           src/services/abstract/gui/formfeeddetails.h \
+           src/services/abstract/recyclebin.h \
+           src/services/abstract/rootitem.h \
+           src/services/abstract/serviceentrypoint.h \
+           src/services/abstract/serviceroot.h \
+           src/services/gmail/definitions.h \
+           src/services/gmail/gmailentrypoint.h \
+           src/services/gmail/gmailfeed.h \
+           src/services/gmail/gmailserviceroot.h \
+           src/services/gmail/gui/formeditgmailaccount.h \
+           src/services/gmail/network/gmailnetworkfactory.h \
+           src/services/inoreader/definitions.h \
+           src/services/inoreader/gui/formeditinoreaderaccount.h \
+           src/services/inoreader/inoreaderentrypoint.h \
+           src/services/inoreader/inoreaderfeed.h \
+           src/services/inoreader/inoreaderserviceroot.h \
+           src/services/inoreader/network/inoreadernetworkfactory.h \
+           src/services/owncloud/definitions.h \
+           src/services/owncloud/gui/formeditowncloudaccount.h \
+           src/services/owncloud/gui/formowncloudfeeddetails.h \
+           src/services/owncloud/network/owncloudnetworkfactory.h \
+           src/services/owncloud/owncloudfeed.h \
+           src/services/owncloud/owncloudserviceentrypoint.h \
+           src/services/owncloud/owncloudserviceroot.h \
+           src/services/standard/atomparser.h \
+           src/services/standard/feedparser.h \
+           src/services/standard/gui/formstandardcategorydetails.h \
+           src/services/standard/gui/formstandardfeeddetails.h \
+           src/services/standard/gui/formstandardimportexport.h \
+           src/services/standard/rdfparser.h \
+           src/services/standard/rssparser.h \
+           src/services/standard/standardcategory.h \
+           src/services/standard/standardfeed.h \
+           src/services/standard/standardfeedsimportexportmodel.h \
+           src/services/standard/standardserviceentrypoint.h \
+           src/services/standard/standardserviceroot.h \
+           src/services/tt-rss/definitions.h \
+           src/services/tt-rss/gui/formeditttrssaccount.h \
+           src/services/tt-rss/gui/formttrssfeeddetails.h \
+           src/services/tt-rss/network/ttrssnetworkfactory.h \
+           src/services/tt-rss/ttrssfeed.h \
+           src/services/tt-rss/ttrssserviceentrypoint.h \
+           src/services/tt-rss/ttrssserviceroot.h \
+           src/network-web/httpresponse.h \
+           src/services/gmail/gui/formdownloadattachment.h \
+           src/services/gmail/gui/formaddeditemail.h \
+           src/gui/searchtextwidget.h
 
-SOURCES +=  src/core/feeddownloader.cpp \
-            src/core/feedsmodel.cpp \
-            src/core/feedsproxymodel.cpp \
-            src/core/message.cpp \
-            src/core/messagesmodel.cpp \
-            src/core/messagesmodelcache.cpp \
-            src/core/messagesmodelsqllayer.cpp \
-            src/core/messagesproxymodel.cpp \
-            src/dynamic-shortcuts/dynamicshortcuts.cpp \
-            src/dynamic-shortcuts/dynamicshortcutswidget.cpp \
-            src/dynamic-shortcuts/shortcutbutton.cpp \
-            src/dynamic-shortcuts/shortcutcatcher.cpp \
-            src/exceptions/applicationexception.cpp \
-            src/exceptions/ioexception.cpp \
-            src/gui/baselineedit.cpp \
-            src/gui/basetoolbar.cpp \
-            src/gui/colorlabel.cpp \
-            src/gui/comboboxwithstatus.cpp \
-            src/gui/dialogs/formabout.cpp \
-            src/gui/dialogs/formaddaccount.cpp \
-            src/gui/dialogs/formbackupdatabasesettings.cpp \
-            src/gui/dialogs/formdatabasecleanup.cpp \
-            src/gui/dialogs/formmain.cpp \
-            src/gui/dialogs/formrestoredatabasesettings.cpp \
-            src/gui/dialogs/formsettings.cpp \
-            src/gui/dialogs/formupdate.cpp \
-            src/gui/edittableview.cpp \
-            src/gui/feedmessageviewer.cpp \
-            src/gui/feedstoolbar.cpp \
-            src/gui/feedsview.cpp \
-            src/gui/guiutilities.cpp \
-            src/gui/labelwithstatus.cpp \
-            src/gui/lineeditwithstatus.cpp \
-            src/gui/messagebox.cpp \
-            src/gui/messagessearchlineedit.cpp \
-            src/gui/messagestoolbar.cpp \
-            src/gui/messagesview.cpp \
-            src/gui/plaintoolbutton.cpp \
-            src/gui/settings/settingsbrowsermail.cpp \
-            src/gui/settings/settingsdatabase.cpp \
-            src/gui/settings/settingsdownloads.cpp \
-            src/gui/settings/settingsfeedsmessages.cpp \
-            src/gui/settings/settingsgeneral.cpp \
-            src/gui/settings/settingsgui.cpp \
-            src/gui/settings/settingslocalization.cpp \
-            src/gui/settings/settingspanel.cpp \
-            src/gui/settings/settingsshortcuts.cpp \
-            src/gui/squeezelabel.cpp \
-            src/gui/statusbar.cpp \
-            src/gui/styleditemdelegatewithoutfocus.cpp \
-            src/gui/systemtrayicon.cpp \
-            src/gui/tabbar.cpp \
-            src/gui/tabcontent.cpp \
-            src/gui/tabwidget.cpp \
-            src/gui/timespinbox.cpp \
-            src/gui/toolbareditor.cpp \
-            src/gui/treeviewcolumnsmenu.cpp \
-            src/gui/widgetwithstatus.cpp \
-            src/main.cpp \
-            src/miscellaneous/application.cpp \
-            src/miscellaneous/autosaver.cpp \
-            src/miscellaneous/databasecleaner.cpp \
-            src/miscellaneous/databasefactory.cpp \
-            src/miscellaneous/databasequeries.cpp \
-            src/miscellaneous/debugging.cpp \
-            src/miscellaneous/externaltool.cpp \
-            src/miscellaneous/feedreader.cpp \
-            src/miscellaneous/iconfactory.cpp \
-            src/miscellaneous/iofactory.cpp \
-            src/miscellaneous/localization.cpp \
-            src/miscellaneous/mutex.cpp \
-            src/miscellaneous/settings.cpp \
-            src/miscellaneous/simplecrypt/simplecrypt.cpp \
-            src/miscellaneous/skinfactory.cpp \
-            src/miscellaneous/systemfactory.cpp \
-            src/miscellaneous/textfactory.cpp \
-            src/network-web/basenetworkaccessmanager.cpp \
-            src/network-web/downloader.cpp \
-            src/network-web/downloadmanager.cpp \
-            src/network-web/networkfactory.cpp \
-            src/network-web/oauth2service.cpp \
-            src/network-web/silentnetworkaccessmanager.cpp \
-            src/network-web/webfactory.cpp \
-            src/qtsingleapplication/qtlocalpeer.cpp \
-            src/qtsingleapplication/qtlockedfile.cpp \
-            src/qtsingleapplication/qtsingleapplication.cpp \
-            src/qtsingleapplication/qtsinglecoreapplication.cpp \
-            src/services/abstract/accountcheckmodel.cpp \
-            src/services/abstract/cacheforserviceroot.cpp \
-            src/services/abstract/category.cpp \
-            src/services/abstract/feed.cpp \
-            src/services/abstract/gui/formfeeddetails.cpp \
-            src/services/abstract/recyclebin.cpp \
-            src/services/abstract/rootitem.cpp \
-            src/services/abstract/serviceentrypoint.cpp \
-            src/services/abstract/serviceroot.cpp \
-            src/services/gmail/gmailentrypoint.cpp \
-            src/services/gmail/gmailfeed.cpp \
-            src/services/gmail/gmailserviceroot.cpp \
-            src/services/gmail/gui/formeditgmailaccount.cpp \
-            src/services/gmail/network/gmailnetworkfactory.cpp \
-            src/services/inoreader/gui/formeditinoreaderaccount.cpp \
-            src/services/inoreader/inoreaderentrypoint.cpp \
-            src/services/inoreader/inoreaderfeed.cpp \
-            src/services/inoreader/inoreaderserviceroot.cpp \
-            src/services/inoreader/network/inoreadernetworkfactory.cpp \
-            src/services/owncloud/gui/formeditowncloudaccount.cpp \
-            src/services/owncloud/gui/formowncloudfeeddetails.cpp \
-            src/services/owncloud/network/owncloudnetworkfactory.cpp \
-            src/services/owncloud/owncloudfeed.cpp \
-            src/services/owncloud/owncloudserviceentrypoint.cpp \
-            src/services/owncloud/owncloudserviceroot.cpp \
-            src/services/standard/atomparser.cpp \
-            src/services/standard/feedparser.cpp \
-            src/services/standard/gui/formstandardcategorydetails.cpp \
-            src/services/standard/gui/formstandardfeeddetails.cpp \
-            src/services/standard/gui/formstandardimportexport.cpp \
-            src/services/standard/rdfparser.cpp \
-            src/services/standard/rssparser.cpp \
-            src/services/standard/standardcategory.cpp \
-            src/services/standard/standardfeed.cpp \
-            src/services/standard/standardfeedsimportexportmodel.cpp \
-            src/services/standard/standardserviceentrypoint.cpp \
-            src/services/standard/standardserviceroot.cpp \
-            src/services/tt-rss/gui/formeditttrssaccount.cpp \
-            src/services/tt-rss/gui/formttrssfeeddetails.cpp \
-            src/services/tt-rss/network/ttrssnetworkfactory.cpp \
-            src/services/tt-rss/ttrssfeed.cpp \
-            src/services/tt-rss/ttrssserviceentrypoint.cpp \
-            src/services/tt-rss/ttrssserviceroot.cpp \
-            src/network-web/httpresponse.cpp \
-            src/services/gmail/gui/formdownloadattachment.cpp \
-            src/services/gmail/gui/formaddeditemail.cpp \
-            src/gui/searchtextwidget.cpp
+SOURCES += src/core/feeddownloader.cpp \
+           src/core/feedsmodel.cpp \
+           src/core/feedsproxymodel.cpp \
+           src/core/message.cpp \
+           src/core/messagesmodel.cpp \
+           src/core/messagesmodelcache.cpp \
+           src/core/messagesmodelsqllayer.cpp \
+           src/core/messagesproxymodel.cpp \
+           src/dynamic-shortcuts/dynamicshortcuts.cpp \
+           src/dynamic-shortcuts/dynamicshortcutswidget.cpp \
+           src/dynamic-shortcuts/shortcutbutton.cpp \
+           src/dynamic-shortcuts/shortcutcatcher.cpp \
+           src/exceptions/applicationexception.cpp \
+           src/exceptions/ioexception.cpp \
+           src/gui/baselineedit.cpp \
+           src/gui/basetoolbar.cpp \
+           src/gui/colorlabel.cpp \
+           src/gui/comboboxwithstatus.cpp \
+           src/gui/dialogs/formabout.cpp \
+           src/gui/dialogs/formaddaccount.cpp \
+           src/gui/dialogs/formbackupdatabasesettings.cpp \
+           src/gui/dialogs/formdatabasecleanup.cpp \
+           src/gui/dialogs/formmain.cpp \
+           src/gui/dialogs/formrestoredatabasesettings.cpp \
+           src/gui/dialogs/formsettings.cpp \
+           src/gui/dialogs/formupdate.cpp \
+           src/gui/edittableview.cpp \
+           src/gui/feedmessageviewer.cpp \
+           src/gui/feedstoolbar.cpp \
+           src/gui/feedsview.cpp \
+           src/gui/guiutilities.cpp \
+           src/gui/labelwithstatus.cpp \
+           src/gui/lineeditwithstatus.cpp \
+           src/gui/messagebox.cpp \
+           src/gui/messagessearchlineedit.cpp \
+           src/gui/messagestoolbar.cpp \
+           src/gui/messagesview.cpp \
+           src/gui/plaintoolbutton.cpp \
+           src/gui/settings/settingsbrowsermail.cpp \
+           src/gui/settings/settingsdatabase.cpp \
+           src/gui/settings/settingsdownloads.cpp \
+           src/gui/settings/settingsfeedsmessages.cpp \
+           src/gui/settings/settingsgeneral.cpp \
+           src/gui/settings/settingsgui.cpp \
+           src/gui/settings/settingslocalization.cpp \
+           src/gui/settings/settingspanel.cpp \
+           src/gui/settings/settingsshortcuts.cpp \
+           src/gui/squeezelabel.cpp \
+           src/gui/statusbar.cpp \
+           src/gui/styleditemdelegatewithoutfocus.cpp \
+           src/gui/systemtrayicon.cpp \
+           src/gui/tabbar.cpp \
+           src/gui/tabcontent.cpp \
+           src/gui/tabwidget.cpp \
+           src/gui/timespinbox.cpp \
+           src/gui/toolbareditor.cpp \
+           src/gui/treeviewcolumnsmenu.cpp \
+           src/gui/widgetwithstatus.cpp \
+           src/main.cpp \
+           src/miscellaneous/application.cpp \
+           src/miscellaneous/autosaver.cpp \
+           src/miscellaneous/databasecleaner.cpp \
+           src/miscellaneous/databasefactory.cpp \
+           src/miscellaneous/databasequeries.cpp \
+           src/miscellaneous/debugging.cpp \
+           src/miscellaneous/externaltool.cpp \
+           src/miscellaneous/feedreader.cpp \
+           src/miscellaneous/iconfactory.cpp \
+           src/miscellaneous/iofactory.cpp \
+           src/miscellaneous/localization.cpp \
+           src/miscellaneous/mutex.cpp \
+           src/miscellaneous/regexfactory.cpp \
+           src/miscellaneous/settings.cpp \
+           src/miscellaneous/simplecrypt/simplecrypt.cpp \
+           src/miscellaneous/skinfactory.cpp \
+           src/miscellaneous/systemfactory.cpp \
+           src/miscellaneous/textfactory.cpp \
+           src/network-web/basenetworkaccessmanager.cpp \
+           src/network-web/downloader.cpp \
+           src/network-web/downloadmanager.cpp \
+           src/network-web/networkfactory.cpp \
+           src/network-web/oauth2service.cpp \
+           src/network-web/silentnetworkaccessmanager.cpp \
+           src/network-web/webfactory.cpp \
+           src/qtsingleapplication/qtlocalpeer.cpp \
+           src/qtsingleapplication/qtlockedfile.cpp \
+           src/qtsingleapplication/qtsingleapplication.cpp \
+           src/qtsingleapplication/qtsinglecoreapplication.cpp \
+           src/services/abstract/accountcheckmodel.cpp \
+           src/services/abstract/cacheforserviceroot.cpp \
+           src/services/abstract/category.cpp \
+           src/services/abstract/feed.cpp \
+           src/services/abstract/gui/formfeeddetails.cpp \
+           src/services/abstract/recyclebin.cpp \
+           src/services/abstract/rootitem.cpp \
+           src/services/abstract/serviceentrypoint.cpp \
+           src/services/abstract/serviceroot.cpp \
+           src/services/gmail/gmailentrypoint.cpp \
+           src/services/gmail/gmailfeed.cpp \
+           src/services/gmail/gmailserviceroot.cpp \
+           src/services/gmail/gui/formeditgmailaccount.cpp \
+           src/services/gmail/network/gmailnetworkfactory.cpp \
+           src/services/inoreader/gui/formeditinoreaderaccount.cpp \
+           src/services/inoreader/inoreaderentrypoint.cpp \
+           src/services/inoreader/inoreaderfeed.cpp \
+           src/services/inoreader/inoreaderserviceroot.cpp \
+           src/services/inoreader/network/inoreadernetworkfactory.cpp \
+           src/services/owncloud/gui/formeditowncloudaccount.cpp \
+           src/services/owncloud/gui/formowncloudfeeddetails.cpp \
+           src/services/owncloud/network/owncloudnetworkfactory.cpp \
+           src/services/owncloud/owncloudfeed.cpp \
+           src/services/owncloud/owncloudserviceentrypoint.cpp \
+           src/services/owncloud/owncloudserviceroot.cpp \
+           src/services/standard/atomparser.cpp \
+           src/services/standard/feedparser.cpp \
+           src/services/standard/gui/formstandardcategorydetails.cpp \
+           src/services/standard/gui/formstandardfeeddetails.cpp \
+           src/services/standard/gui/formstandardimportexport.cpp \
+           src/services/standard/rdfparser.cpp \
+           src/services/standard/rssparser.cpp \
+           src/services/standard/standardcategory.cpp \
+           src/services/standard/standardfeed.cpp \
+           src/services/standard/standardfeedsimportexportmodel.cpp \
+           src/services/standard/standardserviceentrypoint.cpp \
+           src/services/standard/standardserviceroot.cpp \
+           src/services/tt-rss/gui/formeditttrssaccount.cpp \
+           src/services/tt-rss/gui/formttrssfeeddetails.cpp \
+           src/services/tt-rss/network/ttrssnetworkfactory.cpp \
+           src/services/tt-rss/ttrssfeed.cpp \
+           src/services/tt-rss/ttrssserviceentrypoint.cpp \
+           src/services/tt-rss/ttrssserviceroot.cpp \
+           src/network-web/httpresponse.cpp \
+           src/services/gmail/gui/formdownloadattachment.cpp \
+           src/services/gmail/gui/formaddeditemail.cpp \
+           src/gui/searchtextwidget.cpp
 
 mac {
   OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm
 }
 
-FORMS +=    src/gui/dialogs/formabout.ui \
-            src/gui/dialogs/formaddaccount.ui \
-            src/gui/dialogs/formbackupdatabasesettings.ui \
-            src/gui/dialogs/formdatabasecleanup.ui \
-            src/gui/dialogs/formmain.ui \
-            src/gui/dialogs/formrestoredatabasesettings.ui \
-            src/gui/dialogs/formsettings.ui \
-            src/gui/dialogs/formupdate.ui \
-            src/gui/settings/settingsbrowsermail.ui \
-            src/gui/settings/settingsdatabase.ui \
-            src/gui/settings/settingsdownloads.ui \
-            src/gui/settings/settingsfeedsmessages.ui \
-            src/gui/settings/settingsgeneral.ui \
-            src/gui/settings/settingsgui.ui \
-            src/gui/settings/settingslocalization.ui \
-            src/gui/settings/settingsshortcuts.ui \
-            src/gui/toolbareditor.ui \
-            src/network-web/downloaditem.ui \
-            src/network-web/downloadmanager.ui \
-            src/services/abstract/gui/formfeeddetails.ui \
-            src/services/gmail/gui/formeditgmailaccount.ui \
-            src/services/inoreader/gui/formeditinoreaderaccount.ui \
-            src/services/owncloud/gui/formeditowncloudaccount.ui \
-            src/services/standard/gui/formstandardcategorydetails.ui \
-            src/services/standard/gui/formstandardimportexport.ui \
-            src/services/tt-rss/gui/formeditttrssaccount.ui \
-            src/services/gmail/gui/formdownloadattachment.ui \
-            src/services/gmail/gui/formaddeditemail.ui \
-            src/gui/searchtextwidget.ui
+FORMS += src/gui/dialogs/formabout.ui \
+         src/gui/dialogs/formaddaccount.ui \
+         src/gui/dialogs/formbackupdatabasesettings.ui \
+         src/gui/dialogs/formdatabasecleanup.ui \
+         src/gui/dialogs/formmain.ui \
+         src/gui/dialogs/formrestoredatabasesettings.ui \
+         src/gui/dialogs/formsettings.ui \
+         src/gui/dialogs/formupdate.ui \
+         src/gui/settings/settingsbrowsermail.ui \
+         src/gui/settings/settingsdatabase.ui \
+         src/gui/settings/settingsdownloads.ui \
+         src/gui/settings/settingsfeedsmessages.ui \
+         src/gui/settings/settingsgeneral.ui \
+         src/gui/settings/settingsgui.ui \
+         src/gui/settings/settingslocalization.ui \
+         src/gui/settings/settingsshortcuts.ui \
+         src/gui/toolbareditor.ui \
+         src/network-web/downloaditem.ui \
+         src/network-web/downloadmanager.ui \
+         src/services/abstract/gui/formfeeddetails.ui \
+         src/services/gmail/gui/formeditgmailaccount.ui \
+         src/services/inoreader/gui/formeditinoreaderaccount.ui \
+         src/services/owncloud/gui/formeditowncloudaccount.ui \
+         src/services/standard/gui/formstandardcategorydetails.ui \
+         src/services/standard/gui/formstandardimportexport.ui \
+         src/services/tt-rss/gui/formeditttrssaccount.ui \
+         src/services/gmail/gui/formdownloadattachment.ui \
+         src/services/gmail/gui/formaddeditemail.ui \
+         src/gui/searchtextwidget.ui
 
 equals(USE_WEBENGINE, true) {
-  HEADERS +=    src/gui/locationlineedit.h \
-                src/gui/webviewer.h \
-                src/gui/webbrowser.h \
-                src/gui/discoverfeedsbutton.h \
-                src/network-web/googlesuggest.h \
-                src/network-web/webpage.h \
-                src/network-web/rssguardschemehandler.h \
-                src/gui/dialogs/oauthlogin.h
+  HEADERS += src/gui/locationlineedit.h \
+             src/gui/webviewer.h \
+             src/gui/webbrowser.h \
+             src/gui/discoverfeedsbutton.h \
+             src/network-web/googlesuggest.h \
+             src/network-web/webpage.h \
+             src/network-web/rssguardschemehandler.h \
+             src/gui/dialogs/oauthlogin.h
 
-  SOURCES +=    src/gui/locationlineedit.cpp \
-                src/gui/webviewer.cpp \
-                src/gui/webbrowser.cpp \
-                src/gui/discoverfeedsbutton.cpp \
-                src/network-web/googlesuggest.cpp \
-                src/network-web/webpage.cpp \
-                src/network-web/rssguardschemehandler.cpp \
-                src/gui/dialogs/oauthlogin.cpp
+  SOURCES += src/gui/locationlineedit.cpp \
+             src/gui/webviewer.cpp \
+             src/gui/webbrowser.cpp \
+             src/gui/discoverfeedsbutton.cpp \
+             src/network-web/googlesuggest.cpp \
+             src/network-web/webpage.cpp \
+             src/network-web/rssguardschemehandler.cpp \
+             src/gui/dialogs/oauthlogin.cpp
 
   # Add AdBlock sources.
-  HEADERS +=    src/network-web/adblock/adblockaddsubscriptiondialog.h \
-                src/network-web/adblock/adblockdialog.h \
-                src/network-web/adblock/adblockicon.h \
-                src/network-web/adblock/adblockmanager.h \
-                src/network-web/adblock/adblockmatcher.h \
-                src/network-web/adblock/adblockrule.h \
-                src/network-web/adblock/adblocksearchtree.h \
-                src/network-web/adblock/adblocksubscription.h \
-                src/network-web/adblock/adblocktreewidget.h \
-                src/network-web/adblock/adblockurlinterceptor.h \
-                src/network-web/urlinterceptor.h \
-                src/network-web/networkurlinterceptor.h \
-                src/gui/treewidget.h
+  HEADERS += src/network-web/adblock/adblockaddsubscriptiondialog.h \
+             src/network-web/adblock/adblockdialog.h \
+             src/network-web/adblock/adblockicon.h \
+             src/network-web/adblock/adblockmanager.h \
+             src/network-web/adblock/adblockmatcher.h \
+             src/network-web/adblock/adblockrule.h \
+             src/network-web/adblock/adblocksearchtree.h \
+             src/network-web/adblock/adblocksubscription.h \
+             src/network-web/adblock/adblocktreewidget.h \
+             src/network-web/adblock/adblockurlinterceptor.h \
+             src/network-web/urlinterceptor.h \
+             src/network-web/networkurlinterceptor.h \
+             src/gui/treewidget.h
 
-  SOURCES +=    src/network-web/adblock/adblockaddsubscriptiondialog.cpp \
-                src/network-web/adblock/adblockdialog.cpp \
-                src/network-web/adblock/adblockicon.cpp \
-                src/network-web/adblock/adblockmanager.cpp \
-                src/network-web/adblock/adblockmatcher.cpp \
-                src/network-web/adblock/adblockrule.cpp \
-                src/network-web/adblock/adblocksearchtree.cpp \
-                src/network-web/adblock/adblocksubscription.cpp \
-                src/network-web/adblock/adblocktreewidget.cpp \
-                src/network-web/adblock/adblockurlinterceptor.cpp \
-                src/network-web/networkurlinterceptor.cpp \
-                src/gui/treewidget.cpp
+  SOURCES += src/network-web/adblock/adblockaddsubscriptiondialog.cpp \
+             src/network-web/adblock/adblockdialog.cpp \
+             src/network-web/adblock/adblockicon.cpp \
+             src/network-web/adblock/adblockmanager.cpp \
+             src/network-web/adblock/adblockmatcher.cpp \
+             src/network-web/adblock/adblockrule.cpp \
+             src/network-web/adblock/adblocksearchtree.cpp \
+             src/network-web/adblock/adblocksubscription.cpp \
+             src/network-web/adblock/adblocktreewidget.cpp \
+             src/network-web/adblock/adblockurlinterceptor.cpp \
+             src/network-web/networkurlinterceptor.cpp \
+             src/gui/treewidget.cpp
 
-  FORMS +=      src/network-web/adblock/adblockaddsubscriptiondialog.ui \
-                src/network-web/adblock/adblockdialog.ui \
-                src/gui/dialogs/oauthlogin.ui
+  FORMS += src/network-web/adblock/adblockaddsubscriptiondialog.ui \
+           src/network-web/adblock/adblockdialog.ui \
+           src/gui/dialogs/oauthlogin.ui
 }
 else {
-  HEADERS +=    src/gui/messagepreviewer.h \
-                src/gui/messagetextbrowser.h \
-                src/gui/newspaperpreviewer.h \
-                src/network-web/oauthhttphandler.h
+  HEADERS += src/gui/messagepreviewer.h \
+             src/gui/messagetextbrowser.h \
+             src/gui/newspaperpreviewer.h \
+             src/network-web/oauthhttphandler.h
 
-  SOURCES +=    src/gui/messagepreviewer.cpp \
-                src/gui/messagetextbrowser.cpp \
-                src/gui/newspaperpreviewer.cpp \
-                src/network-web/oauthhttphandler.cpp
+  SOURCES += src/gui/messagepreviewer.cpp \
+             src/gui/messagetextbrowser.cpp \
+             src/gui/newspaperpreviewer.cpp \
+             src/network-web/oauthhttphandler.cpp
 
-  FORMS +=      src/gui/messagepreviewer.ui \
-                src/gui/newspaperpreviewer.ui
+  FORMS += src/gui/messagepreviewer.ui \
+           src/gui/newspaperpreviewer.ui
 }
 
 INCLUDEPATH +=  $$PWD/. \
diff --git a/src/core/feedsproxymodel.cpp b/src/core/feedsproxymodel.cpp
index 6bc27982e..a12bf6a51 100755
--- a/src/core/feedsproxymodel.cpp
+++ b/src/core/feedsproxymodel.cpp
@@ -5,6 +5,7 @@
 #include "core/feedsmodel.h"
 #include "definitions/definitions.h"
 #include "miscellaneous/application.h"
+#include "miscellaneous/regexfactory.h"
 #include "services/abstract/rootitem.h"
 
 #include <QTimer>
@@ -74,7 +75,7 @@ QModelIndexList FeedsProxyModel::match(const QModelIndex& start, int role, const
             break;
 
           case Qt::MatchWildcard:
-            if (QRegularExpression(QRegularExpression::wildcardToRegularExpression(entered_text),
+            if (QRegularExpression(RegexFactory::wildcardToRegularExpression(entered_text),
                                    QRegularExpression::PatternOption::CaseInsensitiveOption |
                                    QRegularExpression::PatternOption::UseUnicodePropertiesOption).match(item_text).hasMatch()) {
               result.append(idx);
diff --git a/src/core/messagesproxymodel.cpp b/src/core/messagesproxymodel.cpp
index 20937e69c..06154b49b 100755
--- a/src/core/messagesproxymodel.cpp
+++ b/src/core/messagesproxymodel.cpp
@@ -3,6 +3,7 @@
 #include "core/messagesproxymodel.h"
 
 #include "core/messagesmodel.h"
+#include "miscellaneous/regexfactory.h"
 
 MessagesProxyModel::MessagesProxyModel(MessagesModel* source_model, QObject* parent)
   : QSortFilterProxyModel(parent), m_sourceModel(source_model) {
@@ -122,7 +123,7 @@ QModelIndexList MessagesProxyModel::match(const QModelIndex& start, int role,
             break;
 
           case Qt::MatchWildcard:
-            if (QRegularExpression(QRegularExpression::wildcardToRegularExpression(entered_text),
+            if (QRegularExpression(RegexFactory::wildcardToRegularExpression(entered_text),
                                    QRegularExpression::PatternOption::CaseInsensitiveOption |
                                    QRegularExpression::PatternOption::UseUnicodePropertiesOption).match(item_text).hasMatch()) {
               result.append(idx);