diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 746828e198..9e5776b0f7 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -150,6 +150,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private TextView tvMemoryUsage;
     private TextView tvStorageUsage;
     private TextView tvSuffixes;
+    private TextView tvAndroidId;
     private TextView tvFingerprint;
     private TextView tvCursorWindow;
     private Button btnGC;
@@ -276,6 +277,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvMemoryUsage = view.findViewById(R.id.tvMemoryUsage);
         tvStorageUsage = view.findViewById(R.id.tvStorageUsage);
         tvSuffixes = view.findViewById(R.id.tvSuffixes);
+        tvAndroidId = view.findViewById(R.id.tvAndroidId);
         tvFingerprint = view.findViewById(R.id.tvFingerprint);
         tvCursorWindow = view.findViewById(R.id.tvCursorWindow);
         btnGC = view.findViewById(R.id.btnGC);
@@ -1270,6 +1272,19 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                 class_large_mb + " MB",
                 Helper.humanReadableByteCount(mi.totalMem)));
 
+        String android_id;
+        try {
+            android_id = Settings.Secure.getString(
+                    getContext().getContentResolver(),
+                    Settings.Secure.ANDROID_ID);
+            if (android_id == null)
+                android_id = "<null>";
+        } catch (Throwable ex) {
+            Log.w(ex);
+            android_id = "?";
+        }
+        tvAndroidId.setText(getString(R.string.title_advanced_android_id, android_id));
+
         tvFingerprint.setText(Helper.getFingerprint(getContext()));
 
         int cursorWindowSize = -1;
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 64a5bd9f7c..d9f113f460 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -912,6 +912,17 @@
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/tvCursorWindow" />
 
+                <eu.faircode.email.FixedTextView
+                    android:id="@+id/tvAndroidId"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/title_advanced_android_id"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Small"
+                    android:textIsSelectable="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tvSuffixes" />
+
                 <eu.faircode.email.FixedTextView
                     android:id="@+id/tvFingerprint"
                     android:layout_width="0dp"
@@ -922,7 +933,7 @@
                     android:textIsSelectable="true"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@id/tvSuffixes" />
+                    app:layout_constraintTop_toBottomOf="@id/tvAndroidId" />
 
                 <Button
                     android:id="@+id/btnGC"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index acfb7b00c3..a9587a6f47 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -672,6 +672,7 @@
     <string name="title_advanced_storage_usage" translatable="false">Storage space: %1$s/%2$s App: %3$s</string>
     <string name="title_advanced_cursor_window" translatable="false">Cursor window size: %1$s</string>
     <string name="title_advanced_suffixes" translatable="false">Public suffix list: %1$d</string>
+    <string name="title_advanced_android_id" translatable="false">Android ID: %1$s</string>
     <string name="title_advanced_gc" translatable="false">GC</string>
     <string name="title_advanced_charsets" translatable="false">Charsets</string>
     <string name="title_advanced_ciphers" translatable="false">Ciphers</string>