diff --git a/diagrams/connection.mmd b/diagrams/connection.mmd
new file mode 100644
index 0000000000..189e20eeaf
--- /dev/null
+++ b/diagrams/connection.mmd
@@ -0,0 +1,24 @@
+sequenceDiagram
+  participant Alice
+  participant App A
+  participant Server A
+  participant Server B
+  participant App B
+  participant Bob
+  Alice ->> App A: Alice shows <AB public key> as QR code on the screen<br>(Alice's public key for Bob's eyes only)
+  Bob ->> App B: Bob requests app to add connection
+  App A ->> App B: Bob's app reads <AB public key> via the camera
+  App B ->> Server B: Bob's app encrypts "connection request" (including <BA public key> and Bob's profile) and sends it to Bob's servers<br>{from: <BA public key hash>, to: <AB public key hash>, message: <request encrypted with AB public key>}
+  Server B ->> Server A: Bob's servers use <AB public key hash> to locate Alice's servers<br>and forward encrypted message to all Alice's servers (when they are different from Bob's servers)
+  Server A ->> App A: Alice's servers send the message to Alice's app
+  App A ->> Alice: Alice's app uses <AB public key hash> to identify Bob<br>and decrypts Bob's request with <AB private key> to show it
+  Alice ->> App A: Alice identifies Bob's profile and accepts the connection<br>(Bob is now added to Alice's list of connections as "pending")
+  App A ->> Server A: Alice's app creates "connection accepted" message (including Alice's profile) and sends it to Alice's servers<br>{from: <AB public key hash>, to: <BA public key hash>, message: <encrypted with AB public key>}
+  Server A ->> Server B: Alice's servers use <BA public key hash> to locate Bob's servers<br>and forward encrypted message to all Bob's servers (when they are different from Alice's servers)
+  Server B ->> App B: Bob's servers send the message to Bob's app
+  App B ->> Bob: Bob's app uses <AB public key hash> to identify Alice<br>and decrypts the acceptance with Bob's <BA private key>
+  App B ->> Bob: Bob's app adds Alice to the list of connections
+  App B ->> Server B: "connection acknowledgement" message
+  Server B ->> Server A: "connection acknowledgement" message
+  Server A ->> App A: "connection acknowledgement" message
+  App A ->> Alice: Bob is now in the Alice's list of connections as "established"
diff --git a/diagrams/connection.svg b/diagrams/connection.svg
new file mode 100644
index 0000000000..6cfe90e894
--- /dev/null
+++ b/diagrams/connection.svg
@@ -0,0 +1,498 @@
+<svg id="mermaid-1576940475189" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:1250px;" viewBox="-50 -10 1250 756"><style>
+
+
+
+#mermaid-1576940475189 .label {
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family);
+  color: #333; }
+
+#mermaid-1576940475189 .label text {
+  fill: #333; }
+
+#mermaid-1576940475189 .node rect,
+#mermaid-1576940475189 .node circle,
+#mermaid-1576940475189 .node ellipse,
+#mermaid-1576940475189 .node polygon {
+  fill: #ECECFF;
+  stroke: #9370DB;
+  stroke-width: 1px; }
+
+#mermaid-1576940475189 .node .label {
+  text-align: center; }
+
+#mermaid-1576940475189 .node.clickable {
+  cursor: pointer; }
+
+#mermaid-1576940475189 .arrowheadPath {
+  fill: #333333; }
+
+#mermaid-1576940475189 .edgePath .path {
+  stroke: #333333;
+  stroke-width: 1.5px; }
+
+#mermaid-1576940475189 .edgeLabel {
+  background-color: #e8e8e8;
+  text-align: center; }
+
+#mermaid-1576940475189 .cluster rect {
+  fill: #ffffde;
+  stroke: #aaaa33;
+  stroke-width: 1px; }
+
+#mermaid-1576940475189 .cluster text {
+  fill: #333; }
+
+#mermaid-1576940475189 div.mermaidTooltip {
+  position: absolute;
+  text-align: center;
+  max-width: 200px;
+  padding: 2px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family);
+  font-size: 12px;
+  background: #ffffde;
+  border: 1px solid #aaaa33;
+  border-radius: 2px;
+  pointer-events: none;
+  z-index: 100; }
+
+#mermaid-1576940475189 .actor {
+  stroke: #CCCCFF;
+  fill: #ECECFF; }
+
+#mermaid-1576940475189 text.actor {
+  fill: black;
+  stroke: none; }
+
+#mermaid-1576940475189 .actor-line {
+  stroke: grey; }
+
+#mermaid-1576940475189 .messageLine0 {
+  stroke-width: 1.5;
+  stroke-dasharray: '2 2';
+  stroke: #333; }
+
+#mermaid-1576940475189 .messageLine1 {
+  stroke-width: 1.5;
+  stroke-dasharray: '2 2';
+  stroke: #333; }
+
+#mermaid-1576940475189 #arrowhead {
+  fill: #333; }
+
+#mermaid-1576940475189 .sequenceNumber {
+  fill: white; }
+
+#mermaid-1576940475189 #sequencenumber {
+  fill: #333; }
+
+#mermaid-1576940475189 #crosshead path {
+  fill: #333 !important;
+  stroke: #333 !important; }
+
+#mermaid-1576940475189 .messageText {
+  fill: #333;
+  stroke: none; }
+
+#mermaid-1576940475189 .labelBox {
+  stroke: #CCCCFF;
+  fill: #ECECFF; }
+
+#mermaid-1576940475189 .labelText {
+  fill: black;
+  stroke: none; }
+
+#mermaid-1576940475189 .loopText {
+  fill: black;
+  stroke: none; }
+
+#mermaid-1576940475189 .loopLine {
+  stroke-width: 2;
+  stroke-dasharray: '2 2';
+  stroke: #CCCCFF; }
+
+#mermaid-1576940475189 .note {
+  stroke: #aaaa33;
+  fill: #fff5ad; }
+
+#mermaid-1576940475189 .noteText {
+  fill: black;
+  stroke: none;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family);
+  font-size: 14px; }
+
+#mermaid-1576940475189 .activation0 {
+  fill: #f4f4f4;
+  stroke: #666; }
+
+#mermaid-1576940475189 .activation1 {
+  fill: #f4f4f4;
+  stroke: #666; }
+
+#mermaid-1576940475189 .activation2 {
+  fill: #f4f4f4;
+  stroke: #666; }
+
+
+#mermaid-1576940475189 .mermaid-main-font {
+  font-family: "trebuchet ms", verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .section {
+  stroke: none;
+  opacity: 0.2; }
+
+#mermaid-1576940475189 .section0 {
+  fill: rgba(102, 102, 255, 0.49); }
+
+#mermaid-1576940475189 .section2 {
+  fill: #fff400; }
+
+#mermaid-1576940475189 .section1,
+#mermaid-1576940475189 .section3 {
+  fill: white;
+  opacity: 0.2; }
+
+#mermaid-1576940475189 .sectionTitle0 {
+  fill: #333; }
+
+#mermaid-1576940475189 .sectionTitle1 {
+  fill: #333; }
+
+#mermaid-1576940475189 .sectionTitle2 {
+  fill: #333; }
+
+#mermaid-1576940475189 .sectionTitle3 {
+  fill: #333; }
+
+#mermaid-1576940475189 .sectionTitle {
+  text-anchor: start;
+  font-size: 11px;
+  text-height: 14px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+
+#mermaid-1576940475189 .grid .tick {
+  stroke: lightgrey;
+  opacity: 0.3;
+  shape-rendering: crispEdges; }
+#mermaid-1576940475189   .grid .tick text {
+    font-family: 'trebuchet ms', verdana, arial;
+    font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .grid path {
+  stroke-width: 0; }
+
+
+#mermaid-1576940475189 .today {
+  fill: none;
+  stroke: red;
+  stroke-width: 2px; }
+
+
+
+#mermaid-1576940475189 .task {
+  stroke-width: 2; }
+
+#mermaid-1576940475189 .taskText {
+  text-anchor: middle;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .taskText:not([font-size]) {
+  font-size: 11px; }
+
+#mermaid-1576940475189 .taskTextOutsideRight {
+  fill: black;
+  text-anchor: start;
+  font-size: 11px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .taskTextOutsideLeft {
+  fill: black;
+  text-anchor: end;
+  font-size: 11px; }
+
+
+#mermaid-1576940475189 .task.clickable {
+  cursor: pointer; }
+
+#mermaid-1576940475189 .taskText.clickable {
+  cursor: pointer;
+  fill: #003163 !important;
+  font-weight: bold; }
+
+#mermaid-1576940475189 .taskTextOutsideLeft.clickable {
+  cursor: pointer;
+  fill: #003163 !important;
+  font-weight: bold; }
+
+#mermaid-1576940475189 .taskTextOutsideRight.clickable {
+  cursor: pointer;
+  fill: #003163 !important;
+  font-weight: bold; }
+
+
+#mermaid-1576940475189 .taskText0,
+#mermaid-1576940475189 .taskText1,
+#mermaid-1576940475189 .taskText2,
+#mermaid-1576940475189 .taskText3 {
+  fill: white; }
+
+#mermaid-1576940475189 .task0,
+#mermaid-1576940475189 .task1,
+#mermaid-1576940475189 .task2,
+#mermaid-1576940475189 .task3 {
+  fill: #8a90dd;
+  stroke: #534fbc; }
+
+#mermaid-1576940475189 .taskTextOutside0,
+#mermaid-1576940475189 .taskTextOutside2 {
+  fill: black; }
+
+#mermaid-1576940475189 .taskTextOutside1,
+#mermaid-1576940475189 .taskTextOutside3 {
+  fill: black; }
+
+
+#mermaid-1576940475189 .active0,
+#mermaid-1576940475189 .active1,
+#mermaid-1576940475189 .active2,
+#mermaid-1576940475189 .active3 {
+  fill: #bfc7ff;
+  stroke: #534fbc; }
+
+#mermaid-1576940475189 .activeText0,
+#mermaid-1576940475189 .activeText1,
+#mermaid-1576940475189 .activeText2,
+#mermaid-1576940475189 .activeText3 {
+  fill: black !important; }
+
+
+#mermaid-1576940475189 .done0,
+#mermaid-1576940475189 .done1,
+#mermaid-1576940475189 .done2,
+#mermaid-1576940475189 .done3 {
+  stroke: grey;
+  fill: lightgrey;
+  stroke-width: 2; }
+
+#mermaid-1576940475189 .doneText0,
+#mermaid-1576940475189 .doneText1,
+#mermaid-1576940475189 .doneText2,
+#mermaid-1576940475189 .doneText3 {
+  fill: black !important; }
+
+
+#mermaid-1576940475189 .crit0,
+#mermaid-1576940475189 .crit1,
+#mermaid-1576940475189 .crit2,
+#mermaid-1576940475189 .crit3 {
+  stroke: #ff8888;
+  fill: red;
+  stroke-width: 2; }
+
+#mermaid-1576940475189 .activeCrit0,
+#mermaid-1576940475189 .activeCrit1,
+#mermaid-1576940475189 .activeCrit2,
+#mermaid-1576940475189 .activeCrit3 {
+  stroke: #ff8888;
+  fill: #bfc7ff;
+  stroke-width: 2; }
+
+#mermaid-1576940475189 .doneCrit0,
+#mermaid-1576940475189 .doneCrit1,
+#mermaid-1576940475189 .doneCrit2,
+#mermaid-1576940475189 .doneCrit3 {
+  stroke: #ff8888;
+  fill: lightgrey;
+  stroke-width: 2;
+  cursor: pointer;
+  shape-rendering: crispEdges; }
+
+#mermaid-1576940475189 .milestone {
+  transform: rotate(45deg) scale(0.8, 0.8); }
+
+#mermaid-1576940475189 .milestoneText {
+  font-style: italic; }
+
+#mermaid-1576940475189 .doneCritText0,
+#mermaid-1576940475189 .doneCritText1,
+#mermaid-1576940475189 .doneCritText2,
+#mermaid-1576940475189 .doneCritText3 {
+  fill: black !important; }
+
+#mermaid-1576940475189 .activeCritText0,
+#mermaid-1576940475189 .activeCritText1,
+#mermaid-1576940475189 .activeCritText2,
+#mermaid-1576940475189 .activeCritText3 {
+  fill: black !important; }
+
+#mermaid-1576940475189 .titleText {
+  text-anchor: middle;
+  font-size: 18px;
+  fill: black;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 g.classGroup text {
+  fill: #9370DB;
+  stroke: none;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family);
+  font-size: 10px; }
+#mermaid-1576940475189   g.classGroup text .title {
+    font-weight: bolder; }
+
+#mermaid-1576940475189 g.classGroup rect {
+  fill: #ECECFF;
+  stroke: #9370DB; }
+
+#mermaid-1576940475189 g.classGroup line {
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 .classLabel .box {
+  stroke: none;
+  stroke-width: 0;
+  fill: #ECECFF;
+  opacity: 0.5; }
+
+#mermaid-1576940475189 .classLabel .label {
+  fill: #9370DB;
+  font-size: 10px; }
+
+#mermaid-1576940475189 .relation {
+  stroke: #9370DB;
+  stroke-width: 1;
+  fill: none; }
+
+#mermaid-1576940475189 #compositionStart {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #compositionEnd {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #aggregationStart {
+  fill: #ECECFF;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #aggregationEnd {
+  fill: #ECECFF;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #dependencyStart {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #dependencyEnd {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #extensionStart {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 #extensionEnd {
+  fill: #9370DB;
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 .commit-id,
+#mermaid-1576940475189 .commit-msg,
+#mermaid-1576940475189 .branch-label {
+  fill: lightgrey;
+  color: lightgrey;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .pieTitleText {
+  text-anchor: middle;
+  font-size: 25px;
+  fill: black;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 .slice {
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 g.stateGroup text {
+  fill: #9370DB;
+  stroke: none;
+  font-size: 10px;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+#mermaid-1576940475189 g.stateGroup text {
+  fill: #9370DB;
+  stroke: none;
+  font-size: 10px; }
+
+#mermaid-1576940475189 g.stateGroup .state-title {
+  font-weight: bolder;
+  fill: black; }
+
+#mermaid-1576940475189 g.stateGroup rect {
+  fill: #ECECFF;
+  stroke: #9370DB; }
+
+#mermaid-1576940475189 g.stateGroup line {
+  stroke: #9370DB;
+  stroke-width: 1; }
+
+#mermaid-1576940475189 .transition {
+  stroke: #9370DB;
+  stroke-width: 1;
+  fill: none; }
+
+#mermaid-1576940475189 .stateGroup .composit {
+  fill: white;
+  border-bottom: 1px; }
+
+#mermaid-1576940475189 .stateGroup .alt-composit {
+  fill: #e0e0e0;
+  border-bottom: 1px; }
+
+#mermaid-1576940475189 .state-note {
+  stroke: #aaaa33;
+  fill: #fff5ad; }
+#mermaid-1576940475189   .state-note text {
+    fill: black;
+    stroke: none;
+    font-size: 10px; }
+
+#mermaid-1576940475189 .stateLabel .box {
+  stroke: none;
+  stroke-width: 0;
+  fill: #ECECFF;
+  opacity: 0.5; }
+
+#mermaid-1576940475189 .stateLabel text {
+  fill: black;
+  font-size: 10px;
+  font-weight: bold;
+  font-family: 'trebuchet ms', verdana, arial;
+  font-family: var(--mermaid-font-family); }
+
+:root {
+  --mermaid-font-family: '"trebuchet ms", verdana, arial';
+  --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
+
+:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1576940475189 {
+    color: rgb(0, 0, 0);
+    font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
+  }</style><g></g><g><line id="actor18046" x1="75" y1="5" x2="75" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><line id="actor18047" x1="275" y1="5" x2="275" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><line id="actor18048" x1="475" y1="5" x2="475" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><line id="actor18049" x1="675" y1="5" x2="675" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="600" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><line id="actor18050" x1="875" y1="5" x2="875" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="800" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><line id="actor18051" x1="1075" y1="5" x2="1075" y2="745" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="1000" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><text x="175" y="93" class="messageText" style="text-anchor: middle;">Alice shows &lt;AB public key&gt; as QR code on the screen</text><text x="175" y="110" class="messageText" style="text-anchor: middle;">(Alice's public key for Bob's eyes only)</text><line x1="75" y1="100" x2="275" y2="100" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="975" y="128" class="messageText" style="text-anchor: middle;">Bob requests app to add connection</text><line x1="1075" y1="135" x2="875" y2="135" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="163" class="messageText" style="text-anchor: middle;">Bob's app reads &lt;AB public key&gt; via the camera</text><line x1="275" y1="170" x2="875" y2="170" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="775" y="198" class="messageText" style="text-anchor: middle;">Bob's app encrypts "connection request" (including &lt;BA public key&gt; and Bob's profile) and sends it to Bob's servers</text><text x="775" y="215" class="messageText" style="text-anchor: middle;">{from: &lt;BA public key hash&gt;, to: &lt;AB public key hash&gt;, message: &lt;request encrypted with AB public key&gt;}</text><line x1="875" y1="205" x2="675" y2="205" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="233" class="messageText" style="text-anchor: middle;">Bob's servers use &lt;AB public key hash&gt; to locate Alice's servers</text><text x="575" y="250" class="messageText" style="text-anchor: middle;">and forward encrypted message to all Alice's servers (when they are different from Bob's servers)</text><line x1="675" y1="240" x2="475" y2="240" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="268" class="messageText" style="text-anchor: middle;">Alice's servers send the message to Alice's app</text><line x1="475" y1="275" x2="275" y2="275" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="175" y="303" class="messageText" style="text-anchor: middle;">Alice's app uses &lt;AB public key hash&gt; to identify Bob</text><text x="175" y="320" class="messageText" style="text-anchor: middle;">and decrypts Bob's request with &lt;AB private key&gt; to show it</text><line x1="275" y1="310" x2="75" y2="310" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="175" y="338" class="messageText" style="text-anchor: middle;">Alice identifies Bob's profile and accepts the connection</text><text x="175" y="355" class="messageText" style="text-anchor: middle;">(Bob is now added to Alice's list of connections as "pending")</text><line x1="75" y1="345" x2="275" y2="345" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="373" class="messageText" style="text-anchor: middle;">Alice's app creates "connection accepted" message (including Alice's profile) and sends it to Alice's servers</text><text x="375" y="390" class="messageText" style="text-anchor: middle;">{from: &lt;AB public key hash&gt;, to: &lt;BA public key hash&gt;, message: &lt;encrypted with AB public key&gt;}</text><line x1="275" y1="380" x2="475" y2="380" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="408" class="messageText" style="text-anchor: middle;">Alice's servers use &lt;BA public key hash&gt; to locate Bob's servers</text><text x="575" y="425" class="messageText" style="text-anchor: middle;">and forward encrypted message to all Bob's servers (when they are different from Alice's servers)</text><line x1="475" y1="415" x2="675" y2="415" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="775" y="443" class="messageText" style="text-anchor: middle;">Bob's servers send the message to Bob's app</text><line x1="675" y1="450" x2="875" y2="450" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="975" y="478" class="messageText" style="text-anchor: middle;">Bob's app uses &lt;AB public key hash&gt; to identify Alice</text><text x="975" y="495" class="messageText" style="text-anchor: middle;">and decrypts the acceptance with Bob's &lt;BA private key&gt;</text><line x1="875" y1="485" x2="1075" y2="485" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="975" y="513" class="messageText" style="text-anchor: middle;">Bob's app adds Alice to the list of connections</text><line x1="875" y1="520" x2="1075" y2="520" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="775" y="548" class="messageText" style="text-anchor: middle;">"connection acknowledgement" message</text><line x1="875" y1="555" x2="675" y2="555" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="583" class="messageText" style="text-anchor: middle;">"connection acknowledgement" message</text><line x1="675" y1="590" x2="475" y2="590" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="618" class="messageText" style="text-anchor: middle;">"connection acknowledgement" message</text><line x1="475" y1="625" x2="275" y2="625" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="175" y="653" class="messageText" style="text-anchor: middle;">Bob is now in the Alice's list of connections as "established"</text><line x1="275" y1="660" x2="75" y2="660" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="0" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><rect x="200" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><rect x="400" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><rect x="600" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><rect x="800" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><rect x="1000" y="680" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="712.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g></svg>
\ No newline at end of file
diff --git a/diagrams/message.mmd b/diagrams/message.mmd
index bfae499388..94ea8e7bbc 100644
--- a/diagrams/message.mmd
+++ b/diagrams/message.mmd
@@ -7,6 +7,6 @@ sequenceDiagram
   participant Bob
   Alice ->> App A: Alice writes the message to Bob in the app
   App A ->> Server A: The message (including ID & timestamp) is encrypted with Bob's <BA public key> and sent to all Alice's servers<br>{from: <AB public key hash>, to: <BA public key hash>, message: <encrypted with BA public key>}
-  Server A ->> Server B: Alice's servers use <BA public key hash> to locate Bob's servers<br>and forward encrypted message to all Bob's servers (when they are different from Alice's servers
+  Server A ->> Server B: Alice's servers use <BA public key hash> to locate Bob's servers<br>and forward encrypted message to all Bob's servers (when they are different from Alice's servers)
   Server B ->> App B: Bob's servers send the message to Bob's app
   App B ->> Bob: Bob's app uses <AB public key hash> to identify Alice<br>and decrypts the messages with Bob's <BA private key>
