2 files changed, 11 insertions, 2 deletions

diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 8024b240..1167ebe3 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -240,6 +240,13 @@ static void updateItems_SidebarWidget_(iSidebarWidget *d) {
                 const iVisitedUrl *visit = i.ptr;
                 iSidebarItem *item = new_SidebarItem();
                 set_String(&item->url, &visit->url);
+                set_String(&item->label, &visit->url);
+                if (prefs_App()->decodeUserVisibleURLs) {
+                    urlDecodePath_String(&item->label);
+                }
+                else {
+                    urlEncodePath_String(&item->label);
+                }
                 iDate date;
                 init_Date(&date, &visit->when);
                 if (date.day != on.day || date.month != on.month || date.year != on.year) {
@@ -1211,7 +1218,7 @@ static void draw_SidebarItem_(const iSidebarItem *d, iPaint *p, iRect itemRect,
         }
         else {
             iUrl parts;
-            init_Url(&parts, &d->url);
+            init_Url(&parts, &d->label);
             const iBool isAbout  = equalCase_Rangecc(parts.scheme, "about");
             const iBool isGemini = equalCase_Rangecc(parts.scheme, "gemini");
             draw_Text(font,
diff --git a/src/ui/util.c b/src/ui/util.c
index 1ad3f30e..6c9d75dc 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -1136,7 +1136,9 @@ iWidget *makePreferences_Widget(void) {
         addChild_Widget(values, iClob(makeToggle_Widget("prefs.biglede")));
     }
     /* Proxies. */ {
-        appendTwoColumnPage_(tabs, "Proxies", '5', &headings, &values);
+        appendTwoColumnPage_(tabs, "Network", '5', &headings, &values);
+        addChild_Widget(headings, iClob(makeHeading_Widget("Decode paths:")));
+        addChild_Widget(values, iClob(makeToggle_Widget("prefs.decodeurls")));
         addChild_Widget(headings, iClob(makeHeading_Widget("Gemini proxy:")));
         setId_Widget(addChild_Widget(values, iClob(new_InputWidget(0))), "prefs.proxy.gemini");
         addChild_Widget(headings, iClob(makeHeading_Widget("Gopher proxy:")));