diff --git a/_includes/nav.html b/_includes/nav.html
index 18e6c3d4..3baed858 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -47,6 +47,7 @@
             <a class="dropdown-item" href="/software/encryption-tools/"><i class="fas fa-lock fa-fw"></i> File Encryption</a>
             <a class="dropdown-item" href="/software/file-sharing/"><i class="fas fa-file-export fa-fw"></i> File Sharing</a>
             <a class="dropdown-item" href="/software/im/"><i class="fab fa-telegram-plane fa-fw"></i> Instant Messenger</a>
+            <a class="dropdown-item" href="/teamchat"><i class="fas fa-business-time fa-fw"></i>Team chat</a>
             <a class="dropdown-item" href="/software/passwords/"><i class="fas fa-user-lock fa-fw"></i> Password Manager</a>
             <a class="dropdown-item" href="/software/productivity/"><i class="fas fa-briefcase fa-fw"></i> Productivity Tools</a>
             <a class="dropdown-item" href="/software/file-sync/"><i class="fas fa-copy fa-fw"></i> Secure File Sync</a>
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
new file mode 100644
index 00000000..bec8af64
--- /dev/null
+++ b/_includes/sections/teamchat.html
@@ -0,0 +1,40 @@
+<h1 id="teamchat" class="anchor"><a href="#teamchat"><i class="fas fa-link anchor-icon"></i></a> Private friendly Team chat applications</h1>
+
+<div class="alert alert-warning" role="alert">
+  <strong>If you are currently using an team chat like Slack you should pick an alternative here.</strong>
+</div>
+
+{% include cardv2.html
+title="Rocket.chat"
+image="/assets/img/tools/rocket.chat.png" <!-- TODO -->
+description="Rocket.chat is open source platform for team communication. It has optional federation and experimental E2EE. <a href=\"https://rocket.chat/docs/user-guides/end-to-end-encryption/\"><span class=\"badge badge-warning\" data-toggle=\"tooltip\" title=\"The documentation says this of E2EE: 'Note: This feature is currently in alpha. Its also not yet supported on mobile''\">Experimental <i class=\"far fa-question-circle\"></i></a></span>"
+website="https://rocket.chat/"
+forum="" <!-- TODO -->
+github="https://github.com/rocketchat/"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+%}
+
+{% include cardv2.html
+title="Keybase"
+image="/assets/img/tools/keybase.png" <!-- TODO -->
+description='Blah blah blah. <span class="badge badge-warning" data-toggle="tooltip" title="The server code is not open source">experimental <i class="far fa-question-circle"></i> (<a href="https://github.com/keybase/client/issues/6374">GitHub issue</a>)</span>'
+website="https://keybase.io/"
+forum="" <!-- TODO -->
+github="https://github.com/Keybase"
+android=""
+ios=""
+mac=""
+windows=""
+linux=""
+web=""
+%}
+
+<h3>Worth Mentioning</h3>
+
+<ul>
+  <li><a href="https://mattermost.com/">Mattermost</a> - <span class="badge badge-warning">No E2EE</span> A free and open-source Slack clone. </li>
+</ul>
\ No newline at end of file
diff --git a/pages/software/teamchat.html b/pages/software/teamchat.html
new file mode 100644
index 00000000..e554ff97
--- /dev/null
+++ b/pages/software/teamchat.html
@@ -0,0 +1,8 @@
+---
+layout: page
+permalink: /software/teamchat/
+title: "Team chat"
+description: "Discover private ways to chat with your team without letting big businesses read your messages."
+---
+
+{% include sections/teamchat.html %}