diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 33932c11e0..9500dabc6c 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -123,6 +123,23 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private TextView tvFtsIndexed;
     private TextView tvFtsPro;
     private Spinner spLanguage;
+    private SwitchCompat swUpdates;
+    private TextView tvGithubPrivacy;
+    private ImageButton ibChannelUpdated;
+    private SwitchCompat swCheckWeekly;
+    private SwitchCompat swBeta;
+    private TextView tvBitBucketPrivacy;
+    private SwitchCompat swChangelog;
+    private SwitchCompat swAnnouncements;
+    private TextView tvAnnouncementsPrivacy;
+    private SwitchCompat swCrashReports;
+    private TextView tvUuid;
+    private Button btnReset;
+    private SwitchCompat swCleanupAttachments;
+    private Button btnCleanup;
+    private TextView tvLastCleanup;
+    private TextView tvSdcard;
+
     private SwitchCompat swLanguageTool;
     private TextView tvLanguageToolPrivacy;
     private SwitchCompat swLanguageToolAuto;
@@ -148,22 +165,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private TextView tvOpenAiTemperature;
     private SeekBar sbOpenAiTemperature;
     private ImageButton ibOpenAi;
-    private SwitchCompat swUpdates;
-    private TextView tvGithubPrivacy;
-    private ImageButton ibChannelUpdated;
-    private SwitchCompat swCheckWeekly;
-    private SwitchCompat swBeta;
-    private TextView tvBitBucketPrivacy;
-    private SwitchCompat swChangelog;
-    private SwitchCompat swAnnouncements;
-    private TextView tvAnnouncementsPrivacy;
-    private SwitchCompat swCrashReports;
-    private TextView tvUuid;
-    private Button btnReset;
-    private SwitchCompat swCleanupAttachments;
-    private Button btnCleanup;
-    private TextView tvLastCleanup;
-    private TextView tvSdcard;
 
     private CardView cardAdvanced;
     private SwitchCompat swWatchdog;
@@ -356,6 +357,23 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvFtsIndexed = view.findViewById(R.id.tvFtsIndexed);
         tvFtsPro = view.findViewById(R.id.tvFtsPro);
         spLanguage = view.findViewById(R.id.spLanguage);
+        swUpdates = view.findViewById(R.id.swUpdates);
+        tvGithubPrivacy = view.findViewById(R.id.tvGithubPrivacy);
+        ibChannelUpdated = view.findViewById(R.id.ibChannelUpdated);
+        swCheckWeekly = view.findViewById(R.id.swWeekly);
+        swBeta = view.findViewById(R.id.swBeta);
+        tvBitBucketPrivacy = view.findViewById(R.id.tvBitBucketPrivacy);
+        swChangelog = view.findViewById(R.id.swChangelog);
+        swAnnouncements = view.findViewById(R.id.swAnnouncements);
+        tvAnnouncementsPrivacy = view.findViewById(R.id.tvAnnouncementsPrivacy);
+        swCrashReports = view.findViewById(R.id.swCrashReports);
+        tvUuid = view.findViewById(R.id.tvUuid);
+        btnReset = view.findViewById(R.id.btnReset);
+        swCleanupAttachments = view.findViewById(R.id.swCleanupAttachments);
+        btnCleanup = view.findViewById(R.id.btnCleanup);
+        tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
+        tvSdcard = view.findViewById(R.id.tvSdcard);
+
         swLanguageTool = view.findViewById(R.id.swLanguageTool);
         tvLanguageToolPrivacy = view.findViewById(R.id.tvLanguageToolPrivacy);
         swLanguageToolAuto = view.findViewById(R.id.swLanguageToolAuto);
@@ -381,22 +399,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvOpenAiTemperature = view.findViewById(R.id.tvOpenAiTemperature);
         sbOpenAiTemperature = view.findViewById(R.id.sbOpenAiTemperature);
         ibOpenAi = view.findViewById(R.id.ibOpenAi);
-        swUpdates = view.findViewById(R.id.swUpdates);
-        tvGithubPrivacy = view.findViewById(R.id.tvGithubPrivacy);
-        ibChannelUpdated = view.findViewById(R.id.ibChannelUpdated);
-        swCheckWeekly = view.findViewById(R.id.swWeekly);
-        swBeta = view.findViewById(R.id.swBeta);
-        tvBitBucketPrivacy = view.findViewById(R.id.tvBitBucketPrivacy);
-        swChangelog = view.findViewById(R.id.swChangelog);
-        swAnnouncements = view.findViewById(R.id.swAnnouncements);
-        tvAnnouncementsPrivacy = view.findViewById(R.id.tvAnnouncementsPrivacy);
-        swCrashReports = view.findViewById(R.id.swCrashReports);
-        tvUuid = view.findViewById(R.id.tvUuid);
-        btnReset = view.findViewById(R.id.btnReset);
-        swCleanupAttachments = view.findViewById(R.id.swCleanupAttachments);
-        btnCleanup = view.findViewById(R.id.btnCleanup);
-        tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
-        tvSdcard = view.findViewById(R.id.tvSdcard);
 
         cardAdvanced = view.findViewById(R.id.cardAdvanced);
         swWatchdog = view.findViewById(R.id.swWatchdog);