diff --git a/diagrams/message.svg b/diagrams/message.svg
index 1df8c99d11..46a6fe2540 100644
--- a/diagrams/message.svg
+++ b/diagrams/message.svg
@@ -1,49 +1,49 @@
-<svg id="mermaid-1576938638003" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:1250px;" viewBox="-50 -10 1250 336"><style>
+<svg id="mermaid-1576939215542" width="100%" xmlns="http://www.w3.org/2000/svg" height="100%" style="max-width:1250px;" viewBox="-50 -10 1250 336"><style>
 
 
 
-#mermaid-1576938638003 .label {
+#mermaid-1576939215542 .label {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   color: #333; }
 
-#mermaid-1576938638003 .label text {
+#mermaid-1576939215542 .label text {
   fill: #333; }
 
-#mermaid-1576938638003 .node rect,
-#mermaid-1576938638003 .node circle,
-#mermaid-1576938638003 .node ellipse,
-#mermaid-1576938638003 .node polygon {
+#mermaid-1576939215542 .node rect,
+#mermaid-1576939215542 .node circle,
+#mermaid-1576939215542 .node ellipse,
+#mermaid-1576939215542 .node polygon {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1px; }
 
-#mermaid-1576938638003 .node .label {
+#mermaid-1576939215542 .node .label {
   text-align: center; }
 
