diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 91774045..39dd0cc1 100644
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 9f5cc016..c94ef862 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Thibaut Cousin <informatique@thibaut-cousin.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -233,7 +233,7 @@ msgid "All"
 msgstr "Tout"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "Non lus"
 
@@ -252,7 +252,7 @@ msgstr "Actions..."
 msgid "Selection toggle:"
 msgstr "Sélection&nbsp;:"
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "Remarquables"
 
@@ -576,7 +576,7 @@ msgstr "Impossible de mettre à jour l'en-têtes (objet XML manquant)"
 msgid "Could not display article (missing XML object)"
 msgstr "Impossible d'afficher l'article (objet XML manquant)"
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr "Aucun flux sélectionné."
 
@@ -914,15 +914,25 @@ msgid ""
 "for small screens."
 msgstr ""
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Advanced"
 msgstr "Avancé"
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr "Étiquettes exclues"
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
@@ -930,19 +940,19 @@ msgstr ""
 "Lors de l'autodétection des étiquettes dans les articles, ces étiquettes ne "
 "sont pas utilisées (en faire une liste, séparées par des virgules)"
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr "Demander confirmation pour marquer un flux comme lu"
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr "Afficher les icônes dans la liste des flux"
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr "Utiliser les intitulés"
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
@@ -952,45 +962,45 @@ msgstr ""
 "personnalisées. Cette fonctionnalité est hautement expérimentale et pas "
 "encore ergonomique. Utilisez-là avec précaution."
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr "Format de date long"
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr "Marquer les articles comme non lus lors des mises à jour"
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr "Format de date court"
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr "Afficher des informations supplémentaires dans la liste des flux"
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr "Éliminer les étiquettes non sûres des articles"
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 "Élimine toutes les balises HTML sauf les plus courantes lors de la lecture "
 "des articles"
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr "Afficher la date et l'heure de manière plus lisible dans les en-têtes"
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr "Développer automatiquement les articles en affichage combiné"
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 msgid "Purge unread articles"
 msgstr "Purger les articles non lus"
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
@@ -1299,43 +1309,48 @@ msgstr "&nbsp;&nbsp;Créer un filtre"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;S'inscrire à ce flux"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Purger les articles"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Masquer dans la liste de «&nbsp;Mes flux&nbsp;»"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Rechercher&nbsp;:"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr "Afficher&nbsp;:"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr "Adaptatif"
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr "Tous les articles"
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "Limite&nbsp;:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "Mettre à jour"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 352addd2..8671ecee 100644
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ
diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 809c89ea..7fa7e259 100644
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.2.19\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "PO-Revision-Date: 2008-02-03 22:22::+0100\n"
 "Last-Translator: MiszterX <miszterx@miszterx.hu>\n"
 "Language-Team: HUNGARIAN <miszterx@miszterx.hu>\n"
@@ -225,7 +225,7 @@ msgid "All"
 msgstr "Mind"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -244,7 +244,7 @@ msgstr "Műveletek"
 msgid "Selection toggle:"
 msgstr "Kiválaszt:"
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "Csillagoz"
 
@@ -565,7 +565,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr ""
 
@@ -884,76 +884,86 @@ msgid ""
 "for small screens."
 msgstr ""
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
-msgid "Advanced"
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
 msgstr ""
 
 #: localized_schema.php:57
+msgid "Advanced"
+msgstr ""
+
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr "Feketelistás tagek"
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr ""
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr ""
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr ""
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr ""
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr ""
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr ""
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr ""
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr ""
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr ""
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr ""
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 msgid "Purge unread articles"
 msgstr ""
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
@@ -1217,43 +1227,48 @@ msgstr "&nbsp;&nbsp;Szűrők létrehozása"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;Feliratokzás a feedre"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Hírek törlése"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Minden feed"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Keresés"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr "Nézet"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr "Minden hír"
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "Limit:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "Frissítés"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index cb4ad108..aa8da474 100644
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ
diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index 02320b72..c69b6502 100644
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.2.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
 "MIME-Version: 1.0\n"
@@ -229,7 +229,7 @@ msgid "All"
 msgstr "Alle"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "Ulest"
 
@@ -248,7 +248,7 @@ msgstr "Handlinger..."
 msgid "Selection toggle:"
 msgstr "Utvalg:"
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "Favoritter"
 
@@ -567,7 +567,7 @@ msgstr "Kunne ikke oppdatere overskriftene (manglende XML objekt)."
 msgid "Could not display article (missing XML object)"
 msgstr "Kunne ikke vise artikkelen (manglende XML objekt)."
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr "Ingen valgt nyhetsstrøm"
 