@@ -683,6 +685,124 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
+        swUpdates.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("updates", checked).apply();
+                swCheckWeekly.setEnabled(checked);
+                swBeta.setEnabled(checked);
+                if (!checked) {
+                    NotificationManager nm =
+                            Helper.getSystemService(getContext(), NotificationManager.class);
+                    nm.cancel(NotificationHelper.NOTIFICATION_UPDATE);
+                }
+            }
+        });
+
+        tvGithubPrivacy.getPaint().setUnderlineText(true);
+        tvGithubPrivacy.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.view(v.getContext(), Uri.parse(Helper.GITHUB_PRIVACY_URI), true);
+            }
+        });
+
+        final Intent channelUpdate = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
+                .putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName())
+                .putExtra(Settings.EXTRA_CHANNEL_ID, "update");
+
+        ibChannelUpdated.setVisibility(View.GONE);
+        ibChannelUpdated.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                v.getContext().startActivity(channelUpdate);
+            }
+        });
+
+        swCheckWeekly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("weekly", checked).apply();
+            }
+        });
+
+        swBeta.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("beta", checked).apply();
+            }
+        });
+
+        tvBitBucketPrivacy.getPaint().setUnderlineText(true);
+        tvBitBucketPrivacy.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.view(v.getContext(), Uri.parse(Helper.BITBUCKET_PRIVACY_URI), true);
+            }
+        });
+
+        swChangelog.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("show_changelog", checked).apply();
+            }
+        });
+
+        swAnnouncements.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("announcements", checked).apply();
+            }
+        });
+
+        tvAnnouncementsPrivacy.getPaint().setUnderlineText(true);
+        tvAnnouncementsPrivacy.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.view(v.getContext(), Uri.parse(Helper.GITHUB_PRIVACY_URI), true);
+            }
+        });
+
+        swCrashReports.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit()
+                        .remove("crash_report_count")
+                        .putBoolean("crash_reports", checked)
+                        .apply();
+                Log.setCrashReporting(checked);
+            }
+        });
+
+        btnReset.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                onResetQuestions();
+            }
+        });
+
+        swCleanupAttachments.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
+                prefs.edit().putBoolean("cleanup_attachments", checked).apply();
+            }
+        });
+
+        btnCleanup.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                onCleanup();
+            }
+        });
+
+        tvSdcard.setPaintFlags(tvSdcard.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
+        tvSdcard.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Helper.viewFAQ(v.getContext(), 93);
+            }
+        });
+
         swLanguageTool.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -968,124 +1088,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
-        swUpdates.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("updates", checked).apply();
-                swCheckWeekly.setEnabled(checked);
-                swBeta.setEnabled(checked);
-                if (!checked) {
-                    NotificationManager nm =
-                            Helper.getSystemService(getContext(), NotificationManager.class);
-                    nm.cancel(NotificationHelper.NOTIFICATION_UPDATE);
-                }
-            }
-        });
-
-        tvGithubPrivacy.getPaint().setUnderlineText(true);
-        tvGithubPrivacy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.view(v.getContext(), Uri.parse(Helper.GITHUB_PRIVACY_URI), true);
-            }
-        });
-
-        final Intent channelUpdate = new Intent(Settings.ACTION_CHANNEL_NOTIFICATION_SETTINGS)
-                .putExtra(Settings.EXTRA_APP_PACKAGE, getContext().getPackageName())
-                .putExtra(Settings.EXTRA_CHANNEL_ID, "update");
-
-        ibChannelUpdated.setVisibility(View.GONE);
-        ibChannelUpdated.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                v.getContext().startActivity(channelUpdate);
-            }
-        });
-
-        swCheckWeekly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("weekly", checked).apply();
-            }
-        });
-
-        swBeta.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("beta", checked).apply();
-            }
-        });
-
-        tvBitBucketPrivacy.getPaint().setUnderlineText(true);
-        tvBitBucketPrivacy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.view(v.getContext(), Uri.parse(Helper.BITBUCKET_PRIVACY_URI), true);
-            }
-        });
-
-        swChangelog.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("show_changelog", checked).apply();
-            }
-        });
-
-        swAnnouncements.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("announcements", checked).apply();
-            }
-        });
-
-        tvAnnouncementsPrivacy.getPaint().setUnderlineText(true);
-        tvAnnouncementsPrivacy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.view(v.getContext(), Uri.parse(Helper.GITHUB_PRIVACY_URI), true);
-            }
-        });
-
-        swCrashReports.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit()
-                        .remove("crash_report_count")
-                        .putBoolean("crash_reports", checked)
-                        .apply();
-                Log.setCrashReporting(checked);
-            }
-        });
-
-        btnReset.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                onResetQuestions();
-            }
-        });
-
-        swCleanupAttachments.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
-            @Override
-            public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                prefs.edit().putBoolean("cleanup_attachments", checked).apply();
-            }
-        });
-
-        btnCleanup.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                onCleanup();
-            }
-        });
-
-        tvSdcard.setPaintFlags(tvSdcard.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
-        tvSdcard.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Helper.viewFAQ(v.getContext(), 93);
-            }
-        });
-
         swWatchdog.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@@ -2055,16 +2057,15 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             }
         });
 