-#mermaid-1576938638003 .node.clickable {
+#mermaid-1576939215542 .node.clickable {
   cursor: pointer; }
 
-#mermaid-1576938638003 .arrowheadPath {
+#mermaid-1576939215542 .arrowheadPath {
   fill: #333333; }
 
-#mermaid-1576938638003 .edgePath .path {
+#mermaid-1576939215542 .edgePath .path {
   stroke: #333333;
   stroke-width: 1.5px; }
 
-#mermaid-1576938638003 .edgeLabel {
+#mermaid-1576939215542 .edgeLabel {
   background-color: #e8e8e8;
   text-align: center; }
 
-#mermaid-1576938638003 .cluster rect {
+#mermaid-1576939215542 .cluster rect {
   fill: #ffffde;
   stroke: #aaaa33;
   stroke-width: 1px; }
 
-#mermaid-1576938638003 .cluster text {
+#mermaid-1576939215542 .cluster text {
   fill: #333; }
 
-#mermaid-1576938638003 div.mermaidTooltip {
+#mermaid-1576939215542 div.mermaidTooltip {
   position: absolute;
   text-align: center;
   max-width: 200px;
@@ -57,117 +57,117 @@
   pointer-events: none;
   z-index: 100; }
 
-#mermaid-1576938638003 .actor {
+#mermaid-1576939215542 .actor {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1576938638003 text.actor {
+#mermaid-1576939215542 text.actor {
   fill: black;
   stroke: none; }
 
