diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 31016b0f26..18d1e693a4 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -52,6 +52,8 @@
 import androidx.annotation.RequiresApi;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.PopupMenu;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.constraintlayout.widget.Group;
 import androidx.core.content.pm.ShortcutInfoCompat;
 import androidx.fragment.app.Fragment;
@@ -123,7 +125,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
     private static final int DENSE_ITEMS_THRESHOLD_MANY = 50;
 
     public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
-        private View view;
+        private ConstraintLayout view;
 
         private View vwColor;
         private ImageView ivState;
@@ -459,6 +461,17 @@ else if (all.size() < DENSE_ITEMS_THRESHOLD_MANY)
                 if (btnHelp != null)
                     btnHelp.setVisibility(folder.error == null ? View.GONE : View.VISIBLE);
 
+                ConstraintSet constraintSet = new ConstraintSet();
+                constraintSet.clone(view);
+                if (show_flagged && !show_compact) {
+                    constraintSet.connect(R.id.ibSync, ConstraintSet.END, R.id.tvFlaggedEnd, ConstraintSet.START);
+                    constraintSet.connect(R.id.ibMessages, ConstraintSet.END, R.id.tvFlaggedEnd, ConstraintSet.START);
+                } else {
+                    constraintSet.connect(R.id.ibSync, ConstraintSet.END, view.getId(), ConstraintSet.END);
+                    constraintSet.connect(R.id.ibMessages, ConstraintSet.END, view.getId(), ConstraintSet.END);
+                }
+                constraintSet.applyTo(view);
+
                 grpFlagged.setVisibility(show_flagged && show_compact ? View.VISIBLE : View.GONE);
                 grpFlaggedEnd.setVisibility(show_flagged && !show_compact ? View.VISIBLE : View.GONE);
                 grpExtended.setVisibility(show_compact ? View.GONE : View.VISIBLE);
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index db6b157db4..7fe648154c 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -152,12 +152,12 @@
                 android:id="@+id/ibMessages"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_marginEnd="6dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/title_accessibility_unseen"
                 app:layout_constraintBottom_toBottomOf="@+id/tvName"
                 app:layout_constraintEnd_toStartOf="@+id/tvFlaggedEnd"
                 app:layout_constraintTop_toTopOf="@+id/tvName"
-                app:layout_goneMarginEnd="6dp"
                 app:srcCompat="@drawable/twotone_mail_outline_24" />
 
             <ImageButton
@@ -230,12 +230,12 @@
                 android:id="@+id/ibSync"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
+                android:layout_marginEnd="6dp"
                 android:background="?android:attr/selectableItemBackgroundBorderless"
                 android:contentDescription="@string/tile_synchronize"
                 app:layout_constraintBottom_toBottomOf="@id/tvType"
                 app:layout_constraintEnd_toStartOf="@+id/tvFlaggedEnd"
                 app:layout_constraintTop_toTopOf="@+id/tvType"
-                app:layout_goneMarginEnd="6dp"
                 app:srcCompat="@drawable/twotone_sync_24" />
 
             <TextView