diff --git a/50_bubble.py b/50_bubble.py

index fda7049..1a6aff4 100644

--- a/50_bubble.py

+++ b/50_bubble.py

@@ -511,13 +511,27 @@ When editing segments in the draft composer, you may sometimes accidentally subm

• "Likes" are a way of giving positive feedback in public. The names of people who have liked a post is visible to everyone. Likes can be disabled per-user or site-wide in the Bubble configuration.

• "Reactions" are Emoji-based and anonymous. The administrator chooses the available set of reaction Emoji, and users can select one of them for any given post. Everyone can see the total number of each type of reaction when viewing a post.



-## Follows and Mutes

+## Filtering Feeds and Content



-You can follow posts, subspaces, and users to be notified of their activity, and to select what is visible in the Followed feed. Follows are entirely private in Bubble. Only you see what you follow, and there are no counters or statistics about this visible anywhere. Followers do not affect the "hotness" sorting order, either.

+You can follow and mute posts, subspaces, and users to customize their visibility and notifications about them. In Settings, you can choose whether the front page feed shows all posts — except mutes ones — or just posts from followed subspaces and users.

+

+### Follows

+

+Follows are entirely private in Bubble: only you see what you follow, and there are no counters or statistics about them visible anywhere. Followers do not affect the "hotness" sorting order, either.



When you vote in a poll, the post is automatically marked as followed so you will be notified of discussion related to it even though you haven't commented on the poll yourself.



-Muting is private, too. No one can see what you have muted, or who has muted them. You can mute individual posts, entire subspaces, and all posts, comments by a particular user. Muting prevents notifications from being received regarding the target of the mute.

+### Muting

+

+Muting is private, too. No one can see what you have muted, or who has muted them. You can mute individual posts, entire subspaces, and all posts, comments by a particular user. Muting generally prevents notifications from being received regarding the target of the mute.

+

+* Muting a post silences notifications about the post but you can still view the post normally. @-mentions in the post or its comments will still be delivered to you. This is useful for long threads that you are no longer interested in actively following.

+* Muting a subspace hides it in All Posts and disables notifications about activity in the subspace. However, your own posts in that subspace are not affected, nor are @-mentions of you in the subspace. This could be used to prevent a busy subspace from dominating All Posts.

+* Muting a user hides the user's posts in every feed, including in All Posts and the muted user's "u/"-feed, and hides their comments in every post. Notifications from the user are not shown, either. It is as if the user does not exist.

+

+### Tag Filtering

+

+The front page feed, subspaces, user feeds, and issue trackers can all be filtered based on tags applied on posts.

"""

         return page



diff --git a/model.py b/model.py

index ac89e72..fad643e 100644

--- a/model.py

+++ b/model.py

@@ -1470,12 +1470,14 @@ class Database:

 MUTE_ALL_COND_JOIN = f"""

     LEFT JOIN mute mt

         ON mt.user=? AND

+ mt.user!=p.user AND

             ((mt.type={MUTE_SUBSPACE} AND mt.target=p.subspace) OR

              (mt.type={MUTE_USER} AND mt.target=p.user))

 """

 MUTE_SUBSPACE_COND_JOIN = f"""

     LEFT JOIN mute mt

         ON mt.user=? AND

+ mt.user!=p.user AND

             (mt.type={MUTE_USER} AND mt.target=p.user)

 """

 TAG_FILTER_JOIN = "JOIN tags tg ON tg.post=p.id"

@@ -1953,8 +1955,8 @@ class Database:

             LEFT JOIN reactions r ON r.post=n.post AND n.src=r.user

             LEFT JOIN mute mt ON mt.user={user.id} AND (

                 (mt.type={MUTE_USER} AND mt.target=n.src) OR

- (mt.type={MUTE_SUBSPACE} AND mt.target=p.subspace) OR

- (mt.type={MUTE_POST} AND mt.target=n.post)

+ (mt.type={MUTE_SUBSPACE} AND mt.target=p.subspace AND p.user!={user.id} AND n.type!={Notification.MENTION}) OR

+ (mt.type={MUTE_POST} AND mt.target=n.post AND n.type!={Notification.MENTION})

             )

         WHERE {' AND '.join(cond)}

     """, tuple(values))