diff --git a/assets/core/group_settings-24px.svg b/assets/core/group_settings-24px.svg
new file mode 100644
index 00000000..bc8e0f60
--- /dev/null
+++ b/assets/core/group_settings-24px.svg
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<g>
+	<path d="M8.9,12.9c-0.3,0-0.6,0-0.9,0c-2.1,0-6.3,1-6.3,3.1v2.2h5.4V16C7.1,14.7,7.8,13.7,8.9,12.9z"/>
+	<path d="M8,11.1c1.5,0,2.7-1.2,2.7-2.7c0-1.5-1.2-2.7-2.7-2.7c-1.5,0-2.7,1.2-2.7,2.7C5.3,9.9,6.5,11.1,8,11.1z"/>
+	<path d="M14.3,11.1c1.5,0,2.7-1.2,2.7-2.7c0-1.5-1.2-2.7-2.7-2.7s-2.7,1.2-2.7,2.7C11.7,9.9,12.8,11.1,14.3,11.1z"/>
+	<path d="M15.4,13c-0.4,0-0.7-0.1-1.1-0.1c-2.1,0-6-0.4-6.3,3.1v2.2h4.8c0-0.2,0-0.3,0-0.5C12.8,15.8,13.8,14,15.4,13z"/>
+</g>
+<path class="st0" d="M0,0h24v24H0V0z"/>
+<path d="M22.1,18.3c0-0.1,0-0.3,0-0.4c0-0.2,0-0.3,0-0.4l1-0.7c0.1-0.1,0.1-0.2,0.1-0.3l-0.9-1.6c-0.1-0.1-0.2-0.1-0.3-0.1l-1.1,0.5
+	c-0.2-0.2-0.5-0.3-0.8-0.4l-0.2-1.2c0-0.1-0.1-0.2-0.2-0.2h-1.8c-0.1,0-0.2,0.1-0.2,0.2l-0.2,1.2c-0.3,0.1-0.5,0.3-0.8,0.4l-1.1-0.5
+	c-0.1,0-0.2,0-0.3,0.1l-0.9,1.6c-0.1,0.1,0,0.2,0.1,0.3l1,0.7c0,0.1,0,0.3,0,0.4s0,0.3,0,0.4l-1,0.7c-0.1,0.1-0.1,0.2-0.1,0.3
+	l0.9,1.6c0.1,0.1,0.2,0.1,0.3,0.1l1.1-0.5c0.2,0.2,0.5,0.3,0.8,0.4l0.2,1.2c0,0.1,0.1,0.2,0.2,0.2h1.8c0.1,0,0.2-0.1,0.2-0.2L20,21
+	c0.3-0.1,0.5-0.3,0.8-0.4l1.1,0.5c0.1,0,0.2,0,0.3-0.1l0.9-1.6c0.1-0.1,0-0.2-0.1-0.3L22.1,18.3z M18.7,19.5c-0.9,0-1.7-0.8-1.7-1.7
+	c0-0.9,0.8-1.7,1.7-1.7c0.9,0,1.7,0.8,1.7,1.7C20.5,18.8,19.7,19.5,18.7,19.5z"/>
+</svg>
diff --git a/assets/core/peer_settings-24px.svg b/assets/core/peer_settings-24px.svg
new file mode 100644
index 00000000..86d1c94f
--- /dev/null
+++ b/assets/core/peer_settings-24px.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 25.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 24 24" style="enable-background:new 0 0 24 24;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:none;}
+</style>
+<path class="st0" d="M0,0h24v24H0V0z"/>
+<g>
+	<path d="M13.6,13.8c-1-0.2-2-0.3-2.8-0.3c-2.7,0-8,1.3-8,4v2h9.8c-0.3-0.6-0.4-1.3-0.4-2.1C12.2,15.9,12.7,14.7,13.6,13.8z"/>
+	<circle cx="10.8" cy="7.4" r="4"/>
+</g>
+<path d="M21.1,17.9c0-0.1,0-0.3,0-0.4c0-0.2,0-0.3,0-0.4l1-0.7c0.1-0.1,0.1-0.2,0.1-0.3l-0.9-1.6c-0.1-0.1-0.2-0.1-0.3-0.1l-1.1,0.5
+	c-0.2-0.2-0.5-0.3-0.8-0.4l-0.2-1.2c0-0.1-0.1-0.2-0.2-0.2h-1.8c-0.1,0-0.2,0.1-0.2,0.2l-0.2,1.2c-0.3,0.1-0.5,0.3-0.8,0.4l-1.1-0.5
+	c-0.1,0-0.2,0-0.3,0.1L13.4,16c-0.1,0.1,0,0.2,0.1,0.3l1,0.7c0,0.1,0,0.3,0,0.4c0,0.1,0,0.3,0,0.4l-1,0.7c-0.1,0.1-0.1,0.2-0.1,0.3
+	l0.9,1.6c0.1,0.1,0.2,0.1,0.3,0.1l1.1-0.5c0.2,0.2,0.5,0.3,0.8,0.4l0.2,1.2c0,0.1,0.1,0.2,0.2,0.2h1.8c0.1,0,0.2-0.1,0.2-0.2
+	l0.2-1.2c0.3-0.1,0.5-0.3,0.8-0.4l1.1,0.5c0.1,0,0.2,0,0.3-0.1l0.9-1.6c0.1-0.1,0-0.2-0.1-0.3L21.1,17.9z M17.7,19.2
+	c-0.9,0-1.7-0.8-1.7-1.7c0-0.9,0.8-1.7,1.7-1.7c0.9,0,1.7,0.8,1.7,1.7C19.4,18.4,18.7,19.2,17.7,19.2z"/>
+</svg>
diff --git a/assets/core/peer_settings-24px.webp b/assets/core/peer_settings-24px.webp
new file mode 100644
index 00000000..33dfadec
Binary files /dev/null and b/assets/core/peer_settings-24px.webp differ
diff --git a/i18n/translation_de.ts b/i18n/translation_de.ts
index 03078308..4106f6e4 100644
--- a/i18n/translation_de.ts
+++ b/i18n/translation_de.ts
@@ -76,11 +76,8 @@
     </message>
     <message>
         <location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
         <source>group-name</source>
