diff --git a/app/src/main/res/layout/fragment_account.xml b/app/src/main/res/layout/fragment_account.xml
index 56ba84e899..56a1a15ad2 100644
--- a/app/src/main/res/layout/fragment_account.xml
+++ b/app/src/main/res/layout/fragment_account.xml
@@ -375,102 +375,111 @@
             android:id="@+id/tvDrafts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="99dp"
             android:text="@string/title_folder_drafts"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/spDrafts"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spDrafts" />
 
-        <Spinner
-            android:id="@+id/spDrafts"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvDrafts"
-            app:layout_constraintTop_toBottomOf="@id/tvIdle" />
-
         <TextView
             android:id="@+id/tvSent"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="99dp"
             android:text="@string/title_folder_sent"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/spSent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spSent" />
 
-        <Spinner
-            android:id="@+id/spSent"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvSent"
-            app:layout_constraintTop_toBottomOf="@id/spDrafts" />
-
         <TextView
             android:id="@+id/tvAll"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="99dp"
             android:text="@string/title_folder_all"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/spAll"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spAll" />
 
-        <Spinner
-            android:id="@+id/spAll"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvAll"
-            app:layout_constraintTop_toBottomOf="@id/spSent" />
-
         <TextView
             android:id="@+id/tvTrash"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="100dp"
             android:text="@string/title_folder_trash"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/spTrash"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spTrash" />
 
-        <Spinner
-            android:id="@+id/spTrash"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvTrash"
-            app:layout_constraintTop_toBottomOf="@id/spAll" />
-
         <TextView
             android:id="@+id/tvJunk"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:minWidth="99dp"
             android:text="@string/title_folder_junk"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toBottomOf="@+id/spJunk"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/spJunk" />
 
+        <androidx.constraintlayout.widget.Barrier
+            android:id="@+id/barrier_folders"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            app:barrierDirection="end"
+            app:constraint_referenced_ids="tvDrafts,tvSent,tvAll,tvTrash,tvJunk" />
+
+        <Spinner
+            android:id="@+id/spDrafts"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier_folders"
+            app:layout_constraintTop_toBottomOf="@id/tvIdle" />
+
+        <Spinner
+            android:id="@+id/spSent"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier_folders"
+            app:layout_constraintTop_toBottomOf="@id/spDrafts" />
+
+        <Spinner
+            android:id="@+id/spAll"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier_folders"
+            app:layout_constraintTop_toBottomOf="@id/spSent" />
+
+        <Spinner
+            android:id="@+id/spTrash"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
+            android:layout_marginTop="12dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@id/barrier_folders"
+            app:layout_constraintTop_toBottomOf="@id/spAll" />
+
         <Spinner
             android:id="@+id/spJunk"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_marginStart="6dp"
             android:layout_marginTop="12dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/tvJunk"
+            app:layout_constraintStart_toEndOf="@id/barrier_folders"
             app:layout_constraintTop_toBottomOf="@id/spTrash" />
 
+
         <!-- save -->
 
         <Button