diff --git a/app/src/main/res/layout/fragment_compose.xml b/app/src/main/res/layout/fragment_compose.xml
index db364a98af..b555f9d719 100644
--- a/app/src/main/res/layout/fragment_compose.xml
+++ b/app/src/main/res/layout/fragment_compose.xml
@@ -271,7 +271,7 @@
                 android:id="@+id/grpHeader"
                 android:layout_width="0dp"
                 android:layout_height="0dp"
-                app:constraint_referenced_ids="spAccount,spIdentity,etTo,ivToAdd,etSubject,vSeparator" />
+                app:constraint_referenced_ids="spIdentity,etTo,ivToAdd,etSubject,vSeparator" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/grpExtra"
diff --git a/app/src/main/res/layout/fragment_eula.xml b/app/src/main/res/layout/fragment_eula.xml
index 7b435592a5..9b7c5702b8 100644
--- a/app/src/main/res/layout/fragment_eula.xml
+++ b/app/src/main/res/layout/fragment_eula.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvCopyright" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <Button
             android:id="@+id/btnCancel"