-        <extracomment>Group Name
-----------
-Name</extracomment>
+        <extracomment>Group Name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -105,18 +102,18 @@ Name</extracomment>
 <context>
     <name>BulletinOverlay</name>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
         <source>new-bulletin-label</source>
         <translation>Neue Meldung</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="227"/>
         <source>post-new-bulletin-label</source>
         <extracomment>Post a new Bulletin Post</extracomment>
         <translation>Neue Meldung veröffentlichen</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="234"/>
         <source>title-placeholder</source>
         <extracomment>title place holder text</extracomment>
         <translation>Titel...</translation>
@@ -125,13 +122,19 @@ Name</extracomment>
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
-        <source>chat-history-disabled</source>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="83"/>
+        <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="85"/>
+        <source>chat-history-disabled</source>
+        <extracomment>Message history is disabled.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="87"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -248,18 +251,18 @@ Name</extracomment>
         <translation type="vanished">noch zu erledigen</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="33"/>
         <source>search-list</source>
-        <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
+        <extracomment>ex: &quot;Find...&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="63"/>
         <source>peer-not-online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="212"/>
         <source>add-list-item-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -276,24 +279,24 @@ Name</extracomment>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="66"/>
+        <location filename="../qml/widgets/Message.qml" line="67"/>
         <source>dm-tooltip</source>
         <extracomment>Click to DM</extracomment>
         <translation>Klicken, um DM zu senden</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>could-not-send-msg-error</source>
         <extracomment>Could not send this message</extracomment>
         <translation>Nachricht konnte nicht gesendet werden</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>acknowledged-label</source>
         <translation>bestätigt</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>pending-label</source>
         <translation>Bestätigung ausstehend</translation>
     </message>
@@ -402,24 +405,24 @@ Name</extracomment>
         <translation>speichern</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="109"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="108"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="130"/>
         <source>delete-btn</source>
         <translation>löschen</translation>
     </message>
diff --git a/i18n/translation_en.qm b/i18n/translation_en.qm
index 588c4b12..183a82fc 100644
Binary files a/i18n/translation_en.qm and b/i18n/translation_en.qm differ
diff --git a/i18n/translation_en.ts b/i18n/translation_en.ts
index 192735eb..9a0ae436 100644
--- a/i18n/translation_en.ts
+++ b/i18n/translation_en.ts
@@ -76,11 +76,8 @@
     </message>
     <message>
         <location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
         <source>group-name</source>
-        <extracomment>Group Name
-----------
-Name</extracomment>
+        <extracomment>Group Name</extracomment>
         <translation>Group name</translation>
     </message>
     <message>