-#mermaid-1576938638003 .actor-line {
+#mermaid-1576939215542 .actor-line {
   stroke: grey; }
 
-#mermaid-1576938638003 .messageLine0 {
+#mermaid-1576939215542 .messageLine0 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1576938638003 .messageLine1 {
+#mermaid-1576939215542 .messageLine1 {
   stroke-width: 1.5;
   stroke-dasharray: '2 2';
   stroke: #333; }
 
-#mermaid-1576938638003 #arrowhead {
+#mermaid-1576939215542 #arrowhead {
   fill: #333; }
 
-#mermaid-1576938638003 .sequenceNumber {
+#mermaid-1576939215542 .sequenceNumber {
   fill: white; }
 
-#mermaid-1576938638003 #sequencenumber {
+#mermaid-1576939215542 #sequencenumber {
   fill: #333; }
 
-#mermaid-1576938638003 #crosshead path {
+#mermaid-1576939215542 #crosshead path {
   fill: #333 !important;
   stroke: #333 !important; }
 
-#mermaid-1576938638003 .messageText {
+#mermaid-1576939215542 .messageText {
   fill: #333;
   stroke: none; }
 
-#mermaid-1576938638003 .labelBox {
+#mermaid-1576939215542 .labelBox {
   stroke: #CCCCFF;
   fill: #ECECFF; }
 
