diff --git a/lib/views/contactsview.dart b/lib/views/contactsview.dart
index 5bd3897d..297fc0d5 100644
--- a/lib/views/contactsview.dart
+++ b/lib/views/contactsview.dart
@@ -87,18 +87,7 @@ class _ContactsViewState extends State<ContactsView> {
                 child: Text("%1 » %2".replaceAll("%1", Provider.of<ProfileInfoState>(context).nickname).replaceAll("%2", AppLocalizations.of(context)!.titleManageContacts),
                     overflow: TextOverflow.ellipsis, style: TextStyle(color: Provider.of<Settings>(context).current().mainTextColor()))),
           ])),
-          actions: [
-            IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
-            IconButton(
-                // need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
-                icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
-                onPressed: () {
-                  Provider.of<ContactListState>(context, listen: false).filter = "";
-                  setState(() {
-                    showSearchBar = !showSearchBar;
-                  });
-                })
-          ],
+          actions: getActions(context),
         ),
         floatingActionButton: FloatingActionButton(
           onPressed: _pushAddContact,
@@ -108,6 +97,26 @@ class _ContactsViewState extends State<ContactsView> {
         body: showSearchBar || Provider.of<ContactListState>(context).isFiltered ? _buildFilterable() : _buildContactList());
   }
 
+  List<Widget> getActions(context) {
+    var actions = List<Widget>.empty(growable: true);
+    if (Provider.of<Settings>(context).blockUnknownConnections) {
+      actions.add(Tooltip(message: AppLocalizations.of(context)!.blockUnknownConnectionsEnabledDescription, child: Icon(CwtchIcons.block_unknown)));
+    }
+    actions.add(
+      IconButton(icon: TorIcon(), onPressed: _pushTorStatus),
+    );
+    actions.add(IconButton(
+        // need both conditions for displaying initial empty textfield and also allowing filters to be cleared if this widget gets lost/reset
+        icon: Icon(showSearchBar || Provider.of<ContactListState>(context).isFiltered ? Icons.search_off : Icons.search),
+        onPressed: () {
+          Provider.of<ContactListState>(context, listen: false).filter = "";
+          setState(() {
+            showSearchBar = !showSearchBar;
+          });
+        }));
+    return actions;
+  }
+
   Widget _buildFilterable() {
     Widget txtfield = CwtchTextField(
       controller: ctrlrFilter,
diff --git a/lib/views/messageview.dart b/lib/views/messageview.dart
index 91e576ac..5528d97a 100644
--- a/lib/views/messageview.dart
+++ b/lib/views/messageview.dart
@@ -78,9 +78,13 @@ class _MessageViewState extends State<MessageView> {
     return WillPopScope(
         onWillPop: _onWillPop,
         child: Scaffold(
-          floatingActionButton: appState.unreadMessagesBelow ? FloatingActionButton(child: Icon(Icons.arrow_downward), onPressed: (){
-            scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
-          }) : null,
+          floatingActionButton: appState.unreadMessagesBelow
+              ? FloatingActionButton(
+                  child: Icon(Icons.arrow_downward),
+                  onPressed: () {
+                    scrollController.scrollTo(index: 0, duration: Duration(milliseconds: 600));
+                  })
+              : null,
           appBar: AppBar(
             // setting leading to null makes it do the default behaviour; container() hides it
             leading: Provider.of<Settings>(context).uiColumns(appState.isLandscape(context)).length > 1 ? Container() : null,
@@ -106,9 +110,11 @@ class _MessageViewState extends State<MessageView> {
               //IconButton(icon: Icon(Icons.list), onPressed: _pushContactSettings),
               //IconButton(icon: Icon(Icons.push_pin), onPressed: _pushContactSettings),
               IconButton(
-                icon: Icon(CwtchIcons.send_invite, size: 24),
-                tooltip: AppLocalizations.of(context)!.sendInvite,
-                onPressed: (){_modalSendInvitation(context);}),
+                  icon: Icon(CwtchIcons.send_invite, size: 24),
+                  tooltip: AppLocalizations.of(context)!.sendInvite,
+                  onPressed: () {
+                    _modalSendInvitation(context);
+                  }),
               IconButton(
                   icon: Provider.of<ContactInfoState>(context, listen: false).isGroup == true ? Icon(CwtchIcons.group_settings_24px) : Icon(CwtchIcons.peer_settings_24px),
                   tooltip: AppLocalizations.of(context)!.conversationSettings,
@@ -204,36 +210,37 @@ class _MessageViewState extends State<MessageView> {
       child: Row(
         children: <Widget>[
           Expanded(
-            child: Container(
-                decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
-                child: RawKeyboardListener(
-                    focusNode: FocusNode(),
-                    onKey: handleKeyPress,
-                    child: Padding(
-                      padding: EdgeInsets.all(8), child:TextFormField(
-                          key: Key('txtCompose'),
-                          controller: ctrlrCompose,
-                          focusNode: focusNode,
-                          autofocus: !Platform.isAndroid,
-                          textInputAction: TextInputAction.newline,
-                          keyboardType: TextInputType.multiline,
-                          enableIMEPersonalizedLearning: false,
-                          minLines: 1,
-                          maxLines: null,
-                          onFieldSubmitted: _sendMessage,
-                          enabled: !isOffline,
-                          decoration: InputDecoration(
-                            hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
-                            hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
-                            enabledBorder: InputBorder.none,
-                            focusedBorder: InputBorder.none,
-                            enabled: true,
-                            suffixIcon: ElevatedButton(
-                                style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()),
-                                child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                                onPressed: isOffline ? null : _sendMessage,
-                            ))),
-                          )))),
+              child: Container(
+                  decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
+                  child: RawKeyboardListener(
+                      focusNode: FocusNode(),
+                      onKey: handleKeyPress,
+                      child: Padding(
+                        padding: EdgeInsets.all(8),
+                        child: TextFormField(
+                            key: Key('txtCompose'),
+                            controller: ctrlrCompose,
+                            focusNode: focusNode,
+                            autofocus: !Platform.isAndroid,
+                            textInputAction: TextInputAction.newline,
+                            keyboardType: TextInputType.multiline,
+                            enableIMEPersonalizedLearning: false,
+                            minLines: 1,
+                            maxLines: null,
+                            onFieldSubmitted: _sendMessage,
+                            enabled: !isOffline,
+                            decoration: InputDecoration(
+                                hintText: isOffline ? "" : AppLocalizations.of(context)!.placeholderEnterMessage,
+                                hintStyle: TextStyle(color: Provider.of<Settings>(context).theme.altTextColor()),
+                                enabledBorder: InputBorder.none,
+                                focusedBorder: InputBorder.none,
+                                enabled: true,
+                                suffixIcon: ElevatedButton(
+                                  style: ElevatedButton.styleFrom(primary: Provider.of<Settings>(context).theme.defaultButtonColor()),
+                                  child: Icon(CwtchIcons.send_24px, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
+                                  onPressed: isOffline ? null : _sendMessage,
+                                ))),
+                      )))),
         ],
       ),
     );