diff --git a/app/src/main/java/eu/faircode/email/AdapterMessage.java b/app/src/main/java/eu/faircode/email/AdapterMessage.java
index a92902d3b7..777c80cd75 100644
--- a/app/src/main/java/eu/faircode/email/AdapterMessage.java
+++ b/app/src/main/java/eu/faircode/email/AdapterMessage.java
@@ -2764,7 +2764,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
                 @RequiresApi(api = Build.VERSION_CODES.Q)
                 private ConversationActions getConversationActions(TupleMessageEx message, Document document, Context context) {
                     SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
-                    boolean conversation_actions = prefs.getBoolean("conversation_actions", false);
+                    boolean conversation_actions = prefs.getBoolean("conversation_actions", Helper.isGoogle());
                     boolean conversation_actions_replies = prefs.getBoolean("conversation_actions_replies", true);
                     if (!conversation_actions)
                         return null;
diff --git a/app/src/main/java/eu/faircode/email/ApplicationEx.java b/app/src/main/java/eu/faircode/email/ApplicationEx.java
index e22befe978..6214896bf3 100644
--- a/app/src/main/java/eu/faircode/email/ApplicationEx.java
+++ b/app/src/main/java/eu/faircode/email/ApplicationEx.java
@@ -541,10 +541,8 @@ public class ApplicationEx extends Application
                 editor.putBoolean("discard_delete", false);
         } else if (version < 1753)
             repairFolders(context);
-        else if (version < 1771) {
-            if (!prefs.contains("conversation_actions"))
-                editor.putBoolean("conversation_actions", false);
-        }
+        else if (version < 1772)
+            editor.remove("conversation_actions");
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && !BuildConfig.DEBUG)
             editor.remove("background_service");
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
index 405ed3ad96..7bff40ef48 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsBehavior.java
@@ -495,7 +495,7 @@ public class FragmentOptionsBehavior extends FragmentBase implements SharedPrefe
 
         swSyncOnlaunch.setChecked(prefs.getBoolean("sync_on_launch", false));
         swDoubleBack.setChecked(prefs.getBoolean("double_back", false));
-        swConversationActions.setChecked(prefs.getBoolean("conversation_actions", false));
+        swConversationActions.setChecked(prefs.getBoolean("conversation_actions", Helper.isGoogle()));
         swConversationActionsReplies.setChecked(prefs.getBoolean("conversation_actions_replies", true));
         swConversationActionsReplies.setEnabled(swConversationActions.isChecked());
         swLanguageDetection.setChecked(prefs.getBoolean("language_detection", false));
diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java
index 6d27a50ad7..1a8ca03e30 100644
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@@ -963,6 +963,10 @@ public class Helper {
         return true;
     }
 
+    static boolean isGoogle() {
+        return "Google".equalsIgnoreCase(Build.MANUFACTURER);
+    }
+
     static boolean isSamsung() {
         return "Samsung".equalsIgnoreCase(Build.MANUFACTURER);
     }