-#mermaid-1576938638003 .labelText {
+#mermaid-1576939215542 .labelText {
   fill: black;
   stroke: none; }
 
-#mermaid-1576938638003 .loopText {
+#mermaid-1576939215542 .loopText {
   fill: black;
   stroke: none; }
 
-#mermaid-1576938638003 .loopLine {
+#mermaid-1576939215542 .loopLine {
   stroke-width: 2;
   stroke-dasharray: '2 2';
   stroke: #CCCCFF; }
 
-#mermaid-1576938638003 .note {
+#mermaid-1576939215542 .note {
   stroke: #aaaa33;
   fill: #fff5ad; }
 
-#mermaid-1576938638003 .noteText {
+#mermaid-1576939215542 .noteText {
   fill: black;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 14px; }
 
-#mermaid-1576938638003 .activation0 {
+#mermaid-1576939215542 .activation0 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1576938638003 .activation1 {
+#mermaid-1576939215542 .activation1 {
   fill: #f4f4f4;
   stroke: #666; }
 
-#mermaid-1576938638003 .activation2 {
+#mermaid-1576939215542 .activation2 {
   fill: #f4f4f4;
   stroke: #666; }
 
 
-#mermaid-1576938638003 .mermaid-main-font {
+#mermaid-1576939215542 .mermaid-main-font {
   font-family: "trebuchet ms", verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .section {
+#mermaid-1576939215542 .section {
   stroke: none;
   opacity: 0.2; }
 
-#mermaid-1576938638003 .section0 {
+#mermaid-1576939215542 .section0 {
   fill: rgba(102, 102, 255, 0.49); }
 
-#mermaid-1576938638003 .section2 {
+#mermaid-1576939215542 .section2 {
   fill: #fff400; }
 
-#mermaid-1576938638003 .section1,
-#mermaid-1576938638003 .section3 {
+#mermaid-1576939215542 .section1,
+#mermaid-1576939215542 .section3 {
   fill: white;
   opacity: 0.2; }
 
-#mermaid-1576938638003 .sectionTitle0 {
+#mermaid-1576939215542 .sectionTitle0 {
   fill: #333; }
 
-#mermaid-1576938638003 .sectionTitle1 {
+#mermaid-1576939215542 .sectionTitle1 {
   fill: #333; }
 
-#mermaid-1576938638003 .sectionTitle2 {
+#mermaid-1576939215542 .sectionTitle2 {
   fill: #333; }
 
-#mermaid-1576938638003 .sectionTitle3 {
+#mermaid-1576939215542 .sectionTitle3 {
   fill: #333; }
 
-#mermaid-1576938638003 .sectionTitle {
+#mermaid-1576939215542 .sectionTitle {
   text-anchor: start;
   font-size: 11px;
   text-height: 14px;
@@ -175,313 +175,313 @@
   font-family: var(--mermaid-font-family); }
 
 
-#mermaid-1576938638003 .grid .tick {
+#mermaid-1576939215542 .grid .tick {
   stroke: lightgrey;
   opacity: 0.3;
   shape-rendering: crispEdges; }
-#mermaid-1576938638003   .grid .tick text {
+#mermaid-1576939215542   .grid .tick text {
     font-family: 'trebuchet ms', verdana, arial;
     font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .grid path {
+#mermaid-1576939215542 .grid path {
   stroke-width: 0; }
 
 
-#mermaid-1576938638003 .today {
+#mermaid-1576939215542 .today {
   fill: none;
   stroke: red;
   stroke-width: 2px; }
 
 
 
-#mermaid-1576938638003 .task {
+#mermaid-1576939215542 .task {
   stroke-width: 2; }
 
-#mermaid-1576938638003 .taskText {
+#mermaid-1576939215542 .taskText {
   text-anchor: middle;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .taskText:not([font-size]) {
+#mermaid-1576939215542 .taskText:not([font-size]) {
   font-size: 11px; }
 
-#mermaid-1576938638003 .taskTextOutsideRight {
+#mermaid-1576939215542 .taskTextOutsideRight {
   fill: black;
   text-anchor: start;
   font-size: 11px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .taskTextOutsideLeft {
+#mermaid-1576939215542 .taskTextOutsideLeft {
   fill: black;
   text-anchor: end;
   font-size: 11px; }
 
 
