diff --git a/gajim/gtk/mam_preferences.py b/gajim/gtk/mam_preferences.py
index f4b812be08737f2d385528eb3c6e2bf12375d38c..3281a7555ad7b45e9fa0359e0b0a1bd58c4d7dbb 100644
--- a/gajim/gtk/mam_preferences.py
+++ b/gajim/gtk/mam_preferences.py
@@ -78,10 +78,10 @@ def _mam_prefs_received(self, result):
         self._ui.default_combo.set_active_id(result.default)
         self._ui.preferences_store.clear()
         for jid in result.always:
-            self._ui.preferences_store.append((str(jid), 'Always'))
+            self._ui.preferences_store.append((str(jid), True))
 
         for jid in result.never:
-            self._ui.preferences_store.append((str(jid), 'Never'))
+            self._ui.preferences_store.append((str(jid), False))
 
     @ensure_not_destroyed
     def _mam_prefs_saved(self, result):
@@ -137,8 +137,8 @@ def _on_save(self, _button):
         never = []
         default = self._ui.default_combo.get_active_id()
         for item in self._ui.preferences_store:
-            jid, type_ = item
-            if type_ == 'Always':
+            jid, archive = item
+            if archive:
                 always.append(jid)
             else:
                 never.append(jid)