-        grpVirusTotal.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
-        grpSend.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
-        grpOpenAi.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
-
         grpUpdates.setVisibility(!BuildConfig.DEBUG &&
                 (Helper.isPlayStoreInstall() || !Helper.hasValidFingerprint(getContext()))
                 ? View.GONE : View.VISIBLE);
         grpBitbucket.setVisibility(View.GONE);
         grpAnnouncements.setVisibility(TextUtils.isEmpty(BuildConfig.ANNOUNCEMENT_URI)
                 ? View.GONE : View.VISIBLE);
+        grpVirusTotal.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
+        grpSend.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
+        grpOpenAi.setVisibility(BuildConfig.PLAY_STORE_RELEASE ? View.GONE : View.VISIBLE);
         grpTest.setVisibility(BuildConfig.TEST_RELEASE ? View.VISIBLE : View.GONE);
 
         setLastCleanup(prefs.getLong("last_cleanup", -1));
@@ -2303,6 +2304,18 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                 selected = pos + 1;
         }
 
+        swUpdates.setChecked(prefs.getBoolean("updates", true));
+        swCheckWeekly.setChecked(prefs.getBoolean("weekly", Helper.hasPlayStore(getContext())));
+        swCheckWeekly.setEnabled(swUpdates.isChecked());
+        swBeta.setChecked(prefs.getBoolean("beta", false));
+        swBeta.setEnabled(swUpdates.isChecked());
+        swChangelog.setChecked(prefs.getBoolean("show_changelog", !BuildConfig.PLAY_STORE_RELEASE));
+        swAnnouncements.setChecked(prefs.getBoolean("announcements", true));
+        swExperiments.setChecked(prefs.getBoolean("experiments", false));
+        swCrashReports.setChecked(prefs.getBoolean("crash_reports", false));
+        tvUuid.setText(prefs.getString("uuid", null));
+        swCleanupAttachments.setChecked(prefs.getBoolean("cleanup_attachments", false));
+
         ArrayAdapter<String> adapter = new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_item, android.R.id.text1, display);
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         spLanguage.setAdapter(adapter);
@@ -2330,18 +2343,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvOpenAiTemperature.setText(getString(R.string.title_advanced_openai_temperature, NF.format(temperature)));
         sbOpenAiTemperature.setProgress(Math.round(temperature * 10));
 
-        swUpdates.setChecked(prefs.getBoolean("updates", true));
-        swCheckWeekly.setChecked(prefs.getBoolean("weekly", Helper.hasPlayStore(getContext())));
-        swCheckWeekly.setEnabled(swUpdates.isChecked());
-        swBeta.setChecked(prefs.getBoolean("beta", false));
-        swBeta.setEnabled(swUpdates.isChecked());
-        swChangelog.setChecked(prefs.getBoolean("show_changelog", !BuildConfig.PLAY_STORE_RELEASE));
-        swAnnouncements.setChecked(prefs.getBoolean("announcements", true));
-        swExperiments.setChecked(prefs.getBoolean("experiments", false));
-        swCrashReports.setChecked(prefs.getBoolean("crash_reports", false));
-        tvUuid.setText(prefs.getString("uuid", null));
-        swCleanupAttachments.setChecked(prefs.getBoolean("cleanup_attachments", false));
-
         swWatchdog.setChecked(prefs.getBoolean("watchdog", true));
         swMainLog.setChecked(prefs.getBoolean("main_log", true));
         swMainLogMem.setChecked(prefs.getBoolean("main_log_memory", false));
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index ecc7409d21..f2b5b72ba4 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -307,32 +307,24 @@
                     app:layout_constraintTop_toBottomOf="@id/spLanguage" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swLanguageTool"
