diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 9a4011e0fd..d5d6728ad6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -50,15 +50,16 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     private SwitchCompat swExperiments;
     private TextView tvExperimentsHint;
     private SwitchCompat swCrashReports;
+    private TextView tvUuid;
     private SwitchCompat swDebug;
     private Button btnReset;
     private Button btnCleanup;
+    private TextView tvLastCleanup;
 
     private TextView tvProcessors;
     private TextView tvMemoryClass;
     private TextView tvStorageSpace;
-    private TextView tvLastCleanup;
-    private TextView tvUuid;
+    private TextView tvFingerprint;
 
     private Group grpDebug;
 
@@ -88,15 +89,16 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         swExperiments = view.findViewById(R.id.swExperiments);
         tvExperimentsHint = view.findViewById(R.id.tvExperimentsHint);
         swCrashReports = view.findViewById(R.id.swCrashReports);
+        tvUuid = view.findViewById(R.id.tvUuid);
         swDebug = view.findViewById(R.id.swDebug);
         btnReset = view.findViewById(R.id.btnReset);
         btnCleanup = view.findViewById(R.id.btnCleanup);
+        tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
 
         tvProcessors = view.findViewById(R.id.tvProcessors);
         tvMemoryClass = view.findViewById(R.id.tvMemoryClass);
         tvStorageSpace = view.findViewById(R.id.tvStorageSpace);
-        tvLastCleanup = view.findViewById(R.id.tvLastCleanup);
-        tvUuid = view.findViewById(R.id.tvUuid);
+        tvFingerprint = view.findViewById(R.id.tvFingerprint);
 
         grpDebug = view.findViewById(R.id.grpDebug);
 
@@ -295,6 +297,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
 
         tvStorageSpace.setText(getString(R.string.title_advanced_storage_space,
                 Helper.humanReadableByteCount(Helper.getStorageSpace(), true)));
+        tvFingerprint.setText(Helper.getFingerprint(getContext()));
 
         grpDebug.setVisibility(swDebug.isChecked() || BuildConfig.DEBUG ? View.VISIBLE : View.GONE);
     }
diff --git a/app/src/main/res/layout/fragment_options_misc.xml b/app/src/main/res/layout/fragment_options_misc.xml
index 7d93febb73..da58e4bd13 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -180,6 +180,16 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/btnCleanup" />
 
+        <TextView
+            android:id="@+id/tvLastCleanup"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            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/tvCleanupHint" />
+
         <TextView
             android:id="@+id/tvProcessors"
             android:layout_width="0dp"
@@ -189,7 +199,7 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCleanupHint" />
+            app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />
 
         <TextView
             android:id="@+id/tvMemoryClass"
@@ -212,11 +222,12 @@
             app:layout_constraintTop_toBottomOf="@id/tvMemoryClass" />
 
         <TextView
-            android:id="@+id/tvLastCleanup"
+            android:id="@+id/tvFingerprint"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/title_advanced_last_cleanup"
+            android:text="12:34:56:78:9A:BC:CD:EF"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvStorageSpace" />
@@ -225,6 +236,6 @@
             android:id="@+id/grpDebug"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvProcessors,tvMemoryClass,tvStorageSpace,tvLastCleanup" />
+            app:constraint_referenced_ids="tvProcessors,tvMemoryClass,tvStorageSpace,tvFingerprint" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ed213fedfe..3b00e2c363 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -362,7 +362,7 @@
     <string name="title_advanced_processors" translatable="false">Processors: %1$d</string>
     <string name="title_advanced_memory_class" translatable="false">Memory class: %1$s</string>
     <string name="title_advanced_storage_space" translatable="false">Storage space: %1$s</string>
-    <string name="title_advanced_last_cleanup" translatable="false">Last cleanup: %1$s</string>
+    <string name="title_advanced_last_cleanup">Last cleanup: %1$s</string>
 
     <string name="title_advanced_hint">All settings have sensible default values, which should only be changed if necessary</string>