diff --git a/gajim/common/config.py b/gajim/common/config.py
index 9680cefc8..f6c0b6ffa 100644
--- a/gajim/common/config.py
+++ b/gajim/common/config.py
@@ -394,7 +394,6 @@ class Config:
                     'ignore_unknown_contacts': [ opt_bool, False ],
                     'send_os_info': [ opt_bool, True, _("Allow Gajim to send information about the operating system you are running.") ],
                     'send_time_info': [ opt_bool, True, _("Allow Gajim to send your local time.") ],
-                    'log_encrypted_sessions': [opt_bool, True, _('When negotiating an encrypted session, should Gajim assume you want your messages to be logged?')],
                     'send_idle_time': [ opt_bool, True ],
                     'roster_version': [opt_str, ''],
                     'subscription_request_msg': [opt_str, '', _('Message that is sent to contacts you want to add')],
diff --git a/gajim/config.py b/gajim/config.py
index 571064263..c85fc2f45 100644
--- a/gajim/config.py
+++ b/gajim/config.py
@@ -466,14 +466,6 @@ class PreferencesWindow:
         st = app.config.get('log_contact_status_changes')
         self.xml.get_object('log_show_changes_checkbutton').set_active(st)
 
-        # log encrypted chat sessions
-        w = self.xml.get_object('log_encrypted_chats_checkbutton')
-        st = self.get_per_account_option('log_encrypted_sessions')
-        if st == 'mixed':
-            w.set_inconsistent(True)
-        else:
-            w.set_active(st)
-
         # send os info
         w = self.xml.get_object('send_os_info_checkbutton')
         st = self.get_per_account_option('send_os_info')
@@ -1065,10 +1057,6 @@ class PreferencesWindow:
     def on_log_show_changes_checkbutton_toggled(self, widget):
         self.on_checkbutton_toggled(widget, 'log_contact_status_changes')
 
-    def on_log_encrypted_chats_checkbutton_toggled(self, widget):
-        widget.set_inconsistent(False)
-        self.on_per_account_checkbutton_toggled(widget, 'log_encrypted_sessions')
-
     def on_send_os_info_checkbutton_toggled(self, widget):
         widget.set_inconsistent(False)
         self.on_per_account_checkbutton_toggled(widget, 'send_os_info')
diff --git a/gajim/data/gui/preferences_window.ui b/gajim/data/gui/preferences_window.ui
index 6275c442c..d81245275 100644
--- a/gajim/data/gui/preferences_window.ui
+++ b/gajim/data/gui/preferences_window.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.2 -->
+<!-- Generated with glade 3.22.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkAdjustment" id="adjustment1">
@@ -197,6 +197,9 @@
     <property name="type_hint">dialog</property>
     <signal name="destroy" handler="on_preferences_window_destroy" swapped="no"/>
     <signal name="key-press-event" handler="on_preferences_window_key_press_event" swapped="no"/>
+    <child type="titlebar">
+      <placeholder/>
+    </child>
     <child>
       <object class="GtkBox" id="vbox13">
         <property name="visible">True</property>
@@ -2653,24 +2656,6 @@ to discover one from server.</property>
                             <property name="width">3</property>
                           </packing>
                         </child>
-                        <child>
-                          <object class="GtkCheckButton" id="log_encrypted_chats_checkbutton">
-                            <property name="label" translatable="yes">Log _encrypted chat session</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="tooltip_text" translatable="yes">If checked, Gajim will keep logs for encrypted messages. Please note that when using end-to-end encryption the remote party has to agree on logging, else the messages will not be logged.</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                            <signal name="toggled" handler="on_log_encrypted_chats_checkbutton_toggled" swapped="no"/>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                            <property name="width">3</property>
-                          </packing>
-                        </child>
                         <child>
                           <object class="GtkCheckButton" id="send_idle_time_checkbutton">
                             <property name="label" translatable="yes">Allow my _idle time to be sent</property>
@@ -2684,7 +2669,7 @@ to discover one from server.</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">4</property>
+                            <property name="top_attach">3</property>
                             <property name="width">3</property>
                           </packing>
                         </child>
@@ -2698,7 +2683,7 @@ to discover one from server.</property>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -2716,7 +2701,7 @@ to discover one from server.</property>
                           </object>
                           <packing>
                             <property name="left_attach">1</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                         <child>
@@ -2730,7 +2715,7 @@ to discover one from server.</property>
                           </object>
                           <packing>
                             <property name="left_attach">2</property>
-                            <property name="top_attach">5</property>
+                            <property name="top_attach">4</property>
                           </packing>
                         </child>
                       </object>
@@ -2888,8 +2873,5 @@ to discover one from server.</property>
         </child>
       </object>
     </child>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>