+                    android:id="@+id/swUpdates"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_lt"
+                    android:checked="true"
+                    android:drawableStart="@drawable/twotone_get_app_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_updates"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvLanguageHint"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvLanguageToolHint"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="6dp"
-                    android:text="@string/title_advanced_privacy_risk"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?attr/colorWarning"
-                    app:drawableTint="?attr/colorWarning"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swLanguageTool" />
-
-                <TextView
-                    android:id="@+id/tvLanguageToolPrivacy"
+                    android:id="@+id/tvGithubPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
@@ -341,245 +333,289 @@
                     android:textColor="?android:attr/textColorLink"
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvLanguageToolHint" />
+                    app:layout_constraintTop_toBottomOf="@id/swUpdates" />
+
+                <ImageButton
+                    android:id="@+id/ibChannelUpdated"
+                    android:layout_width="24dp"
+                    android:layout_height="24dp"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/tvGithubPrivacy"
+                    app:srcCompat="@drawable/switch_off_on" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swLanguageToolAuto"
+                    android:id="@+id/swWeekly"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_lt_auto"
+                    android:text="@string/title_advanced_check_weekly"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvLanguageToolPrivacy"
+                    app:layout_constraintTop_toBottomOf="@id/ibChannelUpdated"
                     app:switchPadding="12dp" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swLanguageToolPicky"
+                    android:id="@+id/swBeta"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_translate_formal"
+                    android:text="@string/title_advanced_beta"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolAuto"
+                    app:layout_constraintTop_toBottomOf="@id/swWeekly"
                     app:switchPadding="12dp" />
 
-                <EditText
-                    android:id="@+id/etLanguageTool"
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/tvBitBucketPrivacy"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
+                    android:layout_marginStart="24dp"
                     android:layout_marginTop="12dp"
-                    android:inputType="textUri"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_privacy_policy"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolPicky" />
+                    app:layout_constraintTop_toBottomOf="@id/swBeta" />
 
-                <EditText
-                    android:id="@+id/etLanguageToolUser"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swChangelog"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:hint="@string/title_advanced_lt_user"
-                    android:inputType="textEmailAddress"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:drawableStart="@drawable/twotone_list_alt_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_changelog"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/etLanguageTool" />
+                    app:layout_constraintTop_toBottomOf="@id/tvBitBucketPrivacy"
+                    app:switchPadding="12dp" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/tilLanguageToolKey"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swAnnouncements"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    app:endIconMode="password_toggle"
+                    android:checked="true"
+                    android:drawableStart="@drawable/baseline_campaign_white_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_announcements"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/etLanguageToolUser">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:autofillHints="password"
-                        android:hint="@string/title_advanced_lt_key"
-                        android:inputType="textPassword"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-                </com.google.android.material.textfield.TextInputLayout>
+                    app:layout_constraintTop_toBottomOf="@id/swChangelog"
+                    app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvLanguageTool"
+                    android:id="@+id/tvAnnouncementsPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:autoLink="web"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
-                    android:text="https://languagetool.org"
+                    android:text="@string/title_privacy_policy"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     android:textColor="?android:attr/textColorLink"
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tilLanguageToolKey" />
-
-                <ImageButton
-                    android:id="@+id/ibLanguageTool"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:contentDescription="@string/title_info"
-                    android:tooltipText="@string/title_info"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvLanguageTool"
-                    app:srcCompat="@drawable/twotone_info_24" />
+                    app:layout_constraintTop_toBottomOf="@id/swAnnouncements" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swDeepL"
+                    android:id="@+id/swCrashReports"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_deepl"
+                    android:drawableStart="@drawable/twotone_report_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_crash_reports"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibLanguageTool"
+                    app:layout_constraintTop_toBottomOf="@id/tvAnnouncementsPrivacy"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvDeepLPrivacy"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/tvUuid"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_privacy_policy"
+                    android:layout_marginTop="6dp"
+                    android:layout_marginEnd="48dp"
+                    android:fontFamily="monospace"
+                    android:selectAllOnFocus="true"
+                    android:text="UUID"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:drawableTint="?android:attr/textColorLink"
+                    android:textIsSelectable="true"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swDeepL" />
+                    app:layout_constraintTop_toBottomOf="@id/swCrashReports" />
 
