diff --git a/_includes/sections/instant-messenger.html b/_includes/sections/instant-messenger.html
index 41c2e155..581c1027 100644
--- a/_includes/sections/instant-messenger.html
+++ b/_includes/sections/instant-messenger.html
@@ -19,23 +19,6 @@
Centralized messengers are those where every participant is on the same server or network of servers controlled by the same organization.
-Advantages
-
- - New features and changes can be implemented more quickly.
- - Easier to get started with and to find contacts.
-
-
-Disadvantages
-
-
{%
include cardv2.html
title="Signal"
@@ -73,6 +56,29 @@
chrome="https://chrome.google.com/webstore/detail/keybase-for-reddit/ognfafcpbkogffpmmdglhbjboeojlefj"
%}
+
+
+
+
Advantages
+
+ - New features and changes can be implemented more quickly.
+ - Easier to get started with and to find contacts.
+
+
+
+
+
@@ -81,25 +87,6 @@
Federated messengers use multiple, independent servers that are able to talk to each other (email is one example of a federated service). Federation allows system administrators to control their own server and still be a part of the larger communications network.
-
Advantages
-
- - Allows for greater control over your own data when running your own server.
- - Allows you to choose who to trust your data with by choosing between multiple "public" servers.
- - Often allows for third party clients which can provide a more native, customized, or accessible experience.
- - Generally a less juicy target for governments wanting backdoor access to everything as the trust is decentralized. The server may be hosted independently from the organization developing the software.
- - Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)
- - Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.
-
-
-
Disadvantages
-
- - Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.
- - Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).
- - Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.
- - Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.
-
-
-
{%
include cardv2.html
title="Riot"
@@ -119,6 +106,30 @@
web="https://riot.im/app/"
%}
+
+
+
+
Advantages
+
+ - Allows for greater control over your own data when running your own server.
+ - Allows you to choose who to trust your data with by choosing between multiple "public" servers.
+ - Often allows for third party clients which can provide a more native, customized, or accessible experience.
+ - Generally a less juicy target for governments wanting backdoor access to everything as the trust is decentralized. The server may be hosted independently from the organization developing the software.
+ - Server software can be verified that it matches public source code, assuming you have access to the server or you trust the person who does (e.g., a family member)
+ - Third-party developers can contribute code and add new features, instead of waiting for a private development team to do so.
+
+
+
+
Disadvantages
+
+ - Adding new features is more complex, because these features need to be standardized and tested to ensure they work with all servers on the network.
+ - Some metadata may be available (e.g., information like "who is talking to whom," but not actual message content if E2EE is used).
+ - Federated servers generally require trusting your server's administrator. They may be a hobbyist or otherwise not a "security professional," and may not serve standard documents like a privacy policy or terms of service detailing how your data is utilized.
+ - Server administrators sometimes choose to block other servers, which are a source of unmoderated abuse or break general rules of accepted behavior. This will hinder your ability to communicate with users on those servers.
+
+
+
+
Worth Mentioning
@@ -133,24 +144,6 @@
Peer-to-Peer instant messengers connect directly to each other without requiring third-party servers. Clients (peers) usually find each other through the use of a distributed computing network. Examples of this include DHT (distributed hash table) (used with technologies like torrents and IPFS, for example). Another approach is proximity based networks, where a connection is established over WiFi or Bluetooth (for example, Briar or the Scuttlebutt social networking protocol). Once a peer has found a route to its contact via any of these methods, a direct connection between them is made.
-
-
Advantages
-
- - Minimal information is exposed to third parties.
- - Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.
-
-
-
Disadvantages
-
- - Reduced feature set:
-
- - Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.
- - Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.
-
- - Your IP address and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a self contained network, such as Tor or I2P. Many countries have some form of mass surveillance and/or metadata retention.
-
-
-
{%
include cardv2.html
title="Briar"
@@ -179,3 +172,25 @@
googleplay="https://play.google.com/store/apps/details?id=cx.ring"
ios="https://itunes.apple.com/app/ring-a-gnu-package/id1306951055?mt=8"
%}
+
+
+
+
+
Advantages
+
+ - Minimal information is exposed to third parties.
+ - Modern P2P platforms implement end-to-end encryption by default. There are no servers that could potentially intercept and decrypt your transmissions, unlike centralized and federated models.
+
+
+
+
Disadvantages
+
+ - Reduced feature set:
+
+ - Messages can only be sent when both peers are online, however, your client may store messages locally to wait for the contact to return online.
+ - Generally increases battery usage on mobile devices, because the client must stay connected to the distributed network to learn about who is online.
+
+ - Your IP address and that of the contacts you're communicating with may be visible if you do not use the software in conjunction with a self contained network, such as Tor or I2P. Many countries have some form of mass surveillance and/or metadata retention.
+
+
+