3 files changed, 21 insertions, 1 deletions

diff --git a/src/app.c b/src/app.c
index 92334d42..99e42fc2 100644
--- a/src/app.c
+++ b/src/app.c
@@ -1242,6 +1242,22 @@ iBool handleCommand_App(const char *cmd) {
         postCommand_App("focus.set id:bmed.title");
         return iTrue;
     }
+    else if (equal_Command(cmd, "bookmark.addtag")) {
+        const iString *tag     = string_Command(cmd, "tag");
+        const iString *feedUrl = url_DocumentWidget(document_App());
+        if (!isEmpty_String(feedUrl)) {
+            uint32_t id = findUrl_Bookmarks(d->bookmarks, feedUrl);
+            if (id) {
+                addTag_Bookmark(get_Bookmarks(d->bookmarks, id), cstr_String(tag));
+            }
+            else {
+                add_Bookmarks(d->bookmarks, feedUrl, bookmarkTitle_DocumentWidget(document_App()),
+                              tag, siteIcon_GmDocument(document_DocumentWidget(document_App())));
+            }
+            postCommand_App("bookmarks.changed");
+        }
+        return iTrue;
+    }
     else if (equal_Command(cmd, "bookmarks.changed")) {
         save_Bookmarks(d->bookmarks, dataDir_App_);
         return iFalse;
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index d856f9f8..2edd28a9 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -668,6 +668,9 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
                 iBookmark *bm = get_Bookmarks(bookmarks_App(), item->id);
                 if (hasTag_Bookmark(bm, tag)) {
                     removeTag_Bookmark(bm, tag);
+                    if (!iCmpStr(tag, "subscribed")) {
+                        removeEntries_Feeds(item->id);
+                    }
                 }
                 else {
                     addTag_Bookmark(bm, tag);
@@ -679,6 +682,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         else if (equal_Command(cmd, "bookmark.delete")) {
             const iSidebarItem *item = d->contextItem;
             if (d->mode == bookmarks_SidebarMode && item && remove_Bookmarks(bookmarks_App(), item->id)) {
+                removeEntries_Feeds(item->id);
                 postCommand_App("bookmarks.changed");
             }
             return iTrue;
diff --git a/src/ui/window.c b/src/ui/window.c
index 637018a9..6e91d644 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -155,7 +155,7 @@ static const iMenuItem viewMenuItems_[] = {
     { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
     { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
     { "---", 0, 0, NULL },
-    { "Wrap Preformatted", 0, 0, "forcewrap.toggle" }
+    { "Wrap Preformatted", 0, 0, "forcewrap.toggle" } /* TODO: remove this; should scroll preformatted */
 };
 
 static iMenuItem bookmarksMenuItems_[] = {