-                <ImageButton
-                    android:id="@+id/ibDeepL"
+                <Button
+                    android:id="@+id/btnReset"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:contentDescription="@string/title_translate_configure"
-                    android:tooltipText="@string/title_translate_configure"
+                    android:drawableEnd="@drawable/twotone_restart_alt_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_setup_reset_questions"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvDeepLPrivacy"
-                    app:srcCompat="@drawable/twotone_settings_24" />
+                    app:layout_constraintTop_toBottomOf="@id/tvUuid" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swVirusTotal"
+                    android:id="@+id/swCleanupAttachments"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_virus_total"
+                    android:text="@string/title_advanced_cleanup_attachments"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibDeepL"
+                    app:layout_constraintTop_toBottomOf="@id/btnReset"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvVirusTotalPrivacy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_privacy_policy"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:drawableTint="?android:attr/textColorLink"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swVirusTotal" />
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/tilVirusTotal"
+                    android:id="@+id/tvCleanupAttachmentsHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    app:endIconMode="password_toggle"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_cleanup_attachments_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvVirusTotalPrivacy">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:autofillHints="password"
-                        android:hint="API key"
-                        android:inputType="textPassword"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-                </com.google.android.material.textfield.TextInputLayout>
+                    app:layout_constraintTop_toBottomOf="@id/swCleanupAttachments" />
 
-                <ImageButton
-                    android:id="@+id/ibVirusTotal"
+                <Button
+                    android:id="@+id/btnCleanup"
+                    style="?android:attr/buttonStyleSmall"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:contentDescription="@string/title_info"
-                    android:tooltipText="@string/title_info"
+                    android:drawableEnd="@drawable/twotone_delete_24"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_cleanup"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tilVirusTotal"
-                    app:srcCompat="@drawable/twotone_info_24" />
+                    app:layout_constraintTop_toBottomOf="@id/tvCleanupAttachmentsHint" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swSend"
+                <TextView
+                    android:id="@+id/tvCleanupHint"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_send"
+                    android:layout_marginEnd="48dp"
+                    android:text="@string/title_advanced_cleanup_hint"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textStyle="italic"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibVirusTotal"
-                    app:switchPadding="12dp" />
+                    app:layout_constraintTop_toBottomOf="@id/btnCleanup" />
 
-                <EditText
-                    android:id="@+id/etSend"
+                <TextView
+                    android:id="@+id/tvLastCleanup"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:hint="wss://send.vis.ee/api/ws"
-                    android:inputType="textUri"
+                    android:text="@string/title_advanced_last_cleanup"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swSend" />
+                    app:layout_constraintTop_toBottomOf="@id/tvCleanupHint" />
 
-                <ImageButton
-                    android:id="@+id/ibSend"
+                <TextView
+                    android:id="@+id/tvSdcard"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:contentDescription="@string/title_info"
-                    android:tooltipText="@string/title_info"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:text="@string/title_advanced_sdcard"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/etSend"
-                    app:srcCompat="@drawable/twotone_info_24" />
+                    app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />
+
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpUpdates"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="swUpdates,tvGithubPrivacy,swWeekly" />
+
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpBitbucket"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="swBeta,tvBitBucketPrivacy" />
+
+                <androidx.constraintlayout.widget.Group
+                    android:id="@+id/grpAnnouncements"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:constraint_referenced_ids="swAnnouncements,tvAnnouncementsPrivacy" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:id="@+id/cardIntegration"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="3dp"
+            android:layout_marginTop="12dp"
+            app:cardBackgroundColor="?attr/colorCardBackground"
+            app:cardCornerRadius="6dp"
+            app:cardElevation="0dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/cardGeneral">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingHorizontal="6dp"
+                android:paddingVertical="12dp">
+
+                <TextView
+                    android:id="@+id/tvCaptionIntegration"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/title_advanced_caption_integrations"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Large"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swOpenAi"
+                    android:id="@+id/swLanguageTool"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_openai"
+                    android:text="@string/title_advanced_lt"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibSend"
+                    app:layout_constraintTop_toBottomOf="@id/tvCaptionIntegration"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvOpenAiPrivacy"
+                    android:id="@+id/tvLanguageToolHint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_advanced_privacy_risk"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?attr/colorWarning"
+                    app:drawableTint="?attr/colorWarning"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swLanguageTool" />
+
+                <TextView
+                    android:id="@+id/tvLanguageToolPrivacy"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
@@ -588,103 +624,130 @@
                     android:textColor="?android:attr/textColorLink"
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swOpenAi" />
+                    app:layout_constraintTop_toBottomOf="@id/tvLanguageToolHint" />
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/tilOpenAi"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swLanguageToolAuto"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    app:endIconMode="password_toggle"
+                    android:text="@string/title_advanced_lt_auto"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvOpenAiPrivacy">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:autofillHints="password"
-                        android:hint="API key"
-                        android:inputType="textPassword"
-                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
-                </com.google.android.material.textfield.TextInputLayout>
+                    app:layout_constraintTop_toBottomOf="@id/tvLanguageToolPrivacy"
+                    app:switchPadding="12dp" />
 
