diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3b594bafea..2c35544959 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -153,21 +153,18 @@
 
         <activity
             android:name=".ActivitySetup"
-            android:configChanges="uiMode"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain" />
 
         <activity
             android:name=".ActivitySignature"
-            android:configChanges="uiMode"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivitySetup" />
 
         <activity
             android:name=".ActivityWidget"
-            android:configChanges="uiMode"
             android:exported="true">
 
             <intent-filter>
@@ -177,7 +174,6 @@
 
         <activity
             android:name=".ActivityWidgetSync"
-            android:configChanges="uiMode"
             android:exported="true">
 
             <intent-filter>
@@ -187,7 +183,6 @@
 
         <activity
             android:name=".ActivityWidgetUnified"
-            android:configChanges="uiMode"
             android:exported="true">
 
             <intent-filter>
@@ -197,7 +192,6 @@
 
         <activity
             android:name=".ActivityView"
-            android:configChanges="uiMode"
             android:exported="false"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityMain" />
@@ -221,7 +215,6 @@
 
         <activity
             android:name=".ActivityCompose"
-            android:configChanges="uiMode"
             android:exported="true"
             android:launchMode="singleTask"
             android:parentActivityName=".ActivityView">
@@ -251,7 +244,6 @@
 
         <activity
             android:name=".ActivityEML"
-            android:configChanges="uiMode"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask">
@@ -286,7 +278,6 @@
 
         <activity
             android:name=".ActivityDSN"
-            android:configChanges="uiMode"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask">
@@ -307,7 +298,6 @@
 
         <activity
             android:name=".ActivityBilling"
-            android:configChanges="uiMode"
             android:exported="false"
             android:icon="@mipmap/ic_launcher"
             android:launchMode="singleTask" />
diff --git a/app/src/main/java/eu/faircode/email/ActivityBase.java b/app/src/main/java/eu/faircode/email/ActivityBase.java
index 4867a4c992..c1a9e6dd45 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBase.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBase.java
@@ -65,7 +65,6 @@ import java.util.Map;
 
 abstract class ActivityBase extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
     private Context originalContext;
-    private int themeId;
     private boolean visible;
     private boolean contacts;
     private List<IKeyPressedListener> keyPressedListeners = new ArrayList<>();
@@ -99,8 +98,7 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
             getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE);
 
         if (!this.getClass().equals(ActivityMain.class)) {
-            themeId = FragmentDialogTheme.getTheme(this);
-            setTheme(themeId);
+            setTheme(FragmentDialogTheme.getTheme(this));
 
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
                 boolean dark = Helper.isDarkTheme(this);
@@ -194,10 +192,6 @@ abstract class ActivityBase extends AppCompatActivity implements SharedPreferenc
     public void onConfigurationChanged(Configuration newConfig) {
         Log.d("Config " + this.getClass().getName());
         super.onConfigurationChanged(newConfig);
-
-        if (!this.getClass().equals(ActivityMain.class) &&
-                themeId != FragmentDialogTheme.getTheme(this))
-            recreate();
     }
 
     @Override