@@ -905,15 +905,25 @@ msgstr ""
 "Dette valget skjuler kanallisten og tillater at den vises etter ønske, "
 "brukbart for små skjermer."
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Advanced"
 msgstr "Avansert"
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr "Svartelistede tagger"
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
@@ -921,19 +931,19 @@ msgstr ""
 "Når tagger blir automatisk funnet i artikler skal følgende tagger ikke bli "
 "oppdaget (komma-separert liste)"
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr "Bekreft markeringen av nyhetsstrøm som lest"
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr "Tillat ikoner i nyhetsstrømslisten"
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr "Tillat merkelapper"
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
@@ -943,43 +953,43 @@ msgstr ""
 "spørringer. Denne funksjonen er veldig eksperimentel og er på nåværende "
 "tidspunkt ikke brukervennlig. Benytt med varsomhet."
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr "Langt datoformat"
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr "Sett artikler som uleste ved oppdatering"
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr "Kort datoformat"
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr "Vis tilleggsinformasjon i nyhetsstrømslisten"
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr "Fjern utrygge tagger fra artiklene"
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Fjern alle HTML-koder utenom de mest vanlige når artikler leses."
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr "Bruk mer brukervennlige dato/tidsformater for artiklene"
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr "Utvid artikler automatisk i kombinert modus"
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 msgid "Purge unread articles"
 msgstr "Slett uleste artikler"
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr "Vis snarveier selv om leste nyhetskanaler skjules"
 
@@ -1272,42 +1282,47 @@ msgstr "&nbsp;&nbsp;Lag filter"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;Abonner på nyhetsstrømmen"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Slett artikler"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 msgid "Collapse feedlist"
 msgstr "Skjul nyhetskanalsslisten"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "Toggle Feedlist"
 msgstr "Vis nyhetskanallisten"
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Søk:"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr "Vis:"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr "Tilpasset"
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr "Alle artikler"
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "Antall:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "Oppdater"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 49dc83fb..6c877245 100644
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ
diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 81fc47f4..9bcc9a45 100644
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -229,7 +229,7 @@ msgid "All"
 msgstr "Todos"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "Não Lido"
 
@@ -248,7 +248,7 @@ msgstr "Ações..."
 msgid "Selection toggle:"
 msgstr "Seleção"
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "Favoritos"
 
@@ -570,7 +570,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr "Nenhum feed foi selecionado."
 
@@ -891,76 +891,86 @@ msgid ""
 "for small screens."
 msgstr ""
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Advanced"
 msgstr "Avançado"
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr ""
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr "Confirme marcando o Feed como lido"
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr ""
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr ""
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr ""
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr "Formato de data longo"
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr ""
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr "Formato de data curto"
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr ""
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr ""
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr ""
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr ""
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 msgid "Purge unread articles"
 msgstr ""
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
@@ -1231,43 +1241,48 @@ msgstr "&nbsp;&nbsp;Criar filtro"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;Editar esse Feed"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Criar filtro"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Todos os feeds"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr ""
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr ""
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr ""
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr ""
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "Limite:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "Atualizar"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 96c6d4d1..5b98f108 100644
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 26e7d36e..5e05f3e2 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "PO-Revision-Date: 2007-08-18 15:14+0400\n"
 "Last-Translator: Andrew Dolgov <cthulhoo@gmail.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -232,7 +232,7 @@ msgid "All"
 msgstr "Все"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "Новые"
 
@@ -251,7 +251,7 @@ msgstr "Действия..."
 msgid "Selection toggle:"
 msgstr "Выбрать:"
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "Отмеченные"
 
@@ -575,7 +575,7 @@ msgstr ""
 msgid "Could not display article (missing XML object)"
 msgstr ""
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr "Канал не выбран."
 
@@ -905,77 +905,87 @@ msgid ""
 "for small screens."
 msgstr ""
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Advanced"
 msgstr "Расширенные"
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr "Черный список тегов"
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr ""
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr ""
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr ""
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr "Включить метки"
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr ""
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr ""
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr ""
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr "Короткий формат даты"
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr "Показивать расширенную информацию в списке каналов"
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr "Вырезать небезопасные теги из статей"
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "Вырезать все, кроме основных HTML тегов при показе статей."
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr "Использовать более удобный формат отображения даты/времени"
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 #, fuzzy
 msgid "Purge unread articles"
 msgstr "Отмеченные"
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
@@ -1244,44 +1254,49 @@ msgstr "&nbsp;&nbsp;Создать фильтр"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;Подписаться"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;Создать фильтр"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 #, fuzzy
 msgid "Toggle Feedlist"
 msgstr "Изм. прочитанное"
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "Искать:"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr "Показать:"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr "Адаптивно"
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr "Все статьи"
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "Сколько:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "Обновить"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 4d435d21..f85e86f7 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 2b3e953f..c79e0ae6 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-05-20 09:14+0400\n"
+"POT-Creation-Date: 2008-05-20 12:57+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -228,7 +228,7 @@ msgid "All"
 msgstr "所有"
 
 #: functions.php:3866 functions.php:3871 functions.php:3915 functions.php:3918
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "Unread"
 msgstr "未读"
 