-                <TextView
-                    android:id="@+id/tvOpenAiModel"
-                    android:layout_width="wrap_content"
+                <androidx.appcompat.widget.SwitchCompat
+                    android:id="@+id/swLanguageToolPicky"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_openai_model"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:text="@string/title_translate_formal"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tilOpenAi" />
+                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolAuto"
+                    app:switchPadding="12dp" />
 
                 <EditText
-                    android:id="@+id/etOpenAiModel"
+                    android:id="@+id/etLanguageTool"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
-                    android:hint="gpt-3.5-turbo"
-                    android:inputType="text"
+                    android:layout_marginTop="12dp"
+                    android:inputType="textUri"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvOpenAiModel" />
+                    app:layout_constraintTop_toBottomOf="@id/swLanguageToolPicky" />
 
-                <TextView
-                    android:id="@+id/tvOpenAiTemperature"
+                <EditText
+                    android:id="@+id/etLanguageToolUser"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:layout_marginEnd="48dp"
-                    android:text="@string/title_advanced_openai_temperature"
+                    android:hint="@string/title_advanced_lt_user"
+                    android:inputType="textEmailAddress"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/etOpenAiModel" />
+                    app:layout_constraintTop_toBottomOf="@id/etLanguageTool" />
 
-                <SeekBar
-                    android:id="@+id/sbOpenAiTemperature"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/tilLanguageToolKey"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
-                    android:max="20"
-                    android:min="0"
-                    android:progress="10"
+                    android:layout_marginTop="12dp"
+                    app:endIconMode="password_toggle"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvOpenAiTemperature" />
+                    app:layout_constraintTop_toBottomOf="@+id/etLanguageToolUser">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:autofillHints="password"
+                        android:hint="@string/title_advanced_lt_key"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <TextView
+                    android:id="@+id/tvLanguageTool"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:autoLink="web"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
+                    android:drawablePadding="6dp"
+                    android:text="https://languagetool.org"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tilLanguageToolKey" />
 
                 <ImageButton
-                    android:id="@+id/ibOpenAi"
+                    android:id="@+id/ibLanguageTool"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:contentDescription="@string/title_info"
                     android:tooltipText="@string/title_info"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/sbOpenAiTemperature"
+                    app:layout_constraintTop_toBottomOf="@id/tvLanguageTool"
                     app:srcCompat="@drawable/twotone_info_24" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swUpdates"
+                    android:id="@+id/swDeepL"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:checked="true"
-                    android:drawableStart="@drawable/twotone_get_app_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_updates"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/title_advanced_deepl"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibOpenAi"
+                    app:layout_constraintTop_toBottomOf="@id/ibLanguageTool"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvGithubPrivacy"
+                    android:id="@+id/tvDeepLHint"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_advanced_privacy_risk"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?attr/colorWarning"
+                    app:drawableTint="?attr/colorWarning"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swDeepL" />
+
+                <TextView
+                    android:id="@+id/tvDeepLPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
@@ -696,48 +759,48 @@
                     android:textColor="?android:attr/textColorLink"
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swUpdates" />
+                    app:layout_constraintTop_toBottomOf="@id/tvDeepLHint" />
 
                 <ImageButton
-                    android:id="@+id/ibChannelUpdated"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:id="@+id/ibDeepL"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:background="?android:attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/title_translate_configure"
+                    android:tooltipText="@string/title_translate_configure"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvGithubPrivacy"
-                    app:srcCompat="@drawable/switch_off_on" />
+                    app:layout_constraintTop_toBottomOf="@id/tvDeepLPrivacy"
+                    app:srcCompat="@drawable/twotone_settings_24" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swWeekly"
+                    android:id="@+id/swVirusTotal"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_check_weekly"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/title_advanced_virus_total"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/ibChannelUpdated"
+                    app:layout_constraintTop_toBottomOf="@id/ibDeepL"
                     app:switchPadding="12dp" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swBeta"
-                    android:layout_width="0dp"
+                <TextView
+                    android:id="@+id/tvVirusTotalHint"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_beta"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_marginTop="6dp"
+                    android:text="@string/title_advanced_privacy_risk"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?attr/colorWarning"
+                    app:drawableTint="?attr/colorWarning"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swWeekly"
-                    app:switchPadding="12dp" />
+                    app:layout_constraintTop_toBottomOf="@id/swVirusTotal" />
 
                 <TextView