@@ -118,18 +115,18 @@ Name</extracomment>
 <context>
     <name>BulletinOverlay</name>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
         <source>new-bulletin-label</source>
         <translation>New Bulletin</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="227"/>
         <source>post-new-bulletin-label</source>
         <extracomment>Post a new Bulletin Post</extracomment>
         <translation>Post new bulletin</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="234"/>
         <source>title-placeholder</source>
         <extracomment>title place holder text</extracomment>
         <translation>title...</translation>
@@ -138,16 +135,19 @@ Name</extracomment>
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
-        <source>chat-history-disabled</source>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="83"/>
+        <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
-	<!--	
-	<translation>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</translation>
-	-->
-	<translation>Your history with this peer is ephemeral and will not be saved. If you would like to save history, please go to settings and turn it on.</translation>
+        <translation>Your history with this peer is ephemeral and will not be saved. If you would like to save history, please go to settings and turn it on.</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="85"/>
+        <source>chat-history-disabled</source>
+        <extracomment>Message history is disabled.</extracomment>
+        <translation>Message history is disabled.</translation>
+    </message>
+    <message>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="87"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation>Message history is enabled.</translation>
@@ -344,18 +344,18 @@ Right-click to reset.</translation>
 <context>
     <name>ListOverlay</name>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="33"/>
         <source>search-list</source>
-        <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
+        <extracomment>ex: &quot;Find...&quot;</extracomment>
         <translation>Search List</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="63"/>
         <source>peer-not-online</source>
         <translation>Peer is Offline. Applications cannot be used right now.</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="212"/>
         <source>add-list-item-btn</source>
         <translation>Add Item</translation>
     </message>
@@ -372,24 +372,24 @@ Right-click to reset.</translation>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="66"/>
+        <location filename="../qml/widgets/Message.qml" line="67"/>
         <source>dm-tooltip</source>
         <extracomment>Click to DM</extracomment>
         <translation>Click to DM</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>could-not-send-msg-error</source>
         <extracomment>Could not send this message</extracomment>
         <translation>Could not send this message</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>acknowledged-label</source>
         <translation>Acknowledged</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>pending-label</source>
         <translation>Pending</translation>
     </message>
@@ -503,19 +503,19 @@ Right-click to reset.</translation>
         <translation>Block Peer</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="109"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation>Save Peer History</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history-description</source>
         <translation>Determines whether or not to delete any history associated with the peer.</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="108"/>
         <source>dont-save-peer-history</source>
         <translation>Delete Peer History</translation>
     </message>
@@ -524,7 +524,7 @@ Right-click to reset.</translation>
         <translation type="vanished">Unblock Peer</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="130"/>
         <source>delete-btn</source>
         <translation>Delete</translation>
     </message>
diff --git a/i18n/translation_fr.ts b/i18n/translation_fr.ts
index d9c22297..845397ac 100644
--- a/i18n/translation_fr.ts
+++ b/i18n/translation_fr.ts
@@ -76,11 +76,8 @@
     </message>
     <message>
         <location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
         <source>group-name</source>
-        <extracomment>Group Name
-----------
-Name</extracomment>
+        <extracomment>Group Name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -105,18 +102,18 @@ Name</extracomment>
 <context>
     <name>BulletinOverlay</name>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
         <source>new-bulletin-label</source>
         <translation>Nouveau bulletin</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="227"/>
         <source>post-new-bulletin-label</source>
         <extracomment>Post a new Bulletin Post</extracomment>
         <translation>Envoyer un nouveau bulletin</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="234"/>
         <source>title-placeholder</source>
         <extracomment>title place holder text</extracomment>
         <translation>titre...</translation>
@@ -125,13 +122,19 @@ Name</extracomment>
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
-        <source>chat-history-disabled</source>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="83"/>
+        <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="85"/>
+        <source>chat-history-disabled</source>
+        <extracomment>Message history is disabled.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="87"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -248,18 +251,18 @@ Name</extracomment>
         <translation type="vanished">A faire...</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="33"/>
         <source>search-list</source>
-        <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
+        <extracomment>ex: &quot;Find...&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="63"/>
         <source>peer-not-online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="212"/>
         <source>add-list-item-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -276,24 +279,24 @@ Name</extracomment>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="66"/>
