1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 1c1ff3b9..2115b23b 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -59,6 +59,8 @@ public class SettingsActivity extends XmppActivity implements
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences,
 			String name) {
+        // need to synchronize the settings class first
+        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
         switch (name) {
             case "resource":
                 String resource = preferences.getString("resource", "mobile")
@@ -75,7 +77,7 @@ public class SettingsActivity extends XmppActivity implements
             case "keep_foreground_service":
                 xmppConnectionService.toggleForegroundService();
                 break;
-			case "confirm_messages":
+			case "confirm_messages_list":
 				if (xmppConnectionServiceBound) {
 					for (Account account : xmppConnectionService.getAccounts()) {
 						if (!account.isOptionSet(Account.OPTION_DISABLED)) {
@@ -85,7 +87,6 @@ public class SettingsActivity extends XmppActivity implements
 				}
 				break;
         }
-        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
 	}
 
 }