-                    android:id="@+id/tvBitBucketPrivacy"
+                    android:id="@+id/tvVirusTotalPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
                     android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
@@ -746,166 +809,198 @@
                     android:textColor="?android:attr/textColorLink"
                     app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swBeta" />
+                    app:layout_constraintTop_toBottomOf="@id/tvVirusTotalHint" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swChangelog"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/tilVirusTotal"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:drawableStart="@drawable/twotone_list_alt_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_changelog"
+                    app:endIconMode="password_toggle"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvBitBucketPrivacy"
-                    app:switchPadding="12dp" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvVirusTotalPrivacy">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:autofillHints="password"
+                        android:hint="API key"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                </com.google.android.material.textfield.TextInputLayout>
+
+                <ImageButton
+                    android:id="@+id/ibVirusTotal"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:contentDescription="@string/title_info"
+                    android:tooltipText="@string/title_info"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tilVirusTotal"
+                    app:srcCompat="@drawable/twotone_info_24" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swAnnouncements"
+                    android:id="@+id/swSend"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:checked="true"
-                    android:drawableStart="@drawable/baseline_campaign_white_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_announcements"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/title_advanced_send"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swChangelog"
+                    app:layout_constraintTop_toBottomOf="@id/ibVirusTotal"
                     app:switchPadding="12dp" />
 
-                <TextView
-                    android:id="@+id/tvAnnouncementsPrivacy"
+                <EditText
+                    android:id="@+id/etSend"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:hint="wss://send.vis.ee/api/ws"
+                    android:inputType="textUri"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/swSend" />
+
+                <ImageButton
+                    android:id="@+id/ibSend"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_privacy_policy"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:drawableTint="?android:attr/textColorLink"
+                    android:contentDescription="@string/title_info"
+                    android:tooltipText="@string/title_info"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swAnnouncements" />
+                    app:layout_constraintTop_toBottomOf="@id/etSend"
+                    app:srcCompat="@drawable/twotone_info_24" />
 
                 <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swCrashReports"
+                    android:id="@+id/swOpenAi"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableStart="@drawable/twotone_report_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_crash_reports"
+                    android:layout_marginTop="24dp"
+                    android:text="@string/title_advanced_openai"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvAnnouncementsPrivacy"
+                    app:layout_constraintTop_toBottomOf="@id/ibSend"
                     app:switchPadding="12dp" />
 
                 <TextView
-                    android:id="@+id/tvUuid"
-                    android:layout_width="0dp"
+                    android:id="@+id/tvOpenAiHint"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="6dp"
-                    android:layout_marginEnd="48dp"
-                    android:fontFamily="monospace"
-                    android:selectAllOnFocus="true"
-                    android:text="UUID"
+                    android:text="@string/title_advanced_privacy_risk"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textIsSelectable="true"
-                    app:layout_constraintEnd_toEndOf="parent"
+                    android:textColor="?attr/colorWarning"
+                    app:drawableTint="?attr/colorWarning"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swCrashReports" />
+                    app:layout_constraintTop_toBottomOf="@id/swOpenAi" />
 
-                <Button
-                    android:id="@+id/btnReset"
-                    style="?android:attr/buttonStyleSmall"
+                <TextView
+                    android:id="@+id/tvOpenAiPrivacy"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_restart_alt_24"
+                    android:drawableEnd="@drawable/twotone_open_in_new_12"
                     android:drawablePadding="6dp"
-                    android:text="@string/title_setup_reset_questions"
+                    android:text="@string/title_privacy_policy"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textColor="?android:attr/textColorLink"
+                    app:drawableTint="?android:attr/textColorLink"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvUuid" />
+                    app:layout_constraintTop_toBottomOf="@id/tvOpenAiHint" />
 
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/swCleanupAttachments"
+                <com.google.android.material.textfield.TextInputLayout
+                    android:id="@+id/tilOpenAi"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:text="@string/title_advanced_cleanup_attachments"
+                    app:endIconMode="password_toggle"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnReset"
-                    app:switchPadding="12dp" />
+                    app:layout_constraintTop_toBottomOf="@+id/tvOpenAiPrivacy">
+
+                    <com.google.android.material.textfield.TextInputEditText
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:autofillHints="password"
+                        android:hint="API key"
+                        android:inputType="textPassword"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Small" />
+                </com.google.android.material.textfield.TextInputLayout>
 
                 <TextView
-                    android:id="@+id/tvCleanupAttachmentsHint"
-                    android:layout_width="0dp"
+                    android:id="@+id/tvOpenAiModel"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="48dp"
-                    android:text="@string/title_advanced_cleanup_attachments_hint"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
+                    android:text="@string/title_advanced_openai_model"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="italic"
-                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/swCleanupAttachments" />
+                    app:layout_constraintTop_toBottomOf="@id/tilOpenAi" />
 