-#mermaid-1576938638003 .task.clickable {
+#mermaid-1576939215542 .task.clickable {
   cursor: pointer; }
 
-#mermaid-1576938638003 .taskText.clickable {
+#mermaid-1576939215542 .taskText.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1576938638003 .taskTextOutsideLeft.clickable {
+#mermaid-1576939215542 .taskTextOutsideLeft.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
-#mermaid-1576938638003 .taskTextOutsideRight.clickable {
+#mermaid-1576939215542 .taskTextOutsideRight.clickable {
   cursor: pointer;
   fill: #003163 !important;
   font-weight: bold; }
 
 
-#mermaid-1576938638003 .taskText0,
-#mermaid-1576938638003 .taskText1,
-#mermaid-1576938638003 .taskText2,
-#mermaid-1576938638003 .taskText3 {
+#mermaid-1576939215542 .taskText0,
+#mermaid-1576939215542 .taskText1,
+#mermaid-1576939215542 .taskText2,
+#mermaid-1576939215542 .taskText3 {
   fill: white; }
 
-#mermaid-1576938638003 .task0,
-#mermaid-1576938638003 .task1,
-#mermaid-1576938638003 .task2,
-#mermaid-1576938638003 .task3 {
+#mermaid-1576939215542 .task0,
+#mermaid-1576939215542 .task1,
+#mermaid-1576939215542 .task2,
+#mermaid-1576939215542 .task3 {
   fill: #8a90dd;
   stroke: #534fbc; }
 
-#mermaid-1576938638003 .taskTextOutside0,
-#mermaid-1576938638003 .taskTextOutside2 {
+#mermaid-1576939215542 .taskTextOutside0,
+#mermaid-1576939215542 .taskTextOutside2 {
   fill: black; }
 
-#mermaid-1576938638003 .taskTextOutside1,
-#mermaid-1576938638003 .taskTextOutside3 {
+#mermaid-1576939215542 .taskTextOutside1,
+#mermaid-1576939215542 .taskTextOutside3 {
   fill: black; }
 
 
-#mermaid-1576938638003 .active0,
-#mermaid-1576938638003 .active1,
-#mermaid-1576938638003 .active2,
-#mermaid-1576938638003 .active3 {
+#mermaid-1576939215542 .active0,
+#mermaid-1576939215542 .active1,
+#mermaid-1576939215542 .active2,
+#mermaid-1576939215542 .active3 {
   fill: #bfc7ff;
   stroke: #534fbc; }
 
-#mermaid-1576938638003 .activeText0,
-#mermaid-1576938638003 .activeText1,
-#mermaid-1576938638003 .activeText2,
-#mermaid-1576938638003 .activeText3 {
+#mermaid-1576939215542 .activeText0,
+#mermaid-1576939215542 .activeText1,
+#mermaid-1576939215542 .activeText2,
+#mermaid-1576939215542 .activeText3 {
   fill: black !important; }
 
 
-#mermaid-1576938638003 .done0,
-#mermaid-1576938638003 .done1,
-#mermaid-1576938638003 .done2,
-#mermaid-1576938638003 .done3 {
+#mermaid-1576939215542 .done0,
+#mermaid-1576939215542 .done1,
+#mermaid-1576939215542 .done2,
+#mermaid-1576939215542 .done3 {
   stroke: grey;
   fill: lightgrey;
   stroke-width: 2; }
 
-#mermaid-1576938638003 .doneText0,
-#mermaid-1576938638003 .doneText1,
-#mermaid-1576938638003 .doneText2,
-#mermaid-1576938638003 .doneText3 {
+#mermaid-1576939215542 .doneText0,
+#mermaid-1576939215542 .doneText1,
+#mermaid-1576939215542 .doneText2,
+#mermaid-1576939215542 .doneText3 {
   fill: black !important; }
 
 
-#mermaid-1576938638003 .crit0,
-#mermaid-1576938638003 .crit1,
-#mermaid-1576938638003 .crit2,
-#mermaid-1576938638003 .crit3 {
+#mermaid-1576939215542 .crit0,
+#mermaid-1576939215542 .crit1,
+#mermaid-1576939215542 .crit2,
+#mermaid-1576939215542 .crit3 {
   stroke: #ff8888;
   fill: red;
   stroke-width: 2; }
 
-#mermaid-1576938638003 .activeCrit0,
-#mermaid-1576938638003 .activeCrit1,
-#mermaid-1576938638003 .activeCrit2,
-#mermaid-1576938638003 .activeCrit3 {
+#mermaid-1576939215542 .activeCrit0,
+#mermaid-1576939215542 .activeCrit1,
+#mermaid-1576939215542 .activeCrit2,
+#mermaid-1576939215542 .activeCrit3 {
   stroke: #ff8888;
   fill: #bfc7ff;
   stroke-width: 2; }
 
-#mermaid-1576938638003 .doneCrit0,
-#mermaid-1576938638003 .doneCrit1,
-#mermaid-1576938638003 .doneCrit2,
-#mermaid-1576938638003 .doneCrit3 {
+#mermaid-1576939215542 .doneCrit0,
+#mermaid-1576939215542 .doneCrit1,
+#mermaid-1576939215542 .doneCrit2,
+#mermaid-1576939215542 .doneCrit3 {
   stroke: #ff8888;
   fill: lightgrey;
   stroke-width: 2;
   cursor: pointer;
   shape-rendering: crispEdges; }
 
-#mermaid-1576938638003 .milestone {
+#mermaid-1576939215542 .milestone {
   transform: rotate(45deg) scale(0.8, 0.8); }
 
-#mermaid-1576938638003 .milestoneText {
+#mermaid-1576939215542 .milestoneText {
   font-style: italic; }
 