+        <location filename="../qml/widgets/Message.qml" line="67"/>
         <source>dm-tooltip</source>
         <extracomment>Click to DM</extracomment>
         <translation>Envoyer un message privé</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>could-not-send-msg-error</source>
         <extracomment>Could not send this message</extracomment>
         <translation>Impossible d&apos;envoyer ce message</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>acknowledged-label</source>
         <translation>Confirmé</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>pending-label</source>
         <translation>En attente</translation>
     </message>
@@ -402,24 +405,24 @@ Name</extracomment>
         <translation>Sauvegarder</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="109"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="108"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="130"/>
         <source>delete-btn</source>
         <translation>Effacer</translation>
     </message>
diff --git a/i18n/translation_pt.ts b/i18n/translation_pt.ts
index 64f0b689..c5988b10 100644
--- a/i18n/translation_pt.ts
+++ b/i18n/translation_pt.ts
@@ -76,11 +76,8 @@
     </message>
     <message>
         <location filename="../qml/panes/AddPeerGroupPane.qml" line="140"/>
-        <location filename="../qml/panes/AddPeerGroupPane.qml" line="196"/>
         <source>group-name</source>
-        <extracomment>Group Name
-----------
-Name</extracomment>
+        <extracomment>Group Name</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -105,18 +102,18 @@ Name</extracomment>
 <context>
     <name>BulletinOverlay</name>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="202"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="215"/>
         <source>new-bulletin-label</source>
         <translation>Novo Boletim</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="214"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="227"/>
         <source>post-new-bulletin-label</source>
         <extracomment>Post a new Bulletin Post</extracomment>
         <translation>Postar novo boletim</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/BulletinOverlay.qml" line="220"/>
+        <location filename="../qml/overlays/BulletinOverlay.qml" line="234"/>
         <source>title-placeholder</source>
         <extracomment>title place holder text</extracomment>
         <translation>título…</translation>
@@ -125,13 +122,19 @@ Name</extracomment>
 <context>
     <name>ChatOverlay</name>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="66"/>
-        <source>chat-history-disabled</source>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="83"/>
+        <source>chat-history-default</source>
         <extracomment>This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ChatOverlay.qml" line="68"/>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="85"/>
+        <source>chat-history-disabled</source>
+        <extracomment>Message history is disabled.</extracomment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../qml/overlays/ChatOverlay.qml" line="87"/>
         <source>chat-history-enabled</source>
         <extracomment>Message history is enabled.</extracomment>
         <translation type="unfinished"></translation>
@@ -248,18 +251,18 @@ Name</extracomment>
         <translation type="vanished">Afazer…</translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="32"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="33"/>
         <source>search-list</source>
-        <extracomment>ex: &quot;... paste an address here to add a contact ...&quot;</extracomment>
+        <extracomment>ex: &quot;Find...&quot;</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="62"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="63"/>
         <source>peer-not-online</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/overlays/ListOverlay.qml" line="200"/>
+        <location filename="../qml/overlays/ListOverlay.qml" line="212"/>
         <source>add-list-item-btn</source>
         <translation type="unfinished"></translation>
     </message>
@@ -276,24 +279,24 @@ Name</extracomment>
 <context>
     <name>Message</name>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="66"/>
+        <location filename="../qml/widgets/Message.qml" line="67"/>
         <source>dm-tooltip</source>
         <extracomment>Click to DM</extracomment>
         <translation>Clique para DM</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>could-not-send-msg-error</source>
         <extracomment>Could not send this message</extracomment>
         <translation>Não deu para enviar esta mensagem</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>acknowledged-label</source>
         <translation>Confirmada</translation>
     </message>
     <message>
-        <location filename="../qml/widgets/Message.qml" line="188"/>
+        <location filename="../qml/widgets/Message.qml" line="189"/>
         <source>pending-label</source>
         <translation>Pendente</translation>
     </message>
@@ -402,24 +405,24 @@ Name</extracomment>
         <translation>Salvar</translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="102"/>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="112"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="99"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="109"/>
         <source>save-peer-history</source>
         <extracomment>Save Peer History</extracomment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="103"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="100"/>
         <source>save-peer-history-description</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="111"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="108"/>
         <source>dont-save-peer-history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../qml/panes/PeerSettingsPane.qml" line="133"/>
+        <location filename="../qml/panes/PeerSettingsPane.qml" line="130"/>
         <source>delete-btn</source>
         <translation>Deletar</translation>
     </message>