diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 6169619b..e7976ce8 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -1,7 +1,7 @@
Encrypted Instant Messenger
-
If you are currently using an Instant Messenger like LINE, Telegram, Viber, WhatsApp, or plain SMS messages you should pick an alternative here.
+
If you are currently using an Instant Messenger like Telegram, LINE, Viber, WhatsApp, or plain SMS you should pick an alternative here.
@@ -10,21 +10,20 @@ title="Signal"
image="/assets/img/tools/Signal.png"
description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
All communications are end-to-end encrypted. Signal is free and open source."
+labels="success:VoIP"
website="https://signal.org/"
forum="https://forum.privacytools.io/t/discussion-signal/664"
github="https://github.com/signalapp"
android=""
ios=""
-mac=""
-windows=""
-linux=""
%}
{% include cardv2.html
title="Wire"
image="/assets/img/tools/wire.png"
-description='A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available. Warning'
+description="A free software End-to-End Encrypted chatting application that supports instant messaging, voice, and video calls. Full source code is available."
+labels="warning:Warning:Wire stores metadata such as list of your connections/conversations in plaintext (= not encrypted).,success:VoIP"
website="https://wire.com/"
forum="https://forum.privacytools.io/t/discussion-wire/750"
github="https://github.com/wireapp/"
@@ -53,12 +52,14 @@ web=""
- Conversations (Android) - An open source Jabber/XMPP client for Android 4.4+ smartphones. OMEMO
- Gajim (FreeBSD, Linux, Windows) - An open source fully featured XMPP client. OMEMO
- - Monal (iOS, MacOS) - An XMPP client in active development. OMEMO
+ - Monal (iOS, MacOS) - An XMPP client in active development. OMEMO VoIP
- Other OMEMO ready clients.
Kontalk - A community-driven instant messaging network. Supports end-to-end encryption. Both client-to-server and server-to-server channels are fully encrypted.
Keybase - Warning End-to-end encrypted messaging with social verification.
Status - Experimental A free and open-source, peer-to-peer, encrypted instant messanger with support for DAPPs.
+ Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging and video calling software. VoIP
+ Jami (formerly Ring/SFLphone) - Gives you full control over your communications and an unmatched level of privacy. Jami has text messaging, video and audio calls, file transfer, video conferencing. VoIP
@@ -67,5 +68,11 @@ web=""
diff --git a/_includes/sections/teamchat.html b/_includes/sections/teamchat.html
index 7b6442cf..2aaaa59b 100644
--- a/_includes/sections/teamchat.html
+++ b/_includes/sections/teamchat.html
@@ -1,13 +1,14 @@
- Team Chat Applications
+ Team Chat Platforms
-
If your project or organization currently uses a team chat like Discord or Slack you should pick an alternative here.
+
If your project or organization currently uses a platform like Discord or Slack you should pick an alternative here.
{% include cardv2.html
title="Rocket.chat"
image="/assets/img/tools/rocket.chat.png"
-description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE. Experimental "
+description="Rocket.chat is an self-hostable open source platform for team communication. It has optional federation and experimental E2EE."
+labels="warning:Experimental:Regarding E2EE their documentation states 'This feature is currently in alpha. It's also not yet supported on mobile'. There is no forward secrecy so compromised decryption password would leak all messages. The federation was also added afterwards potentially causing room for mistakes."
website="https://rocket.chat/"
forum="https://forum.privacytools.io/t/discussion-rocket-chat/1223"
github="https://github.com/rocketchat/"
@@ -21,7 +22,8 @@ linux=""
{% include cardv2.html
title="Keybase"
image="/assets/img/tools/keybase.png"
-description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF). experimental (GitHub issue)'
+description='Keybase provides a hosted team chat with end-to-end encryption. It has also been indepedently audited (PDF).'
+labels="warning:Experimental:The server side of Keybase runs on proprietary code and is centralized."
website="https://keybase.io/"
forum="https://forum.privacytools.io/t/discussion-keybase/1224"
github="https://github.com/Keybase"
@@ -37,5 +39,5 @@ web=""
Worth Mentioning
- - Wire Pro - Paid team communication with E2EE. Untested
+ - Wire Pro - Paid team communication with E2EE. Untested
diff --git a/_includes/sections/voice-video-messenger.html b/_includes/sections/voice-video-messenger.html
index 2f5a0988..51f10040 100644
--- a/_includes/sections/voice-video-messenger.html
+++ b/_includes/sections/voice-video-messenger.html
@@ -1,41 +1,9 @@
- Encrypted Video & Voice Messenger
+ Video/Voice Calling
- If you are currently using a Video & Voice Messenger like Skype, Viber or Google Hangouts, you should pick an alternative here.
+ If you are currently using a Video/Voice Calling app like Skype, Viber or Google Hangouts, you should pick an alternative here. Please note that many of the above instant messengers also support VoIP. The software listed below are primarily Voice/Video focused.
-{% include cardv2.html
-title="Mobile: Signal"
-image="/assets/img/tools/Signal.png"
-website="https://signal.org"
-description="Signal is a mobile app developed by Open Whisper Systems. The app provides instant messaging, as well as voice and video calling.
-All communications are end-to-end encrypted. Signal is free and open source."
-forum="https://forum.privacytools.io/t/discussion-signal/664"
-github="https://github.com/signalapp"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-footer="OS: Android, iOS, macOS, Windows, Linux"
-%}
-
-{% include cardv2.html
-title="Wire"
-image="/assets/img/tools/wire.png"
-website="https://wire.com/download/"
-description="Wire is an app developed by Wire Swiss GmbH.
-The Wire app allows users to exchange end-to-end encrypted instant messages, as well as make voice and video calls. Wire is free and open source. Caution "
-forum="https://forum.privacytools.io/t/discussion-wire/750"
-github="https://github.com/wireapp"
-android=""
-ios=""
-mac=""
-windows=""
-linux=""
-web=""
-%}
-
{% include cardv2.html
title="Linphone"
image="/assets/img/tools/Linphone.png"
@@ -51,20 +19,30 @@ mac=""
web=""
%}
-
-
+{% include cardv2.html
+title="Mumble"
+image="/assets/img/tools/Mumble.png"
+website="https://mumble.info/"
+description="Mumble is an open source, low-latency, high quality voice chat software primarily intended for use while gaming. Note that while Mumble doesn't log messages or record by default, it's missing end-to-end encryption, so self-hosting is recommended."
+forum="https://forum.privacytools.io/t/discussion-mumble/1289"
+github="https://github.com/mumble-voip/"
+windows=""
+linux=""
+mac=""
+%}
Worth Mentioning
- - Jitsi - Jitsi is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application.
- - Tox - Experimental A free and open-source, peer-to-peer, encrypted instant messaging and video calling software.
- - Jami (formerly Ring/SFLphone) - Gives you a full control over your communications and an unmatched level of privacy.
+ - Jitsi Meet - Jitsi Meet is a free and open source multiplatform voice (VoIP), videoconferencing and instant messaging application. Requires WebRTC
Related Information
diff --git a/assets/img/tools/Mumble.png b/assets/img/tools/Mumble.png
new file mode 100644
index 00000000..eba10531
Binary files /dev/null and b/assets/img/tools/Mumble.png differ
diff --git a/source_code.md b/source_code.md
index 7de4daf3..8f0853f4 100644
--- a/source_code.md
+++ b/source_code.md
@@ -134,26 +134,24 @@ Backend: closed-source
Status.im: https://github.com/status-im
+ Tox: https://github.com/TokTok/c-toxcore
+
+ Ring/Jami: https://git.jami.net/savoirfairelinux
+
## Team chat
Rocket.chat: https://github.com/rocketchat/
Keybase: https://github.com/Keybase
-## Encrypted Video & Voice Messenger
- Signal: https://github.com/signalapp
-
- Wire: https://github.com/wireapp
-
+## Video & Voice Messenger
Linphone: https://github.com/BelledonneCommunications/
+ Mumble: https://github.com/mumble-voip/
+
Worth Mentioning
- Jitsi: https://github.com/jitsi/jitsi-meet
-
- Tox: https://github.com/TokTok/c-toxcore
-
- Ring/Jami: https://gerrit-ring.savoirfairelinux.com/#/q/status:open
+ Jitsi Meet: https://github.com/jitsi/jitsi-meet
## File Sharing
OnionShare: https://github.com/micahflee/onionshare