-#mermaid-1576938638003 .doneCritText0,
-#mermaid-1576938638003 .doneCritText1,
-#mermaid-1576938638003 .doneCritText2,
-#mermaid-1576938638003 .doneCritText3 {
+#mermaid-1576939215542 .doneCritText0,
+#mermaid-1576939215542 .doneCritText1,
+#mermaid-1576939215542 .doneCritText2,
+#mermaid-1576939215542 .doneCritText3 {
   fill: black !important; }
 
-#mermaid-1576938638003 .activeCritText0,
-#mermaid-1576938638003 .activeCritText1,
-#mermaid-1576938638003 .activeCritText2,
-#mermaid-1576938638003 .activeCritText3 {
+#mermaid-1576939215542 .activeCritText0,
+#mermaid-1576939215542 .activeCritText1,
+#mermaid-1576939215542 .activeCritText2,
+#mermaid-1576939215542 .activeCritText3 {
   fill: black !important; }
 
-#mermaid-1576938638003 .titleText {
+#mermaid-1576939215542 .titleText {
   text-anchor: middle;
   font-size: 18px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 g.classGroup text {
+#mermaid-1576939215542 g.classGroup text {
   fill: #9370DB;
   stroke: none;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family);
   font-size: 10px; }
-#mermaid-1576938638003   g.classGroup text .title {
+#mermaid-1576939215542   g.classGroup text .title {
     font-weight: bolder; }
 
-#mermaid-1576938638003 g.classGroup rect {
+#mermaid-1576939215542 g.classGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1576938638003 g.classGroup line {
+#mermaid-1576939215542 g.classGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 .classLabel .box {
+#mermaid-1576939215542 .classLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1576938638003 .classLabel .label {
+#mermaid-1576939215542 .classLabel .label {
   fill: #9370DB;
   font-size: 10px; }
 
-#mermaid-1576938638003 .relation {
+#mermaid-1576939215542 .relation {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1576938638003 #compositionStart {
+#mermaid-1576939215542 #compositionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #compositionEnd {
+#mermaid-1576939215542 #compositionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #aggregationStart {
+#mermaid-1576939215542 #aggregationStart {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #aggregationEnd {
+#mermaid-1576939215542 #aggregationEnd {
   fill: #ECECFF;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #dependencyStart {
+#mermaid-1576939215542 #dependencyStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #dependencyEnd {
+#mermaid-1576939215542 #dependencyEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #extensionStart {
+#mermaid-1576939215542 #extensionStart {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 #extensionEnd {
+#mermaid-1576939215542 #extensionEnd {
   fill: #9370DB;
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 .commit-id,
-#mermaid-1576938638003 .commit-msg,
-#mermaid-1576938638003 .branch-label {
+#mermaid-1576939215542 .commit-id,
+#mermaid-1576939215542 .commit-msg,
+#mermaid-1576939215542 .branch-label {
   fill: lightgrey;
   color: lightgrey;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .pieTitleText {
+#mermaid-1576939215542 .pieTitleText {
   text-anchor: middle;
   font-size: 25px;
   fill: black;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 .slice {
+#mermaid-1576939215542 .slice {
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 g.stateGroup text {
+#mermaid-1576939215542 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px;
   font-family: 'trebuchet ms', verdana, arial;
   font-family: var(--mermaid-font-family); }
 
-#mermaid-1576938638003 g.stateGroup text {
+#mermaid-1576939215542 g.stateGroup text {
   fill: #9370DB;
   stroke: none;
   font-size: 10px; }
 
-#mermaid-1576938638003 g.stateGroup .state-title {
+#mermaid-1576939215542 g.stateGroup .state-title {
   font-weight: bolder;
   fill: black; }
 
-#mermaid-1576938638003 g.stateGroup rect {
+#mermaid-1576939215542 g.stateGroup rect {
   fill: #ECECFF;
   stroke: #9370DB; }
 
-#mermaid-1576938638003 g.stateGroup line {
+#mermaid-1576939215542 g.stateGroup line {
   stroke: #9370DB;
   stroke-width: 1; }
 
-#mermaid-1576938638003 .transition {
+#mermaid-1576939215542 .transition {
   stroke: #9370DB;
   stroke-width: 1;
   fill: none; }
 
-#mermaid-1576938638003 .stateGroup .composit {
+#mermaid-1576939215542 .stateGroup .composit {
   fill: white;
   border-bottom: 1px; }
 
-#mermaid-1576938638003 .stateGroup .alt-composit {
+#mermaid-1576939215542 .stateGroup .alt-composit {
   fill: #e0e0e0;
   border-bottom: 1px; }
 
-#mermaid-1576938638003 .state-note {
+#mermaid-1576939215542 .state-note {
   stroke: #aaaa33;
   fill: #fff5ad; }
-#mermaid-1576938638003   .state-note text {
+#mermaid-1576939215542   .state-note text {
     fill: black;
     stroke: none;
     font-size: 10px; }
 
-#mermaid-1576938638003 .stateLabel .box {
+#mermaid-1576939215542 .stateLabel .box {
   stroke: none;
   stroke-width: 0;
   fill: #ECECFF;
   opacity: 0.5; }
 
-#mermaid-1576938638003 .stateLabel text {
+#mermaid-1576939215542 .stateLabel text {
   fill: black;
   font-size: 10px;
   font-weight: bold;
@@ -492,7 +492,7 @@
   --mermaid-font-family: '"trebuchet ms", verdana, arial';
   --mermaid-font-family: "Comic Sans MS", "Comic Sans", cursive; }
 
-:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1576938638003 {
+:root { --mermaid-font-family: "trebuchet ms", verdana, arial;}</style><style>#mermaid-1576939215542 {
     color: rgb(0, 0, 0);
     font: normal normal 400 normal 16px / normal "trebuchet ms", verdana, arial;
-  }</style><g></g><g><line id="actor1824" x1="75" y1="5" x2="75" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><line id="actor1825" x1="275" y1="5" x2="275" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><line id="actor1826" x1="475" y1="5" x2="475" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><line id="actor1827" x1="675" y1="5" x2="675" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="600" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><line id="actor1828" x1="875" y1="5" x2="875" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="800" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><line id="actor1829" x1="1075" y1="5" x2="1075" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="1000" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><text x="175" y="93" class="messageText" style="text-anchor: middle;">Alice writes the message to Bob in the app</text><line x1="75" y1="100" x2="275" y2="100" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="128" class="messageText" style="text-anchor: middle;">The message (including ID &amp; timestamp) is encrypted with Bob's &lt;BA public key&gt; and sent to all Alice's servers</text><text x="375" y="145" class="messageText" style="text-anchor: middle;">{from: &lt;AB public key hash&gt;, to: &lt;BA public key hash&gt;, message: &lt;encrypted with BA public key&gt;}</text><line x1="275" y1="135" x2="475" y2="135" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="163" class="messageText" style="text-anchor: middle;">Alice's servers use &lt;BA public key hash&gt; to locate Bob's servers</text><text x="575" y="180" class="messageText" style="text-anchor: middle;">and forward encrypted message to all Bob's servers (when they are different from Alice's servers</text><line x1="475" y1="170" x2="675" y2="170" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="775" y="198" class="messageText" style="text-anchor: middle;">Bob's servers send the message to Bob's app</text><line x1="675" y1="205" x2="875" y2="205" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="975" y="233" class="messageText" style="text-anchor: middle;">Bob's app uses &lt;AB public key hash&gt; to identify Alice</text><text x="975" y="250" class="messageText" style="text-anchor: middle;">and decrypts the messages with Bob's &lt;BA private key&gt;</text><line x1="875" y1="240" x2="1075" y2="240" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="0" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><rect x="200" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><rect x="400" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><rect x="600" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><rect x="800" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><rect x="1000" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g></svg>
\ No newline at end of file
+  }</style><g></g><g><line id="actor1836" x1="75" y1="5" x2="75" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="0" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><line id="actor1837" x1="275" y1="5" x2="275" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="200" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><line id="actor1838" x1="475" y1="5" x2="475" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="400" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><line id="actor1839" x1="675" y1="5" x2="675" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="600" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><line id="actor1840" x1="875" y1="5" x2="875" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="800" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><line id="actor1841" x1="1075" y1="5" x2="1075" y2="325" class="actor-line" stroke-width="0.5px" stroke="#999"></line><rect x="1000" y="0" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="32.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g><defs><marker id="arrowhead" refX="5" refY="2" markerWidth="6" markerHeight="4" orient="auto"><path d="M 0,0 V 4 L6,2 Z"></path></marker></defs><defs><marker id="crosshead" markerWidth="15" markerHeight="8" orient="auto" refX="16" refY="4"><path fill="black" stroke="#000000" stroke-width="1px" d="M 9,2 V 6 L16,4 Z" style="stroke-dasharray: 0, 0;"></path><path fill="none" stroke="#000000" stroke-width="1px" d="M 0,1 L 6,7 M 6,1 L 0,7" style="stroke-dasharray: 0, 0;"></path></marker></defs><defs><marker id="sequencenumber" refX="15" refY="15" markerWidth="60" markerHeight="40" orient="auto"><circle cx="15" cy="15" r="6"></circle></marker></defs><g><text x="175" y="93" class="messageText" style="text-anchor: middle;">Alice writes the message to Bob in the app</text><line x1="75" y1="100" x2="275" y2="100" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="375" y="128" class="messageText" style="text-anchor: middle;">The message (including ID &amp; timestamp) is encrypted with Bob's &lt;BA public key&gt; and sent to all Alice's servers</text><text x="375" y="145" class="messageText" style="text-anchor: middle;">{from: &lt;AB public key hash&gt;, to: &lt;BA public key hash&gt;, message: &lt;encrypted with BA public key&gt;}</text><line x1="275" y1="135" x2="475" y2="135" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="575" y="163" class="messageText" style="text-anchor: middle;">Alice's servers use &lt;BA public key hash&gt; to locate Bob's servers</text><text x="575" y="180" class="messageText" style="text-anchor: middle;">and forward encrypted message to all Bob's servers (when they are different from Alice's servers)</text><line x1="475" y1="170" x2="675" y2="170" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="775" y="198" class="messageText" style="text-anchor: middle;">Bob's servers send the message to Bob's app</text><line x1="675" y1="205" x2="875" y2="205" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><text x="975" y="233" class="messageText" style="text-anchor: middle;">Bob's app uses &lt;AB public key hash&gt; to identify Alice</text><text x="975" y="250" class="messageText" style="text-anchor: middle;">and decrypts the messages with Bob's &lt;BA private key&gt;</text><line x1="875" y1="240" x2="1075" y2="240" class="messageLine0" stroke-width="2" stroke="black" marker-end="url(#arrowhead)" style="fill: none;"></line></g><g><rect x="0" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="75" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="75" dy="0">Alice</tspan></text></g><g><rect x="200" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="275" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="275" dy="0">App A</tspan></text></g><g><rect x="400" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="475" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="475" dy="0">Server A</tspan></text></g><g><rect x="600" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="675" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="675" dy="0">Server B</tspan></text></g><g><rect x="800" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="875" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="875" dy="0">App B</tspan></text></g><g><rect x="1000" y="260" fill="#eaeaea" stroke="#666" width="150" height="65" rx="3" ry="3" class="actor"></rect><text x="1075" y="292.5" dominant-baseline="central" alignment-baseline="central" class="actor" style="text-anchor: middle; font-size: 14px;"><tspan x="1075" dy="0">Bob</tspan></text></g></svg>
\ No newline at end of file
diff --git a/readme.md b/readme.md
index ab34038f27..c2a28191dc 100644
--- a/readme.md
+++ b/readme.md
@@ -75,6 +75,12 @@ Client apps should provide the following:
 
 ## Sequence diagrams
 
+Prepared with [mermaid-js](https://mermaid-js.github.io/mermaid-live-editor)
+
+### Adding connection
+
+![Adding connection](/diagrams/connection.svg)
+
 ### Sending message
 
-![Sending message](/diagrams/message.svg)
\ No newline at end of file
+![Sending message](/diagrams/message.svg)