diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index bc1bb1892..b682f95bb 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -49,19 +49,20 @@ def unfavorite(id_or_ap_id, user) do
   @instance Application.get_env(:pleroma, :instance)
   @limit Keyword.get(@instance, :limit)
   def post(user, %{"status" => status} = data) do
+    visibility = data["visibility"] || "public"
     with status <- String.trim(status),
          length when length in 1..@limit <- String.length(status),
          attachments <- attachments_from_ids(data["media_ids"]),
          mentions <- Formatter.parse_mentions(status),
          inReplyTo <- get_replied_to_activity(data["in_reply_to_status_id"]),
-         to <- to_for_user_and_mentions(user, mentions, inReplyTo),
+         {to, cc} <- to_for_user_and_mentions(user, mentions, inReplyTo, visibility),
          tags <- Formatter.parse_tags(status, data),
          content_html <- make_content_html(status, mentions, attachments, tags, data["no_attachment_links"]),
          context <- make_context(inReplyTo),
          cw <- data["spoiler_text"],
-         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw),
+         object <- make_note_data(user.ap_id, to, context, content_html, attachments, inReplyTo, tags, cw, cc),
          object <- Map.put(object, "emoji", Formatter.get_emoji(status) |> Enum.reduce(%{}, fn({name, file}, acc) -> Map.put(acc, name, "#{Pleroma.Web.Endpoint.static_url}#{file}") end)) do
-      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => to}})
+      res = ActivityPub.create(%{to: to, actor: user, context: context, object: object, additional: %{"cc" => cc}})
       User.increase_note_count(user)
       res
     end
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 2b359dd72..ea95c134c 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -24,17 +24,34 @@ def attachments_from_ids(ids) do
     end)
   end
 
-  def to_for_user_and_mentions(user, mentions, inReplyTo) do
-    default_to = [
-      user.follower_address,
-      "https://www.w3.org/ns/activitystreams#Public"
-    ]
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "public") do
+    to = ["https://www.w3.org/ns/activitystreams#Public"]
 
-    to = default_to ++ Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end)
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    cc = [user.follower_address | mentioned_users]
     if inReplyTo do
-      Enum.uniq([inReplyTo.data["actor"] | to])
+      {to, Enum.uniq([inReplyTo.data["actor"] | cc])}
     else
-      to
+      {to, cc}
+    end
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "unlisted") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "public")
+    {cc, to}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "private") do
+    {to, cc} = to_for_user_and_mentions(user, mentions, inReplyTo, "direct")
+    {[user.follower_address | to], cc}
+  end
+
+  def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
+    mentioned_users = Enum.map(mentions, fn ({_, %{ap_id: ap_id}}) -> ap_id end) ++ [user.ap_id]
+    if inReplyTo do
+      {Enum.uniq([inReplyTo.data["actor"] | mentioned_users]), []}
+    else
+      {mentioned_users, []}
     end
   end
 
@@ -99,10 +116,11 @@ def add_user_links(text, mentions) do
     end)
   end
 
-  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil) do
+  def make_note_data(actor, to, context, content_html, attachments, inReplyTo, tags, cw \\ nil, cc \\ []) do
       object = %{
         "type" => "Note",
         "to" => to,
+        "cc" => cc,
         "content" => content_html,
         "summary" => cw,
         "context" => context,
diff --git a/lib/pleroma/web/mastodon_api/views/status_view.ex b/lib/pleroma/web/mastodon_api/views/status_view.ex
index d859fc851..b4ce735eb 100644
--- a/lib/pleroma/web/mastodon_api/views/status_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/status_view.ex
@@ -116,8 +116,8 @@ def get_visibility(object) do
     cond do
       public in to -> "public"
       public in cc -> "unlisted"
-      [] == cc -> "direct"
-      true -> "private"
+      Enum.any?(to, &(String.contains?(&1, "/followers"))) -> "private"
+      true -> "direct"
     end
   end