diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index 3a84482171..2bd2e237e9 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -285,6 +285,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
                         ? View.GONE : View.VISIBLE);
         swExperiments.setChecked(prefs.getBoolean("experiments", false));
         swCrashReports.setChecked(prefs.getBoolean("crash_reports", false));
+        tvUuid.setText(prefs.getString("uuid", null));
         swDebug.setChecked(prefs.getBoolean("debug", false));
 
         tvProcessors.setText(getString(R.string.title_advanced_processors, Runtime.getRuntime().availableProcessors()));
@@ -296,8 +297,6 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
         tvStorageSpace.setText(getString(R.string.title_advanced_storage_space,
                 Helper.humanReadableByteCount(Helper.getStorageSpace(), true)));
 
-        tvUuid.setText(prefs.getString("uuid", null));
-
         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 2d0be6a6b2..a989cddb5b 100644
--- a/app/src/main/res/layout/fragment_options_misc.xml
+++ b/app/src/main/res/layout/fragment_options_misc.xml
@@ -107,6 +107,19 @@
             app:layout_constraintTop_toBottomOf="@id/tvExperimentsHint"
             app:switchPadding="12dp" />
 
+        <TextView
+            android:id="@+id/tvUuid"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="48dp"
+            android:fontFamily="monospace"
+            android:text="UUID"
+            android:textAppearance="@style/TextAppearance.AppCompat.Small"
+            android:textIsSelectable="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/swCrashReports" />
+
         <androidx.appcompat.widget.SwitchCompat
             android:id="@+id/swDebug"
             android:layout_width="0dp"
@@ -115,7 +128,7 @@
             android:text="@string/title_advanced_debug"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/swCrashReports"
+            app:layout_constraintTop_toBottomOf="@id/tvUuid"
             app:switchPadding="12dp" />
 
         <TextView
@@ -208,22 +221,10 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvStorageSpace" />
 
-        <TextView
-            android:id="@+id/tvUuid"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:fontFamily="monospace"
-            android:text="UUID"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textIsSelectable="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvLastCleanup" />
-
         <androidx.constraintlayout.widget.Group
             android:id="@+id/grpDebug"
             android:layout_width="0dp"
             android:layout_height="0dp"
-            app:constraint_referenced_ids="tvProcessors,tvMemoryClass,tvStorageSpace,tvLastCleanup,tvUuid" />
+            app:constraint_referenced_ids="tvProcessors,tvMemoryClass,tvStorageSpace,tvLastCleanup" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>