diff --git a/app/src/amazon/AndroidManifest.xml b/app/src/amazon/AndroidManifest.xml
index f9d21261af..6537953502 100644
--- a/app/src/amazon/AndroidManifest.xml
+++ b/app/src/amazon/AndroidManifest.xml
@@ -485,7 +485,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:enabled="false"
             android:description="@string/title_advanced_dmarc_viewer"
             android:exported="true"
diff --git a/app/src/debug/AndroidManifest.xml b/app/src/debug/AndroidManifest.xml
index e6bc1ab954..7e46b89ae3 100644
--- a/app/src/debug/AndroidManifest.xml
+++ b/app/src/debug/AndroidManifest.xml
@@ -492,7 +492,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:description="@string/title_advanced_dmarc_viewer"
             android:enabled="true"
             android:exported="true"
diff --git a/app/src/fdroid/AndroidManifest.xml b/app/src/fdroid/AndroidManifest.xml
index 0be1abcfc5..febb50e2d9 100644
--- a/app/src/fdroid/AndroidManifest.xml
+++ b/app/src/fdroid/AndroidManifest.xml
@@ -491,7 +491,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:enabled="true"
             android:description="@string/title_advanced_dmarc_viewer"
             android:exported="true"
diff --git a/app/src/github/AndroidManifest.xml b/app/src/github/AndroidManifest.xml
index 3e9db62678..bdb24da9cf 100644
--- a/app/src/github/AndroidManifest.xml
+++ b/app/src/github/AndroidManifest.xml
@@ -491,7 +491,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:description="@string/title_advanced_dmarc_viewer"
             android:enabled="true"
             android:exported="true"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ddf0f639bf..ac487da36a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -487,7 +487,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:description="@string/title_advanced_dmarc_viewer"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
diff --git a/app/src/main/java/eu/faircode/email/ActivityDmarc.java b/app/src/main/java/eu/faircode/email/ActivityDMARC.java
similarity index 99%
rename from app/src/main/java/eu/faircode/email/ActivityDmarc.java
rename to app/src/main/java/eu/faircode/email/ActivityDMARC.java
index 7ecb93b95d..981988b938 100644
--- a/app/src/main/java/eu/faircode/email/ActivityDmarc.java
+++ b/app/src/main/java/eu/faircode/email/ActivityDMARC.java
@@ -47,7 +47,6 @@ import org.xmlpull.v1.XmlPullParserFactory;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringReader;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.nio.charset.StandardCharsets;
@@ -57,7 +56,7 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 
-public class ActivityDmarc extends ActivityBase {
+public class ActivityDMARC extends ActivityBase {
     private TextView tvDmarc;
     private ContentLoadingProgressBar pbWait;
     private Group grpReady;
@@ -154,7 +153,7 @@ public class ActivityDmarc extends ActivityBase {
             @Override
             protected void onException(Bundle args, @NonNull Throwable ex) {
                 if (ex instanceof NoStreamException)
-                    ((NoStreamException) ex).report(ActivityDmarc.this);
+                    ((NoStreamException) ex).report(ActivityDMARC.this);
                 else
                     tvDmarc.setText(ex + "\n" + android.util.Log.getStackTraceString(ex));
                 grpReady.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 108705700e..cd82d75236 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -1634,7 +1634,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swDmarcViewer.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
-                Helper.enableComponent(compoundButton.getContext(), ActivityDmarc.class, checked);
+                Helper.enableComponent(compoundButton.getContext(), ActivityDMARC.class, checked);
             }
         });
 
@@ -2375,7 +2375,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
             swAdjacentPortrait.setChecked(prefs.getBoolean("adjacent_portrait", false));
             swAdjacentLandscape.setChecked(prefs.getBoolean("adjacent_landscape", false));
             swDeleteConfirmation.setChecked(prefs.getBoolean("delete_confirmation", true));
-            swDmarcViewer.setChecked(Helper.isComponentEnabled(getContext(), ActivityDmarc.class));
+            swDmarcViewer.setChecked(Helper.isComponentEnabled(getContext(), ActivityDMARC.class));
             etKeywords.setText(prefs.getString("global_keywords", null));
             swTestIab.setChecked(prefs.getBoolean("test_iab", false));
 
diff --git a/app/src/play/AndroidManifest.xml b/app/src/play/AndroidManifest.xml
index 6ae6539a57..fe9da6c4e7 100644
--- a/app/src/play/AndroidManifest.xml
+++ b/app/src/play/AndroidManifest.xml
@@ -485,7 +485,7 @@
             android:resizeableActivity="true" />
 
         <activity
-            android:name=".ActivityDmarc"
+            android:name=".ActivityDMARC"
             android:enabled="false"
             android:description="@string/title_advanced_dmarc_viewer"
             android:exported="true"