-                <Button
-                    android:id="@+id/btnCleanup"
-                    style="?android:attr/buttonStyleSmall"
-                    android:layout_width="wrap_content"
+                <EditText
+                    android:id="@+id/etOpenAiModel"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_delete_24"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_cleanup"
+                    android:layout_marginStart="12dp"
+                    android:hint="gpt-3.5-turbo"
+                    android:inputType="text"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvCleanupAttachmentsHint" />
+                    app:layout_constraintTop_toBottomOf="@id/tvOpenAiModel" />
 
                 <TextView
-                    android:id="@+id/tvCleanupHint"
+                    android:id="@+id/tvOpenAiTemperature"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:layout_marginTop="12dp"
                     android:layout_marginEnd="48dp"
-                    android:text="@string/title_advanced_cleanup_hint"
+                    android:text="@string/title_advanced_openai_temperature"
                     android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textStyle="italic"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/btnCleanup" />
+                    app:layout_constraintTop_toBottomOf="@id/etOpenAiModel" />
 
-                <TextView
-                    android:id="@+id/tvLastCleanup"
+                <SeekBar
+                    android:id="@+id/sbOpenAiTemperature"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/title_advanced_last_cleanup"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:layout_marginStart="12dp"
+                    android:max="20"
+                    android:min="0"
+                    android:progress="10"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvCleanupHint" />
+                    app:layout_constraintTop_toBottomOf="@id/tvOpenAiTemperature" />
 
-                <TextView
-                    android:id="@+id/tvSdcard"
+                <ImageButton
+                    android:id="@+id/ibOpenAi"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
                     android:layout_marginTop="12dp"
-                    android:drawableEnd="@drawable/twotone_open_in_new_12"
-                    android:drawablePadding="6dp"
-                    android:text="@string/title_advanced_sdcard"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
-                    android:textColor="?android:attr/textColorLink"
-                    app:drawableTint="?android:attr/textColorLink"
+                    android:contentDescription="@string/title_info"
+                    android:tooltipText="@string/title_info"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />
+                    app:layout_constraintTop_toBottomOf="@id/sbOpenAiTemperature"
+                    app:srcCompat="@drawable/twotone_info_24" />
 
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/grpVirusTotal"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="swVirusTotal,tvVirusTotalPrivacy,tilVirusTotal,ibVirusTotal" />
+                    app:constraint_referenced_ids="swVirusTotal,tvVirusTotalHint,tvVirusTotalPrivacy,tilVirusTotal,ibVirusTotal" />
 
                 <androidx.constraintlayout.widget.Group
                     android:id="@+id/grpSend"
@@ -917,25 +1012,8 @@
                     android:id="@+id/grpOpenAi"
                     android:layout_width="0dp"
                     android:layout_height="0dp"
-                    app:constraint_referenced_ids="swOpenAi,tvOpenAiPrivacy,tilOpenAi,ibOpenAi,etOpenAiModel,tvOpenAiTemperature,sbOpenAiTemperature" />
-
-                <androidx.constraintlayout.widget.Group
-                    android:id="@+id/grpUpdates"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:constraint_referenced_ids="swUpdates,tvGithubPrivacy,swWeekly" />
-
-                <androidx.constraintlayout.widget.Group
-                    android:id="@+id/grpBitbucket"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:constraint_referenced_ids="swBeta,tvBitBucketPrivacy" />
+                    app:constraint_referenced_ids="swOpenAi,tvOpenAiHint,tvOpenAiPrivacy,tilOpenAi,ibOpenAi,etOpenAiModel,tvOpenAiTemperature,sbOpenAiTemperature" />
 
-                <androidx.constraintlayout.widget.Group
-                    android:id="@+id/grpAnnouncements"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:constraint_referenced_ids="swAnnouncements,tvAnnouncementsPrivacy" />
             </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.cardview.widget.CardView>
 
@@ -950,7 +1028,7 @@
             app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/cardGeneral">
+            app:layout_constraintTop_toBottomOf="@id/cardIntegration">
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2daed6ec39..58ce0c1890 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -507,6 +507,7 @@
     <string name="title_advanced_caption_message_body">Message body</string>
     <string name="title_advanced_caption_file">File</string>
     <string name="title_advanced_caption_cloud" translatable="false">Cloud</string>
+    <string name="title_advanced_caption_integrations">Integrations</string>
     <string name="title_advanced_caption_debug" translatable="false">Debug</string>
 
     <string name="title_advanced_portrait">Portrait mode</string>