diff --git a/lib/l10n/intl_de.arb b/lib/l10n/intl_de.arb
index 3d1a360..902c84b 100644
--- a/lib/l10n/intl_de.arb
+++ b/lib/l10n/intl_de.arb
@@ -17,6 +17,7 @@
   "builddate": "Aufgebaut auf: %2",
   "bulletinsBtn": "Meldungen",
   "chatBtn": "Chat",
+  "chatHistoryDefault": "",
   "contactAlreadyExists": "",
   "conversationSettings": "",
   "copiedClipboardNotification": "in die Zwischenablage kopiert",
diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb
index 8ce8f99..2f37d53 100644
--- a/lib/l10n/intl_en.arb
+++ b/lib/l10n/intl_en.arb
@@ -17,6 +17,7 @@
   "builddate": "Built on: %2",
   "bulletinsBtn": "Bulletins",
   "chatBtn": "Chat",
+  "chatHistoryDefault": "This conversation will be deleted when Cwtch is closed! Message history can be enabled per-conversation via the Settings menu in the upper right.",
   "contactAlreadyExists": "Contact Already Exists",
   "conversationSettings": "Conversation Settings",
   "copiedClipboardNotification": "Copied to clipboard",
diff --git a/lib/l10n/intl_es.arb b/lib/l10n/intl_es.arb
index 02694e9..f4ad2b9 100644
--- a/lib/l10n/intl_es.arb
+++ b/lib/l10n/intl_es.arb
@@ -17,6 +17,7 @@
   "builddate": "Basado en: %2",
   "bulletinsBtn": "Boletines",
   "chatBtn": "Chat",
+  "chatHistoryDefault": "",
   "contactAlreadyExists": "",
   "conversationSettings": "",
   "copiedClipboardNotification": "Copiado al portapapeles",
diff --git a/lib/l10n/intl_fr.arb b/lib/l10n/intl_fr.arb
index 59bee35..6df2f99 100644
--- a/lib/l10n/intl_fr.arb
+++ b/lib/l10n/intl_fr.arb
@@ -17,6 +17,7 @@
   "builddate": "",
   "bulletinsBtn": "Bulletins",
   "chatBtn": "Discuter",
+  "chatHistoryDefault": "",
   "contactAlreadyExists": "",
   "conversationSettings": "",
   "copiedClipboardNotification": "Copié dans le presse-papier",
diff --git a/lib/l10n/intl_it.arb b/lib/l10n/intl_it.arb
index fd1d432..fee6328 100644
--- a/lib/l10n/intl_it.arb
+++ b/lib/l10n/intl_it.arb
@@ -17,6 +17,7 @@
   "builddate": "Costruito il: %2",
   "bulletinsBtn": "Bollettini",
   "chatBtn": "Chat",
+  "chatHistoryDefault": "",
   "contactAlreadyExists": "",
   "conversationSettings": "",
   "copiedClipboardNotification": "Copiato negli Appunti",
diff --git a/lib/l10n/intl_pt.arb b/lib/l10n/intl_pt.arb
index ef4ab54..772eb42 100644
--- a/lib/l10n/intl_pt.arb
+++ b/lib/l10n/intl_pt.arb
@@ -17,6 +17,7 @@
   "builddate": "",
   "bulletinsBtn": "Boletins",
   "chatBtn": "Chat",
+  "chatHistoryDefault": "",
   "contactAlreadyExists": "",
   "conversationSettings": "",
   "copiedClipboardNotification": "Copiado",
diff --git a/lib/opaque.dart b/lib/opaque.dart
index 268646f..5615486 100644
--- a/lib/opaque.dart
+++ b/lib/opaque.dart
@@ -1357,14 +1357,14 @@ ThemeData mkThemeData(Settings opaque) {
     ),
     cardColor: opaque.current().backgroundMainColor(),
     appBarTheme: AppBarTheme(
-      backgroundColor: opaque.current().backgroundPaneColor(),
-      titleTextStyle: TextStyle(
-        color: opaque.current().mainTextColor(),
-      ),
-      actionsIconTheme: IconThemeData(
-        color: opaque.current().mainTextColor(),
-      ),
-    ),
+        backgroundColor: opaque.current().backgroundPaneColor(),
+        titleTextStyle: TextStyle(
+          color: opaque.current().mainTextColor(),
+        ),
+        actionsIconTheme: IconThemeData(
+          color: opaque.current().mainTextColor(),
+        )),
+    bottomNavigationBarTheme: BottomNavigationBarThemeData(type: BottomNavigationBarType.fixed, backgroundColor: opaque.current().backgroundHilightElementColor()),
     textButtonTheme: TextButtonThemeData(
       style: ButtonStyle(
           backgroundColor: MaterialStateProperty.all(opaque.current().defaultButtonColor()),
diff --git a/lib/widgets/messagelist.dart b/lib/widgets/messagelist.dart
index dd89b23..1101353 100644
--- a/lib/widgets/messagelist.dart
+++ b/lib/widgets/messagelist.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:provider/provider.dart';
-
+import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import '../model.dart';
 import '../settings.dart';
 import 'messagerow.dart';
@@ -17,10 +17,21 @@ class _MessageListState extends State<MessageList> {
   Widget build(BuildContext outerContext) {
     return RepaintBoundary(
         child: Container(
-            child: Scrollbar(
-                isAlwaysShown: true,
-                controller: ctrlr1,
-                child: Container(
+            child: Column(children: [
+      Visibility(
+          visible: Provider.of<ContactInfoState>(context).isOnline() == false || Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory",
+          child: Container(
+            padding: EdgeInsets.all(5.0),
+            color: Provider.of<Settings>(context).theme.defaultButtonActiveColor(),
+            child: Provider.of<ContactInfoState>(context).isOnline() == false
+                ? Text(Provider.of<ContactInfoState>(context).isGroup ? AppLocalizations.of(context)!.serverConnectivityDisconnected : AppLocalizations.of(context)!.peerOfflineMessage)
+                : (Provider.of<ContactInfoState>(context).savePeerHistory != "SaveHistory" ? Text(AppLocalizations.of(context)!.chatHistoryDefault) : Text("")),
+          )),
+      Expanded(
+          child: Scrollbar(
+              isAlwaysShown: true,
+              controller: ctrlr1,
+              child: Container(
                   // Only show broken heart is the contact is offline...
                   decoration: BoxDecoration(
                       image: Provider.of<ContactInfoState>(outerContext).isOnline()
@@ -51,7 +62,7 @@ class _MessageListState extends State<MessageList> {
                             return RepaintBoundary(child: MessageRow(key: Provider.of<ContactInfoState>(bcontext).getMessageKey(idx)));
                           });
                     },
-                  ),
-                ))));
+                  ))))
+    ])));
   }
 }