@@ -247,7 +247,7 @@ msgstr "激活..."
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:3872 functions.php:3919 tt-rss.php:197
+#: functions.php:3872 functions.php:3919 tt-rss.php:199
 msgid "Starred"
 msgstr "星级"
 
@@ -570,7 +570,7 @@ msgstr "更新提要失败（缺少XML支持）"
 msgid "Could not display article (missing XML object)"
 msgstr "显示条目失败（缺少XML支持）"
 
-#: localized_js.php:95 tt-rss.php:240 tt-rss.php:247
+#: localized_js.php:95 tt-rss.php:242 tt-rss.php:249
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -903,77 +903,87 @@ msgid ""
 "for small screens."
 msgstr ""
 
+#: localized_schema.php:54
+msgid "Group headlines in virtual feeds"
+msgstr ""
+
 #: localized_schema.php:55
+msgid ""
+"When this option is enabled, headlines in Special feeds and Labels are "
+"grouped by feeds"
+msgstr ""
+
+#: localized_schema.php:57
 msgid "Advanced"
 msgstr "高级"
 
-#: localized_schema.php:57
+#: localized_schema.php:59
 msgid "Blacklisted tags"
 msgstr "被列入黑名单的标签"
 
-#: localized_schema.php:58
+#: localized_schema.php:60
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
 msgstr "自动检测文章中标签时，这些标签不适用（用半角逗号隔开）"
 
-#: localized_schema.php:59
+#: localized_schema.php:61
 msgid "Confirm marking feed as read"
 msgstr "确认标记所有Feed为已读..."
 
-#: localized_schema.php:60
+#: localized_schema.php:62
 msgid "Enable icons in feedlist"
 msgstr "feed列表中不启用ico"
 
-#: localized_schema.php:61
+#: localized_schema.php:63
 msgid "Enable labels"
 msgstr "开启标签"
 
-#: localized_schema.php:62
+#: localized_schema.php:64
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
 msgstr "SQL支持，这是测试功能，请谨慎使用。"
 
-#: localized_schema.php:63
+#: localized_schema.php:65
 msgid "Long date format"
 msgstr "长的时间格式"
 
-#: localized_schema.php:64
+#: localized_schema.php:66
 msgid "Set articles as unread on update"
 msgstr "更新后标记文章为未读"
 
-#: localized_schema.php:65
+#: localized_schema.php:67
 msgid "Short date format"
 msgstr "短的时间格式"
 
-#: localized_schema.php:66
+#: localized_schema.php:68
 msgid "Show additional information in feedlist"
 msgstr "在feed列表中显示附加信息"
 
-#: localized_schema.php:67
+#: localized_schema.php:69
 msgid "Strip unsafe tags from articles"
 msgstr "从文章中过滤不安全标签"
 
-#: localized_schema.php:68
+#: localized_schema.php:70
 msgid "Strip all but most common HTML tags when reading articles."
 msgstr "阅读文章时过滤所有常见html标签"
 
-#: localized_schema.php:69
+#: localized_schema.php:71
 msgid "Use more accessible date/time format for headlines"
 msgstr "提要使用更方便的 日期／时间 格式"
 
-#: localized_schema.php:70
+#: localized_schema.php:72
 msgid "Automatically expand articles in combined mode"
 msgstr ""
 
-#: localized_schema.php:71
+#: localized_schema.php:73
 #, fuzzy
 msgid "Purge unread articles"
 msgstr "星级文章"
 
-#: localized_schema.php:72
+#: localized_schema.php:74
 msgid "Show special feeds when hiding read feeds"
 msgstr ""
 
@@ -1250,43 +1260,48 @@ msgstr "&nbsp;&nbsp;创建过滤器"
 
 #: tt-rss.php:168
 #, fuzzy
+msgid "&nbsp;&nbsp;Reset UI layout"
+msgstr "&nbsp;&nbsp;订阅feed"
+
+#: tt-rss.php:170
+#, fuzzy
 msgid "&nbsp;&nbsp;Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:176
+#: tt-rss.php:178
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:178
+#: tt-rss.php:180
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:186 modules/popup-dialog.php:139
+#: tt-rss.php:188 modules/popup-dialog.php:139
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 msgid "View:"
 msgstr "浏览:"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:196
+#: tt-rss.php:198
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:201
+#: tt-rss.php:203
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:226
+#: tt-rss.php:228
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:244
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
diff --git a/localized_schema.php b/localized_schema.php
index d826fba9..083e2eb2 100644
--- a/localized_schema.php
+++ b/localized_schema.php
@@ -51,6 +51,8 @@
 	__("Maximum age of fresh articles (in hours)");
 	__("Hide feedlist");
 	__("This option hides feedlist and allows it to be toggled on the fly, useful for small screens.");
+	__("Group headlines in virtual feeds");
+	__("When this option is enabled, headlines in Special feeds and Labels are grouped by feeds");
 
 	__("Advanced");